Skip to content

Commit eb36b17

Browse files
f3l1x98f3l1x98
committed
Little bit cleanup of outcommented code
1 parent 3656cc2 commit eb36b17

10 files changed

Lines changed: 3 additions & 204 deletions

File tree

‎adapter/src/adapter/api/rest/adapterEndpoint.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class AdapterEndpoint {
4343
req: express.Request,
4444
res: express.Response,
4545
): Promise<void> => {
46-
// TODO doesn't the body contain adapterConfig?!?! -> why create adapterconfig and not simply pass to executeJob?!?!?
46+
// TODO doesn't the body contain adapterConfig (at least old impl did)?!?! -> why create adapterconfig and not simply pass to executeJob?!?!?
4747
const validator = new AdapterConfigValidator();
4848
if (!validator.validate(req.body)) {
4949
res.status(400).json({ errors: validator.getErrors() });

‎adapter/src/adapter/importer/HttpImporter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class HttpImporter extends Importer {
8383
override async doFetch(parameters: Record<string, unknown>): Promise<string> {
8484
let uri = parameters.location as string;
8585
const encoding = parameters.encoding as string;
86-
// TODO originally this was done in dataImportTrigger during creation of AdapterConfig
86+
// Originally this was done in dataImportTrigger during creation of AdapterConfig
8787
// -> RuntimeParameter are used, because the defaultParams are overriden during AdapterConfig instead
8888
if (parameters.defaultParameters !== undefined) {
8989
const defaultParameters = parameters.defaultParameters as Record<

‎adapter/src/datasource/api/amqp/amqpHelper.ts‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎adapter/src/datasource/api/rest/dataImportEndpoint.ts‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -190,25 +190,6 @@ export class DataImportEndpoint {
190190
dataImportDTOParams,
191191
);
192192

193-
/* TODO no idea what exactly was done here (does not resemble original Java Spring Code)
194-
const result: Record<string, unknown> = {};
195-
const keys = Object.keys(returnDataImportResponse);
196-
for (const entry of keys) {
197-
if (entry === 'data') {
198-
continue;
199-
}
200-
result[entry] = returnDataImportResponse[entry];
201-
}
202-
const data: Record<string, unknown> = JSON.parse(
203-
returnDataImportResponse.data as string,
204-
) as Record<string, unknown>;
205-
const dataKeys = Object.keys(data);
206-
for (const entry of dataKeys) {
207-
result[entry] = data[entry];
208-
}*/
209-
210-
// TODO old impl returned the string, but that fails with integration tests
211-
// -> maybe spring automatically converts to object, because when converting to json everything works?!?
212193
if (dataImportDataDTO.data === '') {
213194
res
214195
.status(404)

‎adapter/src/datasource/model/DataImport.dto.ts‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ export type DataImportDataDTO = Pick<
1919
'data' | 'location' | 'parameters'
2020
>;
2121

22-
/* Export interface DataImportMetaDataDTO extends DataImportDTO {
23-
id: number;
24-
error_messages: string[];
25-
health: string;
26-
timestamp: Date;
27-
location?: string;
28-
}
29-
30-
export interface DataImportDataDTO {
31-
data: unknown;
32-
location?: string;
33-
}*/
34-
3522
export function dataimportEntityToDTO(
3623
data: DataImportEntity,
3724
location?: string,

‎adapter/src/datasource/repository/postgresDataImportRepository.ts‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -129,35 +129,6 @@ export class PostgresDataImportRepository implements DataImportRepository {
129129
return entities[0];
130130
}
131131

132-
/* TODO not sure if needed BUT THIS GET defaultParameters OF CORRESPONDING DATASOURCE
133-
async getDataFromDataImportWithParameter(
134-
datasourceId: string,
135-
dataImportId: string,
136-
): Promise<DataImportEntity> {
137-
const dataImport = await this.getDataFromDataImport(
138-
datasourceId,
139-
dataImportId,
140-
);
141-
const result: DataImportEntity = {
142-
data: KnexHelper.stringFromUTF8Array(dataImport[0].data),
143-
};
144-
145-
const dataSource = await datasourceRepository.getDataSourceById(
146-
datasourceId,
147-
);
148-
149-
if (dataSource.protocol.parameters.defaultParameters) {
150-
Object.assign(result, dataSource.protocol.parameters.defaultParameters);
151-
}
152-
153-
if (JSON.parse(dataImport[0].parameters).parameters) {
154-
const parameters = JSON.parse(dataImport[0].parameters).parameters;
155-
Object.assign(result, parameters);
156-
}
157-
158-
return result as DataImportEntity;
159-
}*/
160-
161132
private escapeQuotes(data: unknown): string {
162133
if (data !== undefined) {
163134
return JSON.stringify(data).replace("'", "''");

‎adapter/src/datasource/repository/postgresDatasourceRepository.ts‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -189,76 +189,6 @@ export class PostgresDatasourceRepository implements DatasourceRepository {
189189
throw Error(`Could not delete all datasources`);
190190
}
191191
}
192-
/* TODO remove/refactor
193-
async getAllDataSources() {
194-
const result = await knex.select().from('public.datasource');
195-
return KnexHelper.createDatasourceFromResultArray(result);
196-
}
197-
198-
async getDataSourceById(id: any) {
199-
const result = await knex
200-
.select()
201-
.from('public.datasource')
202-
.where('id', id);
203-
return KnexHelper.createDatasourceFromResult(result);
204-
}
205-
206-
async addDatasource(insertStatement: DatasourceInsertStatement) {
207-
return await knex('public.datasource')
208-
.insert(insertStatement)
209-
.returning('id')
210-
.then(function (id: any) {
211-
console.log(id);
212-
console.log('neuer code geht');
213-
return knex
214-
.select()
215-
.from('public.datasource')
216-
.where('id', id[0].id)
217-
.then(function (result: any) {
218-
console.log('DATASOURCE RESULT IM KNEX: ' + result);
219-
return KnexHelper.createDatasourceFromResult(result);
220-
});
221-
})
222-
.catch(function (err: any) {
223-
console.log(err);
224-
});
225-
}
226-
227-
async updateDatasource(
228-
insertStatement: DatasourceInsertStatement,
229-
datasourceId: string,
230-
) {
231-
return await knex('public.datasource')
232-
.where('id', datasourceId)
233-
.update(insertStatement)
234-
.then(function () {
235-
return knex
236-
.select()
237-
.from('public.datasource')
238-
.where('id', datasourceId)
239-
.then(function (result: any) {
240-
console.log(result);
241-
return KnexHelper.createDatasourceFromResult(result);
242-
});
243-
})
244-
.catch(function (err: any) {
245-
console.log(err);
246-
});
247-
}
248-
249-
async deleteDatasourceById(datasourceId: string) {
250-
return await knex
251-
.delete()
252-
.from('public.datasource')
253-
.where('id', datasourceId);
254-
}
255-
256-
async deleteAllDatasources() {
257-
return await knex
258-
.delete()
259-
.from('public.datasource')
260-
.where('id', '!=', '-1');
261-
}*/
262192

263193
private escapeQuotes(data: unknown): string {
264194
return JSON.stringify(data).replace("'", "''");

‎adapter/src/datasource/repository/postgresOutboxRepository.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ INSERT INTO "${POSTGRES_SCHEMA}"."${TABLE_NAME}"
2929
VALUES ($1, $2)
3030
RETURNING id
3131
`;
32-
/*
33-
Const CREATE_OUTBOX_REPOSITORY_STATEMENT = `
34-
CREATE TABLE IF NOT EXISTS public.outbox
35-
(
36-
id uuid NOT NULL,
37-
payload jsonb NOT NULL,
38-
routing_key character varying(255) COLLATE pg_catalog."default" NOT NULL,
39-
CONSTRAINT outbox_pkey PRIMARY KEY (id)
40-
)`;*/
4132

4233
const POOL_CONFIG: PoolConfig = {
4334
host: POSTGRES_HOST,

‎adapter/src/datasource/services/dataImportTriggerService.ts‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,26 +81,7 @@ export class DataImportTriggerService {
8181
Object.assign(replacementParameters, runtimeParams);
8282
}
8383

84-
/* TODO seems like this was moved into HTTPImporter -> whole fillQueryParameters no longer necessary
85-
let url: string = datasource.protocol.parameters.location as string;
86-
for (const parameterKey in replacementParameters) {
87-
// TODO check if that works (value is unknown)
88-
if (
89-
Object.prototype.hasOwnProperty.call(
90-
replacementParameters,
91-
parameterKey,
92-
)
93-
) {
94-
const value = replacementParameters[parameterKey] as string;
95-
const regex = new RegExp('{' + parameterKey + '}', 'g');
96-
url = url.replace(regex, value);
97-
}
98-
}
99-
100-
const parameters = datasource.protocol.parameters;
101-
parameters.location = url;*/
102-
103-
// This is 'new' solution for the above (instead of overriding url -> override params here and url in importer)
84+
// This is 'new' solution (instead of overriding url -> override params here and url in importer)
10485
datasource.protocol.parameters.defaultParameters = replacementParameters;
10586
const parameters = {
10687
...datasource.protocol.parameters,

‎adapter/src/env.ts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,3 @@ export const ADAPTER_AMQP_DATASOURCE_IMPORT_TRIGGER_QUEUE_TOPIC = readEnvOrDie(
4242
);
4343
export const ADAPTER_AMQP_DATASOURCE_IMPORT_TRIGGER_CREATED_TOPIC =
4444
readEnvOrDie('ADAPTER_AMQP_DATASOURCE_IMPORT_TRIGGER_CREATED_TOPIC');
45-
/* TODO remove hardcoded envs
46-
export const CONNECTION_RETRIES = 30;
47-
export const CONNECTION_BACKOFF = 2000;
48-
export const POSTGRES_HOST = 'localhost'; // "adapter-db" //localhost for local
49-
export const POSTGRES_PORT = '5432';
50-
export const POSTGRES_PW = 'admin';
51-
export const POSTGRES_USER = 'adapterservice';
52-
export const POSTGRES_DB = 'adapterservice';
53-
export const POSTGRES_SCHEMA = 'public';
54-
export const AMQP_URL = 'amqp://rabbit_adm:R4bb!7_4DM_p4SS@localhost:5672';
55-
export const ADAPTER_AMQP_IMPORT_SUCCESS_TOPIC = 'datasource.execution.success';
56-
export const ADAPTER_AMQP_IMPORT_FAILED_TOPIC = 'datasource.execution.failed';
57-
export const ADAPTER_AMQP_DATASOURCE_CREATED_TOPIC =
58-
'datasource.config.created';
59-
export const ADAPTER_AMQP_DATASOURCE_UPDATED_TOPIC =
60-
'datasource.config.updated';
61-
export const ADAPTER_AMQP_DATASOURCE_DELETED_TOPIC =
62-
'datasource.config.deleted';
63-
export const ADAPTER_AMQP_ADAPTER_EXCHANGE = 'ods_global';
64-
export const ADAPTER_AMQP_DATASOURCE_IMPORT_TRIGGER_QUEUE =
65-
'adapter.datasource-import-trigger';
66-
export const ADAPTER_AMQP_DATASOURCE_IMPORT_TRIGGER_QUEUE_TOPIC =
67-
'datasource.import-trigger.*';
68-
export const ADAPTER_AMQP_DATASOURCE_IMPORT_TRIGGER_CREATED_TOPIC =
69-
'datasource.import-trigger.created';*/

0 commit comments

Comments
 (0)