Merge pull request #246 from maany/feature-226-fixes-in-prod

Feature 226 fixes in prod
rucio · Jul 14, 2023 · 11c0b8a · 11c0b8a
2 parents a660bc8 + 3db9e49
commit 11c0b8a
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 131 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "test": "jest --testPathPattern test/component test/api --projects test/api/jest.api.config.js test/component/jest.component.config.js",
+    "test": "jest --testPathPattern test/component test/api test/gateway test/sdk --projects test/api/jest.api.config.js test/component/jest.component.config.js test/gateway/jest.gateway.config.js test/sdk/jest.sdk.config.js",
     "test:api": "jest --testPathPattern=test/api --projects test/api/jest.api.config.js",
     "test:component": "jest --testPathPattern=test/component --projects test/component/jest.component.config.js",
     "test:gateway": "jest --testPathPattern=test/gateway --projects test/gateway/jest.gateway.config.js",

diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
@@ -21,6 +21,7 @@ export default async function DashboardLayout({
   return (
     <div>
     <h3>You are logged in as {sessionUser?.rucioIdentity}</h3>
+    <h3>Your rucio auth token is {rucioAuthToken}</h3>
         {children}
     </div>
   )

diff --git a/src/app/listdids/page.tsx b/src/app/listdids/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 import { ListDID as ListDIDStory } from "@/component-library/components/Pages/ListDID/ListDID";
-import { DIDMeta } from "@/lib/core/entity/rucio";
+import { DIDMeta, DIDType } from "@/lib/core/entity/rucio";
 import { DIDLong } from "@/lib/core/entity/rucio"
 import { DIDName } from '@/lib/infrastructure/data/view-model/create-rule'
 import useComDOM from "@/lib/infrastructure/hooks/useComDOM";
@@ -11,7 +11,7 @@ import { createDIDMeta } from "test/fixtures/table-fixtures";
 
 export default function ListDID() {
 
-    const [didMetaQueryResponse, setDIDMetaQueryResponse] = useState<DIDMeta>(createDIDMeta())
+    const [didMetaQueryResponse, setDIDMetaQueryResponse] = useState<DIDMeta>({} as DIDMeta)
     const didMetaQuery = (did: DIDName) => { setDIDMetaQueryResponse(createDIDMeta()) }
 
     const DIDSearchComDOM = useComDOM<DIDLong>(
@@ -22,15 +22,21 @@ export default function ListDID() {
         200,
         true
     )
+    useEffect(() => {
+        setDIDMetaQueryResponse(createDIDMeta())
+    }, [])
     useEffect(() => {
         const setRequest = async () => {
             const request: HTTPRequest = {
-                url: new URL('http://localhost:3000/api/listdids'),
-                method: 'GET',
+                url: new URL('http://localhost:3000/api/dids'),
+                method: 'POST',
                 headers: new Headers({
                     'Content-Type': 'application/json',
                 } as HeadersInit),
-                body: null,
+                body: {
+                    "query": "test:*",
+                    "type": DIDType.DATASET
+                },
             }
             await DIDSearchComDOM.setRequest(request)
         }

diff --git a/src/lib/infrastructure/gateway/did-gateway/endpoints/get-did-endpoint.ts b/src/lib/infrastructure/gateway/did-gateway/endpoints/get-did-endpoint.ts
@@ -5,7 +5,6 @@ import { DIDType } from "@/lib/core/entity/rucio";
 import { Response } from "node-fetch";
 
 export default class GetDIDEndpoint extends BaseEndpoint<DIDDTO> {
-    private url = `${this.rucioHost}/dids/${this.scope}/${this.name}/status`
 
     constructor(
         private rucioAuthToken: string,
@@ -19,6 +18,7 @@ export default class GetDIDEndpoint extends BaseEndpoint<DIDDTO> {
      */
     async initialize(): Promise<void> {
         await super.initialize()
+        this.url = `${this.rucioHost}/dids/${this.scope}/${this.name}/status`
         const request: HTTPRequest = {
             method: 'GET',
             url: this.url,

diff --git a/src/lib/infrastructure/gateway/did-gateway/endpoints/list-dids-endpoint.ts b/src/lib/infrastructure/gateway/did-gateway/endpoints/list-dids-endpoint.ts
@@ -1,5 +1,4 @@
 import { BaseStreamableEndpoint } from "@/lib/sdk/gateway-endpoints"
-import { parseDIDString } from "@/lib/common/did-utils"
 import { HTTPRequest } from "@/lib/common/http"
 import { ListDIDDTO } from "@/lib/core/dto/did-dto"
 import { DID, DIDType } from "@/lib/core/entity/rucio"
@@ -83,11 +82,10 @@ export default class ListDIDsEndpoint extends BaseStreamableEndpoint<ListDIDDTO,
 
     /** @implements */
     createDTO(chunk: Buffer): DID {
-        const didName = JSON.parse(chunk.toString())
-        const parsedDID = parseDIDString(didName)
+        const didName = JSON.parse(chunk.toString()).split('"')[1]
         const did: DID = {
-            name: parsedDID.name,
-            scope: parsedDID.scope,
+            name: didName,
+            scope: this.scope,
             did_type: this.type,
         }
         return did

diff --git a/src/lib/sdk/gateway-endpoints.ts b/src/lib/sdk/gateway-endpoints.ts
@@ -137,8 +137,11 @@ export abstract class BaseEndpoint<TDTO extends BaseDTO> {
     protected initialized: boolean = false;
     protected request: HTTPRequest | undefined;
     protected rucioHost: string = 'https://rucio-host.com';
-    protected envConfigGateway: EnvConfigGatewayOutputPort;
 
+    protected url: string = '';
+
+    protected envConfigGateway: EnvConfigGatewayOutputPort;
+
     constructor(
     ) {
         this.envConfigGateway = appContainer.get<EnvConfigGatewayOutputPort>(GATEWAYS.ENV_CONFIG);

diff --git a/src/lib/sdk/presenter.ts b/src/lib/sdk/presenter.ts
@@ -144,7 +144,7 @@ export abstract class BaseStreamingPresenter<
             const responseModel: TResponseModel = chunk
             const viewModel =
                 this.convertResponseModelToViewModel(responseModel)
-            callback(undefined, viewModel)
+            callback(undefined, JSON.stringify(viewModel))
         } catch (error) {
             this.emit('error', error)
             callback(error as Error)

diff --git a/test/api/did/list-dids.test.ts b/test/api/did/list-dids.test.ts
@@ -22,9 +22,9 @@ describe('DID API Tests', () => {
                 },
                 body: Readable.from(
                     [
-                        'test:dataset1',
-                        'test:dataset2',
-                        'test:dataset3',
+                        '"dataset1"',
+                        '"dataset2"',
+                        '"dataset3"',
                     ].join('\n'),
                 ),
             },
@@ -124,7 +124,7 @@ describe('DID API Tests', () => {
 
         const receivedData: any[] = []
         const onData = (data: any) => {
-            receivedData.push(data)
+            receivedData.push(JSON.parse(data))
         }
 
         const done = new Promise<void>((resolve, reject) => {

diff --git a/test/gateway/did-gateway.test.ts b/test/gateway/did-gateway.test.ts
@@ -15,12 +15,12 @@ describe('DID Gateway Tests', () => {
                     status: 401,
                 })
             }
-            if (req.url.includes('/mc16_13TeV/dids/search')) {
+            if (req.url.includes('/data17_13TeV/dids/search')) {
                 const stream = Readable.from(
                     [
-                        'data17_13TeV:00325748.physics_Main.merge.DAOD_EXOT15.f102_m2608_p3372_tid15339900_00',
-                        'data17_13TeV:00325748.physics_Main.merge.DAOD_EXOT15.f102_m2608_p3372_tid15339900_01',
-                        'data17_13TeV:00325748.physics_Main.merge.DAOD_EXOT15.f102_m2608_p3372_tid15339900_02',
+                        '"00325748.physics_Main.merge.DAOD_EXOT15.f102_m2608_p3372_tid15339900_00"',
+                        '"00325748.physics_Main.merge.DAOD_EXOT15.f102_m2608_p3372_tid15339900_01"',
+                        '"00325748.physics_Main.merge.DAOD_EXOT15.f102_m2608_p3372_tid15339900_02"',
                     ].join('\n'),
                 )
                 return Promise.resolve({
@@ -62,8 +62,8 @@ describe('DID Gateway Tests', () => {
         )
         const dto: ListDIDDTO = await rucioDIDGateway.listDIDs(
             'rucio-ddmlab-askdjljioj',
-            'mc16_13TeV',
-            'data17_13TeV.00325748.physics_Main.merge.DAOD_EXOT15.f102_m2608_p3372_tid15339900_00',
+            'data17_13TeV',
+            '00325748.physics_Main.merge.DAOD_EXOT15.f102_m2608_p3372_tid15339900_00',
             DIDType.DATASET,
         )
         expect(dto.status).toBe('success')

diff --git a/test/sdk/post-processing-streaming-pipeline/multicall-usecase.test.ts b/test/sdk/post-processing-streaming-pipeline/multicall-usecase.test.ts
@@ -117,7 +117,7 @@ describe('BaseMultiCallStreamableUseCase', () => {
 
         const receivedData: any[] = []
         const onData = (data: string) => {
-            receivedData.push(data)
+            receivedData.push(JSON.parse(data))
         }
 
         const done = new Promise<void>((resolve, reject) => {