Updated POST /recon API

culturecreates · Apr 23, 2024 · 2bdc83d · 2bdc83d
1 parent af1274d
commit 2bdc83d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/src/controller/recon/recon.controller.ts b/src/controller/recon/recon.controller.ts
@@ -1,8 +1,7 @@
 import { Body, Controller, Get, Post, Query } from "@nestjs/common";
 import { ApiBody, ApiOperation, ApiQuery, ApiResponse, ApiTags } from "@nestjs/swagger";
-import { ReconciliationQuery, ReconciliationResponse } from "../../dto";
+import { ReconciliationResponse } from "../../dto";
 import { ReconciliationService } from "../../service";
-import { ReconciliationTypesEnum } from "../../enum";
 
 @Controller()
 @ApiTags("APIs")
@@ -18,10 +17,10 @@ export class ReconciliationController {
     name: "queries",
     description: "Queries",
     required: false,
-    explode: false,
+    explode: false
   })
   async reconcileByQuery(
-    @Query("queries") rawQueries: string,
+    @Query("queries") rawQueries: string
   ): Promise<ReconciliationResponse[]> {
     return await this._reconciliationService.reconcileByRawQueries(rawQueries);
   }
@@ -30,9 +29,10 @@ export class ReconciliationController {
   @ApiOperation({ summary: "Reconcile" })
   @ApiResponse({ status: 200, type: ReconciliationResponse, isArray: true, description: "Reconciliation response" })
   @ApiResponse({ status: 500, description: "Internal server error" })
-  @ApiBody({type: ReconciliationQuery, isArray: true})
+  @ApiBody({})
 
-  async reconcileByQueries(@Body() reconciliationRequest: any): Promise<ReconciliationResponse[]>{
+
+  async reconcileByQueries(@Body() reconciliationRequest: any): Promise<ReconciliationResponse[]> {
     return await this._reconciliationService.reconcileByQueries(reconciliationRequest);
   }
 

diff --git a/src/service/recon/recon.service.ts b/src/service/recon/recon.service.ts
@@ -1,23 +1,25 @@
 import { Injectable } from "@nestjs/common";
 import { ArtsdataService } from "../artsdata";
-import { ReconciliationQuery, ReconciliationResponse } from "../../dto";
 import { ManifestService } from "../manifest";
+import { ReconciliationResponse } from "../../dto";
 
 @Injectable()
 export class ReconciliationService {
 
   constructor(private readonly _artsdataService: ArtsdataService,
-              private readonly _manifestService: ManifestService
-  ) {
+              private readonly _manifestService: ManifestService) {
   }
 
   async reconcileByRawQueries(rawQueries: string): Promise<any> {
 
     if (!rawQueries) {
       return this._manifestService.getServiceManifest();
     }
-
     const queries = JSON.parse(rawQueries);
+    return await this.reconcileByQueries(queries);
+  }
+
+  async reconcileByQueries(queries: any): Promise<any> {
     let index = 0;
     const results: any = {};
     while (true) {
@@ -26,28 +28,12 @@ export class ReconciliationService {
       if (!query) {
         break;
       }
-      const result =
+      const result: ReconciliationResponse[] =
         await this._artsdataService.getReconciliationResult(query.query, query.type, query.limit);
       results["q0"] = { result: result };
       index++;
     }
     return results;
   }
 
-  async reconcileByQueries(reconciliationRequest: ReconciliationQuery[]): Promise<ReconciliationResponse[]> {
-    const promises = reconciliationRequest.map(query =>
-      this._artsdataService.getReconciliationResult(query.query, query.type)
-    );
-
-    const results = (await Promise.all(promises)).flat();
-
-    const uniqueResults = results.filter((result, index, self) =>
-        index === self.findIndex((object) => (
-          object.id === result.id
-        ))
-    );
-
-    return uniqueResults;
-  }
-
 }