Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
900e71c
add dataSourceManager skeleton
ChristoffSchaub Mar 7, 2022
8aa8445
first working impl of dataImportEndpoint
ChristoffSchaub Mar 7, 2022
4c987e0
add todo
ChristoffSchaub Mar 7, 2022
6780963
strange behaviour on npm not refreshing. Test on other machine
ChristoffSchaub Mar 8, 2022
4a4a788
add changes
ChristoffSchaub Mar 8, 2022
4648ff3
fix strange knex connection error with @MarcoDoell
ChristoffSchaub Mar 8, 2022
2d87724
rename
ChristoffSchaub Mar 8, 2022
637e86e
add todos and implement getDatasource
ChristoffSchaub Mar 8, 2022
a472dd5
knex import
PVahldiek Mar 21, 2022
591ad03
Fixed startup of docker container - make adapter service run with doc…
PVahldiek Mar 21, 2022
533bd89
Singleton (for export)
PVahldiek Mar 22, 2022
45c7a0d
Fixed integration test /formats with @MarcoDoell
PVahldiek Mar 22, 2022
a7e9600
fixed integration-test for /protocols and started with /preview with …
PVahldiek Mar 23, 2022
13c3a3d
weiterarbeit adapterservice /preview with @PVahldiek
MarcoDoell Mar 23, 2022
06984db
add deleteDatasource
ChristoffSchaub Mar 26, 2022
b7a6079
Merge branch 'adapter-nodejs-refactoring' of github.com:MarcoDoell/od…
ChristoffSchaub Mar 26, 2022
798efc8
complete add deleteDatasource
ChristoffSchaub Mar 28, 2022
560af2b
complete put & updateDatasource
ChristoffSchaub Mar 28, 2022
147b14e
start with implementation of trigger. Wait for fix of adapterService
ChristoffSchaub Mar 29, 2022
9773fb7
preview endpoint läuft jetzt with @ChristoffSchaub
MarcoDoell Mar 29, 2022
cfdafd8
implementation of triggerworks after fix of adapterService
ChristoffSchaub Mar 30, 2022
a0e17b7
previewraw endpoint fixed
MarcoDoell Mar 30, 2022
2f5f9c5
Merge branch 'adapter-nodejs-refactoring' of https://github.com/Marco…
MarcoDoell Mar 30, 2022
a1678d9
start refactoring
ChristoffSchaub Mar 31, 2022
481858c
refactoring state: different repositories for database calls
ChristoffSchaub Mar 31, 2022
9ef7149
refactoring state: split up dataImportEndpoint.ts and dataSourceEndpo…
ChristoffSchaub Mar 31, 2022
8306366
refactoring state: remove helper methods from Endpoint classes
ChristoffSchaub Mar 31, 2022
334bd7e
refactoring state: finished first refactoring
ChristoffSchaub Mar 31, 2022
b871017
implement outboxing for update & addDatasource
ChristoffSchaub Apr 1, 2022
dd4933f
string parser with @PVahldiek
Apr 9, 2022
87a7bd4
package lock
Apr 9, 2022
4b374ac
resolve promise
Apr 9, 2022
2540eab
test for fetch importer with @PVahldiek
Apr 9, 2022
3260c1d
test for xml raw with @PVahldiek
Apr 9, 2022
77d54b6
response type in axios with @PVahldiek
Apr 9, 2022
abdabd9
importer and interpreter angepasst with @PVahldiek
Apr 9, 2022
3dc1b49
xml parser options with @PVahldiek
Apr 9, 2022
0792c15
test daten raus
Apr 9, 2022
70dea4d
csv interpreter modified with @PVahldiek
Apr 9, 2022
d678613
Anpassungen an integration-tests für import and format (json, xml, csv)
PVahldiek Apr 9, 2022
9661ca7
package-lock with @MarcoDoell
PVahldiek Apr 9, 2022
6c058e7
Adjusted for BAD REQUEST Tests
PVahldiek Apr 16, 2022
df45335
const instead of let / var + docker compose port with @PVahldiek
Apr 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file added adapter/.gradle/6.7/fileChanges/last-build.bin
Binary file not shown.
Binary file added adapter/.gradle/6.7/fileHashes/fileHashes.bin
Binary file not shown.
Binary file added adapter/.gradle/6.7/fileHashes/fileHashes.lock
Binary file not shown.
Binary file not shown.
Empty file.
Binary file added adapter/.gradle/6.7/javaCompile/classAnalysis.bin
Binary file not shown.
Binary file not shown.
Binary file added adapter/.gradle/6.7/javaCompile/javaCompile.lock
Binary file not shown.
Binary file added adapter/.gradle/6.7/javaCompile/taskHistory.bin
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions adapter/.gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Tue Mar 22 23:09:21 CET 2022
gradle.version=6.7
Binary file not shown.
Binary file added adapter/.gradle/checksums/checksums.lock
Binary file not shown.
Binary file added adapter/.gradle/checksums/md5-checksums.bin
Binary file not shown.
Binary file added adapter/.gradle/checksums/sha1-checksums.bin
Binary file not shown.
Empty file.
Empty file.
9 changes: 1 addition & 8 deletions adapter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
#----------------------------------------------------------#
FROM node:16-alpine as base

# install dependencies for pact (https://docs.pact.io/docker/)
RUN apk add --no-cache --virtual build-dependencies build-base
RUN apk --no-cache add ca-certificates wget bash \
&& wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
&& wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.29-r0/glibc-2.29-r0.apk \
&& apk add glibc-2.29-r0.apk

WORKDIR /build

# Copy package*.json files first in order to make best use of docker layer caching
Expand All @@ -29,7 +22,7 @@ COPY ./*.js ./
FROM base as build

# lint project
RUN npm run lint-ci
#RUN npm run lint-ci

# build
RUN npm run transpile
Expand Down
2 changes: 1 addition & 1 deletion adapter/integration-test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN npm ci
COPY ./.eslintrc.json ./
COPY ./src ./src

RUN npm run lint-ci
#RUN npm run lint-ci

EXPOSE 8080

Expand Down
9,179 changes: 4,937 additions & 4,242 deletions adapter/integration-test/package-lock.json

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions adapter/integration-test/src/adapter-stateless.test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { execPath } = require('process')
const request = require('supertest')

const {
Expand Down Expand Up @@ -65,16 +66,17 @@ describe('Stateless data import', () => {
.send(reqBody)
expect(response.status).toEqual(200)
const importedData = response.body.data

expect(JSON.parse(importedData)).toEqual({ whateverwillbe: 'willbe', quesera: 'sera' })
expect(importedData).toEqual({ whateverwillbe: 'willbe', quesera: 'sera' })
}, TIMEOUT)

test('Should import raw xml data', async () => {
const reqBody = {
type: 'HTTP',
parameters: {
location: MOCK_SERVER_URL + '/xml',
encoding: 'UTF-8'
protocol: {
type: 'HTTP',
parameters: {
location: MOCK_SERVER_URL + '/xml',
encoding: 'UTF-8'
}
}
}

Expand Down Expand Up @@ -108,8 +110,7 @@ describe('Stateless data import', () => {
.send(reqBody)
expect(response.status).toEqual(200)
const importedData = response.body.data

expect(JSON.parse(importedData)).toEqual({ from: 'Rick', to: 'Morty' })
expect(importedData).toEqual({ from: 'Rick', to: 'Morty' })
}, TIMEOUT)

test('Should import and format csv data', async () => {
Expand Down Expand Up @@ -147,7 +148,7 @@ describe('Stateless data import', () => {
col3: 'val23'
}]

expect(JSON.parse(importedData)).toEqual(expected)
expect(importedData).toEqual(expected)
}, TIMEOUT)

test('Should return 400 BAD_REQUEST for unsupported protocol [POST /preview]', async () => {
Expand Down
Loading