From d28b0f8c6073276e538181c60de6df32c90a9720 Mon Sep 17 00:00:00 2001
From: maany <imptodefeat@gmail.com>
Date: Fri, 14 Jul 2023 16:25:18 +0200
Subject: [PATCH] api: fix builds for list-did feature #226

---
 src/lib/core/use-case/list-dids-usecase.ts    | 76 -------------------
 ...-dids-usecase2.ts => list-dids-usecase.ts} |  9 ---
 src/lib/core/use-case/login-config-usecase.ts |  3 +
 .../ioc/features/list-dids-feature.ts         |  3 +-
 .../presenter.ts                              |  2 +-
 5 files changed, 5 insertions(+), 88 deletions(-)
 delete mode 100644 src/lib/core/use-case/list-dids-usecase.ts
 rename src/lib/core/use-case/list-dids/{list-dids-usecase2.ts => list-dids-usecase.ts} (99%)

diff --git a/src/lib/core/use-case/list-dids-usecase.ts b/src/lib/core/use-case/list-dids-usecase.ts
deleted file mode 100644
index 157e16f3..00000000
--- a/src/lib/core/use-case/list-dids-usecase.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { injectable } from "inversify";
-import type { ListDIDsInputPort, ListDIDsOutputPort } from "@/lib/core/port/primary/list-dids-ports";
-import type DIDGatewayOutputPort from "@/lib/core/port/secondary/did-gateway-output-port";
-import { ListDIDDTO, ListDIDsStreamData } from "../dto/did-dto";
-import { ListDIDsError, ListDIDsRequest, ListDIDsResponse } from "../usecase-models/list-dids-usecase-models";
-import { parseDIDString } from "@/lib/common/did-utils";
-import { DID } from "../entity/rucio";
-import { BaseStreamingUseCase } from "@/lib/sdk/usecase";
-import { AuthenticatedRequestModel } from "@/lib/sdk/usecase-models";
-import { ListDIDsViewModel } from "@/lib/infrastructure/data/view-model/list-did";
-
-@injectable()
-class ListDIDsUseCase extends BaseStreamingUseCase<ListDIDsRequest, ListDIDsResponse, ListDIDsError, ListDIDDTO, ListDIDsStreamData, ListDIDsViewModel> implements ListDIDsInputPort {
-    constructor(
-        protected presenter: ListDIDsOutputPort,
-        private didGateway: DIDGatewayOutputPort,
-    ) {
-        super(presenter)
-        this.didGateway = didGateway;
-    }
-
-    validateRequestModel(requestModel: AuthenticatedRequestModel<ListDIDsRequest>): ListDIDsError | undefined {
-        let scope: string;
-        let name: string;
-        try{
-            let didComponents = parseDIDString(requestModel.query);
-            scope = didComponents.scope;
-            name = didComponents.name;
-        } catch (error: any) {
-            return {
-                status: 'error',
-                error: 'Invalid DID Query',
-                message: (error as Error).message,
-            } as ListDIDsError
-        }
-    }
-
-    async makeGatewayRequest(requestModel: AuthenticatedRequestModel<ListDIDsRequest>): Promise<ListDIDDTO> {
-        const { scope, name } = parseDIDString(requestModel.query);
-        const listDIDDTO: ListDIDDTO = await this.didGateway.listDIDs(requestModel.rucioAuthToken, scope, name, requestModel.type);
-        return listDIDDTO;
-    }
-
-    handleGatewayError(error: ListDIDDTO): ListDIDsError {
-        let errorType = 'Unknown Error'
-        if(error.error === 'Invalid Auth Token') {
-            errorType = 'Invalid Request'
-        }
-        else if(error.error !== 'Unknown Error') {
-            errorType = 'Invalid DID Query'
-        }
-        
-        return {
-            error: errorType,
-            message: `${error.error}: ${error.message}`,
-        } as ListDIDsError
-    }
-
-    processStreamedData(dto: DID): { data: ListDIDsResponse | ListDIDsError; status: "success" | "error"; } {
-        const responseModel: ListDIDsResponse = {
-            status: 'success',
-            name: dto.name,
-            scope: dto.scope,
-            did_type: dto.did_type,
-            length: 0,
-            bytes: 0,
-        }
-        this.didGateway.getDID()
-        return {
-            data: responseModel,
-            status: 'success',
-        }
-    }
-}
-    
-export default ListDIDsUseCase;
\ No newline at end of file
diff --git a/src/lib/core/use-case/list-dids/list-dids-usecase2.ts b/src/lib/core/use-case/list-dids/list-dids-usecase.ts
similarity index 99%
rename from src/lib/core/use-case/list-dids/list-dids-usecase2.ts
rename to src/lib/core/use-case/list-dids/list-dids-usecase.ts
index 468d9e57..d06b0f59 100644
--- a/src/lib/core/use-case/list-dids/list-dids-usecase2.ts
+++ b/src/lib/core/use-case/list-dids/list-dids-usecase.ts
@@ -82,15 +82,6 @@ class ListDIDsUseCase extends BaseMultiCallStreamableUseCase<ListDIDsRequest, Li
             isValid: true,
         }
     }
-    
-    
-
-    
-
-    
-    
-
-   
 }
     
 export default ListDIDsUseCase;
\ No newline at end of file
diff --git a/src/lib/core/use-case/login-config-usecase.ts b/src/lib/core/use-case/login-config-usecase.ts
index 595a2a66..2c5b3251 100644
--- a/src/lib/core/use-case/login-config-usecase.ts
+++ b/src/lib/core/use-case/login-config-usecase.ts
@@ -67,6 +67,7 @@ class LoginConfigUseCase extends BaseUseCase<void, LoginConfigResponse, LoginCon
         if (error.type === 'ConfigNotFound') {
             return {
                 status: 'error',
+                name: 'ConfigNotFound',
                 type: 'ConfigNotFound',
                 message: error.message? error.message : 'Configuration not found on the server.',
             }
@@ -74,6 +75,7 @@ class LoginConfigUseCase extends BaseUseCase<void, LoginConfigResponse, LoginCon
         else if (error.type === 'InvalidConfig') {
             return {
                 status: 'error',
+                name: 'InvalidConfig',
                 type: 'InvalidConfig',
                 message: error.message? error.message : 'Invalid configuration found on the server.',
             }
@@ -81,6 +83,7 @@ class LoginConfigUseCase extends BaseUseCase<void, LoginConfigResponse, LoginCon
         else {
             return {
                 status: 'error',
+                name: 'UnknownError',
                 type: 'UnknownError',
                 message: 'An unknown error occurred while fetching the configuration of login page from the server.',
             }
diff --git a/src/lib/infrastructure/ioc/features/list-dids-feature.ts b/src/lib/infrastructure/ioc/features/list-dids-feature.ts
index c0ff5030..df65d41e 100644
--- a/src/lib/infrastructure/ioc/features/list-dids-feature.ts
+++ b/src/lib/infrastructure/ioc/features/list-dids-feature.ts
@@ -17,8 +17,7 @@ import INPUT_PORT from '@/lib/infrastructure/ioc/ioc-symbols-input-port'
 import USECASE_FACTORY from '@/lib/infrastructure/ioc/ioc-symbols-usecase-factory'
 import { Container } from 'inversify'
 import ListDIDsController from '@/lib/infrastructure/controller/list-dids-controller'
-// import ListDIDsUseCase from '@/lib/core/use-case/list-dids-usecase'
-import ListDIDsUseCase from '@/lib/core/use-case/list-dids/list-dids-usecase2'
+import ListDIDsUseCase from '@/lib/core/use-case/list-dids/list-dids-usecase'
 import ListDIDsPresenter from '../../presenter/list-dids-presenter'
 
 export default class ListDidsFeature extends BaseStreamableFeature<
diff --git a/test/sdk/post-processing-streaming-pipeline/presenter.ts b/test/sdk/post-processing-streaming-pipeline/presenter.ts
index a5dfef60..32ba095e 100644
--- a/test/sdk/post-processing-streaming-pipeline/presenter.ts
+++ b/test/sdk/post-processing-streaming-pipeline/presenter.ts
@@ -1,6 +1,6 @@
 import { BaseStreamingPresenter } from "@/lib/sdk/presenter"
 import { BaseErrorResponseModel, BaseResponseModel } from "@/lib/sdk/usecase-models"
-import { StreamData, TResponseModel, ViewModel } from "./models"
+import { TResponseModel, ViewModel } from "./models"
 
 export class TestPresenter extends BaseStreamingPresenter<
         BaseResponseModel,