chore(all-services): rebase

gh-1778

Author: yeshamavani

packages/archival/src/aws-s3/import-archive-data.provider.ts

@@ -6,7 +6,6 @@ import {
 } from '@loopback/core';
 import {AnyObject} from '@loopback/repository';
 import {HttpErrors} from '@loopback/rest';
-// eslint-disable-next-line @typescript-eslint/naming-convention
 import AWS from 'aws-sdk';
 import {ImportDataExternalSystem} from '../types';
 

packages/archival/src/component.ts

@@ -14,8 +14,14 @@ import {Class, Repository} from '@loopback/repository';
 import {Model, RestApplication} from '@loopback/rest';
 import {CoreComponent} from '@sourceloop/core';
 import {ArchivalComponentBindings} from './keys';
-import {GetJobDetailsProvider, ProcessImportedDataProvider} from './providers';
-import {ArchivalMappingRepository, JobDetailsRepository} from './repositories';
+import {
+  ProcessRetrievedDataProvider,
+  RetrieveArchivedDataProvider,
+} from './providers';
+import {
+  ArchivalMappingRepository,
+  RetrievalJobDetailsRepository,
+} from './repositories';
 import {BuildWhereConditionService} from './services';
 import {ImportArchivedDataService} from './services/import-archived-data.service';
 import {ArchivalComponentOptions, DEFAULT_ARCHIVAL_OPTIONS} from './types';
@@ -33,9 +39,9 @@ export class ArchivalComponent implements Component {
     this.application.component(CoreComponent);
 
     this.providers[ArchivalComponentBindings.PROCESS_IMPORT_DATA.key] =
-      ProcessImportedDataProvider;
+      ProcessRetrievedDataProvider;
     this.providers[ArchivalComponentBindings.GET_ARCHIVED_DATA_JOB.key] =
-      GetJobDetailsProvider;
+      RetrieveArchivedDataProvider;
 
     this.application
       .bind('services.BuildWhereConditionService')
@@ -44,7 +50,10 @@ export class ArchivalComponent implements Component {
       .bind('services.ImportArchivedDataService')
       .toClass(ImportArchivedDataService);
 
-    this.repositories = [ArchivalMappingRepository, JobDetailsRepository];
+    this.repositories = [
+      ArchivalMappingRepository,
+      RetrievalJobDetailsRepository,
+    ];
   }
   providers?: ProviderMap = {};
 

packages/archival/src/models/index.ts

@@ -1,2 +1,2 @@
 export * from './archival-mapping.model';
-export * from './job-details.model';
+export * from './retrieval-job-details.model';

packages/archival/src/models/job-details.model.ts renamed to packages/archival/src/models/retrieval-job-details.model.ts

@@ -3,12 +3,12 @@ import {CoreEntity} from '@sourceloop/core';
 import {JobStatus} from '../types';
 
 @model({
-  name: 'job_details',
+  name: 'retrieval_job_details',
   settings: {
     strict: false,
   },
 })
-export class JobDetails extends CoreEntity<JobDetails> {
+export class RetrievalJobDetails extends CoreEntity<RetrievalJobDetails> {
   @property({
     type: 'string',
     id: true,
@@ -26,10 +26,10 @@ export class JobDetails extends CoreEntity<JobDetails> {
   status: JobStatus;
 
   @property({
-    name: 'filter_inquired',
+    name: 'filter',
     type: 'object',
   })
-  filterInquired: Object;
+  filter: Object;
 
   @property({
     name: 'entity',
@@ -43,4 +43,4 @@ export class JobDetails extends CoreEntity<JobDetails> {
   result: string;
 }
 
-export type JobDetailsWithRelations = JobDetails;
+export type RetrievalJobDetailsWithRelations = RetrievalJobDetails;

packages/archival/src/providers/index.ts

@@ -1,2 +1,2 @@
-export * from './get-job-details.provider';
-export * from './process-import-data.provider';
+export * from './process-retrieved-data.provider';
+export * from './retrieve-archived-data.provider';

packages/archival/src/providers/process-import-data.provider.ts renamed to packages/archival/src/providers/process-retrieved-data.provider.ts

@@ -7,7 +7,7 @@ import {
 import {ProcessImportedData} from '../types';
 
 @injectable({scope: BindingScope.TRANSIENT})
-export class ProcessImportedDataProvider
+export class ProcessRetrievedDataProvider
   implements Provider<ProcessImportedData>
 {
   /**Implement this provider to process and save the records do desired system

packages/archival/src/providers/get-job-details.provider.ts renamed to packages/archival/src/providers/retrieve-archived-data.provider.ts

@@ -5,22 +5,22 @@ import {
   injectable,
 } from '@loopback/core';
 import {Filter, repository} from '@loopback/repository';
-import {JobDetails} from '../models';
-import {JobDetailsRepository} from '../repositories';
+import {RetrievalJobDetails} from '../models';
+import {RetrievalJobDetailsRepository} from '../repositories';
 import {GetJobDetailsFn, JobResponse, JobStatus} from '../types';
 
 @injectable({scope: BindingScope.TRANSIENT})
-export class GetJobDetailsProvider implements Provider<GetJobDetailsFn> {
+export class RetrieveArchivedDataProvider implements Provider<GetJobDetailsFn> {
   constructor(
-    @repository(JobDetailsRepository)
-    public jobDetailsRepo: JobDetailsRepository,
+    @repository(RetrievalJobDetailsRepository)
+    public jobDetailsRepo: RetrievalJobDetailsRepository,
   ) {}
   value(): ValueOrPromise<GetJobDetailsFn> {
     return async (entityName: string, filter?: Filter) => {
       let jobResponse: JobResponse = {jobId: '0'};
-      const job = new JobDetails({
+      const job = new RetrievalJobDetails({
         status: JobStatus.IN_PROGRESS,
-        filterInquired: filter,
+        filter,
         entity: entityName,
       });
 

packages/archival/src/repositories/index.ts

@@ -1,2 +1,2 @@
 export * from './archival-mapping.repository';
-export * from './job-details.repository';
+export * from './retrieval-job-details.repository';

packages/archival/src/repositories/job-details.repository.ts renamed to packages/archival/src/repositories/retrieval-job-details.repository.ts

@@ -1,17 +1,17 @@
 import {inject} from '@loopback/core';
 import {DefaultCrudRepository, juggler} from '@loopback/repository';
 
-import {JobDetails} from '../models';
+import {RetrievalJobDetails} from '../models';
 import {ArchivalDbSourceName} from '../types';
 
-export class JobDetailsRepository extends DefaultCrudRepository<
-  JobDetails,
-  typeof JobDetails.prototype.id
+export class RetrievalJobDetailsRepository extends DefaultCrudRepository<
+  RetrievalJobDetails,
+  typeof RetrievalJobDetails.prototype.id
 > {
   constructor(
     @inject(`datasources.${ArchivalDbSourceName}`)
     dataSource: juggler.DataSource,
   ) {
-    super(JobDetails, dataSource);
+    super(RetrievalJobDetails, dataSource);
   }
 }

packages/archival/src/services/import-archived-data.service.ts

@@ -18,7 +18,10 @@ import {DefaultUserModifyCrudRepository} from '@sourceloop/core';
 import {ArchivalApplication} from '../application';
 import {ArchivalComponentBindings} from '../keys';
 import {ArchiveMapping} from '../models';
-import {ArchivalMappingRepository, JobDetailsRepository} from '../repositories';
+import {
+  ArchivalMappingRepository,
+  RetrievalJobDetailsRepository,
+} from '../repositories';
 import {
   IBuildWhereConditionService,
   ImportDataExternalSystem,
@@ -31,8 +34,8 @@ export class ImportArchivedDataService {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   repo: any; //NOSONAR
   constructor(
-    @repository(JobDetailsRepository)
-    public jobDetailsRepo: JobDetailsRepository,
+    @repository(RetrievalJobDetailsRepository)
+    public jobDetailsRepo: RetrievalJobDetailsRepository,
     @repository(ArchivalMappingRepository)
     public archivalMappingRepo: ArchivalMappingRepository,
     @inject(CoreBindings.APPLICATION_INSTANCE)
@@ -59,7 +62,7 @@ export class ImportArchivedDataService {
   async import(jobId: string) {
     const jobDetails = await this.jobDetailsRepo.findById(jobId);
     const modelName = jobDetails.entity;
-    const filter = jobDetails.filterInquired;
+    const filter = jobDetails.filter;
 
     const archiveFilter: Filter<ArchiveMapping> =
       await this.buildWhereConditionService.buildConditionForFetch(