Moved dtos into api folders

Author: f3l1x98

adapter/src/adapter/model/Endpoint.dto.ts adapter/src/adapter/api/Endpoint.dto.tsadapter/src/adapter/model/Endpoint.dto.ts renamed to adapter/src/adapter/api/Endpoint.dto.ts

@@ -1,6 +1,7 @@
 import { validators } from '@jvalue/node-dry-basics';
 
-import { AdapterConfigDTO } from './Endpoint.dto';
+import { AdapterConfigDTO } from '../api/Endpoint.dto';
+
 import { FormatConfig } from './FormatConfig';
 import { ProtocolConfig } from './ProtocolConfig';
 

adapter/src/adapter/model/AdapterConfig.ts

@@ -1,9 +1,8 @@
 import { validators } from '@jvalue/node-dry-basics';
 
+import { AdapterConfigDTO } from '../api/Endpoint.dto';
 import { Protocol } from '../Protocol';
 
-import { AdapterConfigDTO } from './Endpoint.dto';
-
 export interface ProtocolConfig {
   protocol: Protocol;
   parameters: Record<string, unknown>;

adapter/src/adapter/model/ProtocolConfig.ts

@@ -1,6 +1,5 @@
 import { DatasourceUtils } from '../datasourceUtils';
-
-import { DataImportEntity } from './DataImport.entity';
+import { DataImportEntity } from '../model/DataImport.entity';
 
 export interface DataImportDTO {
   id: number;

…r/src/datasource/model/DataImport.dto.ts …ter/src/datasource/api/DataImport.dto.tsadapter/src/datasource/model/DataImport.dto.ts renamed to adapter/src/datasource/api/DataImport.dto.ts adapter/src/datasource/model/DataImport.dto.ts renamed to adapter/src/datasource/api/DataImport.dto.ts

@@ -1,4 +1,4 @@
-import { DatasourceEntity } from './Datasource.entity';
+import { DatasourceEntity } from '../model/Datasource.entity';
 
 export interface DatasourceDTO {
   id: number;

…r/src/datasource/model/Datasource.dto.ts …ter/src/datasource/api/Datasource.dto.tsadapter/src/datasource/model/Datasource.dto.ts renamed to adapter/src/datasource/api/Datasource.dto.ts adapter/src/datasource/model/Datasource.dto.ts renamed to adapter/src/datasource/api/Datasource.dto.ts

@@ -1,7 +1,7 @@
 import {
   FormatConfigDTO,
   ProtocolConfigDTO,
-} from '../../adapter/model/Endpoint.dto';
+} from '../../adapter/api/Endpoint.dto';
 
 export interface DatasourceConfigDTO {
   id: number;

…datasource/model/DatasourceConfig.dto.ts …c/datasource/api/DatasourceConfig.dto.tsadapter/src/datasource/model/DatasourceConfig.dto.ts renamed to adapter/src/datasource/api/DatasourceConfig.dto.ts adapter/src/datasource/model/DatasourceConfig.dto.ts renamed to adapter/src/datasource/api/DatasourceConfig.dto.ts

@@ -2,15 +2,15 @@ import express from 'express';
 
 import { asyncHandler } from '../../../adapter/api/rest/utils';
 import { DatasourceUtils } from '../../datasourceUtils';
+import { DataImportEntity } from '../../model/DataImport.entity';
+import { DataImportRepository } from '../../repository/dataImportRepository';
+import { DatasourceRepository } from '../../repository/datasourceRepository';
 import {
   DataImportMetaDataDTO,
   dataImportEntityToDataDTO,
   dataImportEntityToMetaDataDTO,
-} from '../../model/DataImport.dto';
-import { DataImportEntity } from '../../model/DataImport.entity';
-import { datasourceEntityToDTO } from '../../model/Datasource.dto';
-import { DataImportRepository } from '../../repository/dataImportRepository';
-import { DatasourceRepository } from '../../repository/datasourceRepository';
+} from '../DataImport.dto';
+import { datasourceEntityToDTO } from '../Datasource.dto';
 
 export class DataImportEndpoint {
   constructor(

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

@@ -9,7 +9,6 @@ import {
   ADAPTER_AMQP_IMPORT_FAILED_TOPIC,
 } from '../../../env';
 import { DatasourceUtils } from '../../datasourceUtils';
-import { datasourceEntityToDTO } from '../../model/Datasource.dto';
 import { DatasourceEntity } from '../../model/Datasource.entity';
 import { DatasourceConfigValidator } from '../../model/DatasourceConfigValidator';
 import { DatasourceModelForAmqp } from '../../model/datasourceModelForAmqp';
@@ -18,6 +17,7 @@ import { OutboxRepository } from '../../repository/outboxRepository';
 import { DataImportTriggerService } from '../../services/dataImportTriggerService';
 import { DataSourceNotFoundException } from '../../services/dataSourceNotFoundException';
 import { ErrorResponse } from '../../services/ErrorResponse';
+import { datasourceEntityToDTO } from '../Datasource.dto';
 
 export class DataSourceEndpoint {
   constructor(

adapter/src/datasource/api/rest/dataSourceEndpoint.ts

@@ -1,6 +1,6 @@
 import { validators } from '@jvalue/node-dry-basics';
 
-import { DatasourceConfigDTO } from './DatasourceConfig.dto';
+import { DatasourceConfigDTO } from '../api/DatasourceConfig.dto';
 
 export class DatasourceConfigValidator {
   private errors: string[] = [];

adapter/src/datasource/model/DatasourceConfigValidator.ts

@@ -7,10 +7,10 @@ import { ProtocolConfig } from '../../adapter/model/ProtocolConfig';
 import { Protocol } from '../../adapter/Protocol';
 import { AdapterService } from '../../adapter/services/adapterService';
 import { ADAPTER_AMQP_IMPORT_SUCCESS_TOPIC } from '../../env';
-import { DataImportDTO, dataimportEntityToDTO } from '../model/DataImport.dto';
+import { DataImportDTO, dataimportEntityToDTO } from '../api/DataImport.dto';
+import { DatasourceDTO, datasourceEntityToDTO } from '../api/Datasource.dto';
 import { DataImportEntity } from '../model/DataImport.entity';
 import { DataImportInsertStatement } from '../model/DataImportInsertStatement';
-import { DatasourceDTO, datasourceEntityToDTO } from '../model/Datasource.dto';
 import { DatasourceEntity } from '../model/Datasource.entity';
 import { DataImportRepository } from '../repository/dataImportRepository';
 import { DatasourceRepository } from '../repository/datasourceRepository';