refactor: rename getStorageServiceLink to uploadData

Signed-off-by: Nam Hoang <[email protected]>
uncefact · Oct 15, 2024 · 4e93bfd · 4e93bfd
1 parent d4fdd6f
commit 4e93bfd
Show file tree

Hide file tree

Showing 20 changed files with 84 additions and 65 deletions.
diff --git a/packages/components/src/__tests__/ConformityCredential.test.tsx b/packages/components/src/__tests__/ConformityCredential.test.tsx
@@ -2,11 +2,11 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
 import { ConformityCredential } from '../components';
 import { FetchOptions } from '../types/conformityCredential.types';
-import { getJsonDataFromConformityAPI, getStorageServiceLink, getValueByPath } from '@mock-app/services';
+import { getJsonDataFromConformityAPI, uploadData, getValueByPath } from '@mock-app/services';
 import { checkStoredCredentialsConfig } from '../components/ConformityCredential/utils';
 
 jest.mock('@mock-app/services', () => ({
-  getStorageServiceLink: jest.fn(),
+  uploadData: jest.fn(),
   generateUUID: jest.fn(),
   getJsonDataFromConformityAPI: jest.fn(),
 }));
@@ -135,7 +135,7 @@ describe('ConformityCredential', () => {
       (getJsonDataFromConformityAPI as jest.Mock).mockResolvedValue(apiResp);
       (getValueByPath as jest.Mock).mockReturnValue(apiResp);
       (checkStoredCredentialsConfig as jest.Mock).mockReturnValue({ ok: true, value: '' });
-      (getStorageServiceLink as jest.Mock).mockResolvedValue('https://storage.example.com/credential');
+      (uploadData as jest.Mock).mockResolvedValue('https://storage.example.com/credential');
 
       await act(async () => {
         render(

diff --git a/packages/components/src/components/ConformityCredential/ConformityCredential.tsx b/packages/components/src/components/ConformityCredential/ConformityCredential.tsx
@@ -7,7 +7,7 @@ import {
   validateAndConstructVerifyURL,
   generateUUID,
   getJsonDataFromConformityAPI,
-  getStorageServiceLink,
+  uploadData,
   getValueByPath,
 } from '@mock-app/services';
 
@@ -172,7 +172,7 @@ export const ConformityCredential: React.FC<IConformityCredentialProps> = ({
         return;
       }
 
-      const vcUrl = await getStorageServiceLink(storedCredentialsConfig, extractedCredential, generateUUID());
+      const vcUrl = await uploadData(storedCredentialsConfig, extractedCredential, generateUUID());
       const verifyURL = validateAndConstructVerifyURL(vcUrl);
       saveConformityCredentials(credentialRequestConfig.credentialName, verifyURL, credentialRequestConfig.appOnly);
 

diff --git a/packages/services/src/__tests__/aggregationEvent.test.ts b/packages/services/src/__tests__/aggregationEvent.test.ts
@@ -1,5 +1,5 @@
 import * as vckitService from '../vckit.service';
-import { getStorageServiceLink } from '../storage.service';
+import { uploadData } from '../storage.service';
 import * as linkResolverService from '../linkResolver.service';
 import { IAggregationEventContext } from '../types/types';
 import { Result } from '../types/validateContext';
@@ -13,13 +13,14 @@ jest.mock('../vckit.service', () => ({
   issueVC: jest.fn(),
 }));
 jest.mock('../storage.service', () => ({
-  getStorageServiceLink: jest.fn(),
+  uploadData: jest.fn(),
 }));
 jest.mock('../linkResolver.service', () => ({
   registerLinkResolver: jest.fn(),
   createLinkResolver: jest.fn(),
   IdentificationKeyType: jest.fn(),
   getLinkResolverIdentifier: jest.fn(),
+  getLinkResolverIdentifierFromURI: jest.fn(),
   LinkType: {
     verificationLinkType: 'gs1:verificationService',
     certificationLinkType: 'gs1:certificationInfo',
@@ -55,7 +56,7 @@ describe('processAggregationEvent', () => {
 
   it('should process aggregation event', async () => {
     (vckitService.issueVC as jest.Mock).mockImplementationOnce(() => aggregationVCMock);
-    (getStorageServiceLink as jest.Mock).mockResolvedValueOnce('https://exampleStorage.com/vc.json');
+    (uploadData as jest.Mock).mockResolvedValueOnce('https://exampleStorage.com/vc.json');
 
     jest
       .spyOn(validateContext, 'validateAggregationEventContext')
@@ -67,7 +68,7 @@ describe('processAggregationEvent', () => {
     const aggregationVC = await processAggregationEvent(aggregationEvent, context);
 
     expect(aggregationVC).toBe(aggregationVCMock);
-    expect(getStorageServiceLink).toHaveBeenCalled();
+    expect(uploadData).toHaveBeenCalled();
     expect(validateContext.validateAggregationEventContext).toHaveBeenCalled();
     expect(linkResolverService.registerLinkResolver).toHaveBeenCalled();
   });
@@ -119,6 +120,11 @@ describe('processAggregationEvent', () => {
       jest
         .spyOn(linkResolverService, 'getLinkResolverIdentifier')
         .mockReturnValueOnce({ identifier: '0123456789', qualifierPath: '/10/ABC123' });
+      jest.spyOn(linkResolverService, 'getLinkResolverIdentifierFromURI').mockReturnValueOnce({
+        identifier: '0123456789',
+        qualifierPath: '/10/ABC123',
+        elementString: '01012345678910ABC123',
+      });
       jest.spyOn(publicAPI, 'post').mockRejectedValueOnce("Can't issue VC");
 
       await processAggregationEvent(aggregationEvent, invalidIssuerContext);
@@ -142,6 +148,11 @@ describe('processAggregationEvent', () => {
       jest
         .spyOn(linkResolverService, 'getLinkResolverIdentifier')
         .mockReturnValueOnce({ identifier: '0123456789', qualifierPath: '/10/ABC123' });
+      jest.spyOn(linkResolverService, 'getLinkResolverIdentifierFromURI').mockReturnValueOnce({
+        identifier: '0123456789',
+        qualifierPath: '/10/ABC123',
+        elementString: '01012345678910ABC123',
+      });
       jest.spyOn(publicAPI, 'put').mockRejectedValueOnce('Invalid storage provider');
 
       await processAggregationEvent(aggregationEvent, invalidStorageContext);
@@ -160,7 +171,7 @@ describe('processAggregationEvent', () => {
         dlr: { ...context.dlr, dlrAPIUrl: 'http://invalid-dlr.com' },
       };
       (vckitService.issueVC as jest.Mock).mockImplementationOnce(() => aggregationVCMock);
-      (getStorageServiceLink as jest.Mock).mockImplementation(({ url, _data, path }) => {
+      (uploadData as jest.Mock).mockImplementation(({ url, _data, path }) => {
         return `${url}/${path}`;
       });
       jest
@@ -169,6 +180,11 @@ describe('processAggregationEvent', () => {
       jest
         .spyOn(linkResolverService, 'getLinkResolverIdentifier')
         .mockReturnValueOnce({ identifier: '0123456789', qualifierPath: '/10/ABC123' });
+      jest.spyOn(linkResolverService, 'getLinkResolverIdentifierFromURI').mockReturnValueOnce({
+        identifier: '0123456789',
+        qualifierPath: '/10/ABC123',
+        elementString: '01012345678910ABC123',
+      });
       jest.spyOn(linkResolverService, 'createLinkResolver').mockRejectedValueOnce('Invalid DLR API link resolver url');
 
       await processAggregationEvent(aggregationEvent, invalidDLRContext);
@@ -177,7 +193,7 @@ describe('processAggregationEvent', () => {
       expect(error.message).toBe('Invalid DLR API link resolver url');
       expect(validateContext.validateAggregationEventContext).toHaveBeenCalled();
       expect(vckitService.issueVC).toHaveBeenCalled();
-      expect(getStorageServiceLink).toHaveBeenCalled();
+      expect(uploadData).toHaveBeenCalled();
     }
   });
 });
diff --git a/packages/services/src/__tests__/epcisEvents/objectEvent.test.ts b/packages/services/src/__tests__/epcisEvents/objectEvent.test.ts
@@ -1,7 +1,7 @@
 import { ITraceabilityEvent } from '../../types';
 import { processObjectEvent } from '../../epcisEvents/objectEvent';
 import * as vckitService from '../../vckit.service';
-import { getStorageServiceLink } from '../../storage.service';
+import { uploadData } from '../../storage.service';
 import * as linkResolverService from '../../linkResolver.service';
 import { IAggregationEventContext, IObjectEventContext } from '../../types';
 import { Result } from '../../types/validateContext';
@@ -12,7 +12,7 @@ jest.mock('../../vckit.service', () => ({
   issueVC: jest.fn(),
 }));
 jest.mock('../../storage.service', () => ({
-  getStorageServiceLink: jest.fn(),
+  uploadData: jest.fn(),
 }));
 jest.mock('../../linkResolver.service', () => ({
   registerLinkResolver: jest.fn(),
@@ -60,7 +60,7 @@ describe('processObjectEvent', () => {
     (vckitService.issueVC as jest.Mock).mockImplementation(() => ({
       credentialSubject: { id: 'https://example.com/123' },
     }));
-    (getStorageServiceLink as jest.Mock).mockResolvedValue('https://exampleStorage.com/vc.json');
+    (uploadData as jest.Mock).mockResolvedValue('https://exampleStorage.com/vc.json');
 
     jest
       .spyOn(validateContext, 'validateObjectEventContext')

diff --git a/packages/services/src/__tests__/mocks/constants.ts b/packages/services/src/__tests__/mocks/constants.ts
@@ -141,6 +141,8 @@ export const contextDPP = {
   dlr: {
     dlrAPIUrl: 'http://dlr.example.com',
     dlrAPIKey: '1234',
+    namespace: 'gs1',
+    linkRegisterPath: '/api/resolver',
   },
   storage: {
     url: 'https://storage.example.com',

diff --git a/packages/services/src/__tests__/processDPP.test.ts b/packages/services/src/__tests__/processDPP.test.ts
@@ -1,6 +1,6 @@
 import { processDPP } from '../processDPP.service';
 import { issueVC, contextDefault } from '../vckit.service';
-import { getStorageServiceLink } from '../storage.service';
+import { uploadData } from '../storage.service';
 import { registerLinkResolver, IdentificationKeyType, LinkType } from '../linkResolver.service';
 import { contextDPP, dataDPP } from './mocks/constants';
 
@@ -10,7 +10,7 @@ jest.mock('../vckit.service', () => ({
 }));
 
 jest.mock('../storage.service', () => ({
-  getStorageServiceLink: jest.fn(),
+  uploadData: jest.fn(),
 }));
 
 jest.mock('../linkResolver.service', () => ({
@@ -24,10 +24,9 @@ jest.mock('../linkResolver.service', () => ({
     verificationLinkType: 'gs1:verificationService',
     certificationLinkType: 'gs1:certificationInfo',
     epcisLinkType: 'gs1:epcis',
-  }
+  },
 }));
 
-
 describe('processDPP', () => {
   describe('successful case', () => {
     afterEach(() => {
@@ -56,7 +55,7 @@ describe('processDPP', () => {
     });
 
     it('should call process DPP', async () => {
-      (getStorageServiceLink as jest.Mock).mockImplementation(({ url, _data, path }) => {
+      (uploadData as jest.Mock).mockImplementation(({ url, _data, path }) => {
         return `${url}/${dataDPP.data.herd.identifier}`;
       });
 
@@ -75,7 +74,7 @@ describe('processDPP', () => {
             linkTitle,
             verificationPage,
             dlrAPIKey,
-            identificationKey
+            identificationKey,
           });
           return `${dlrAPIUrl}/${identificationKeyType}/${identificationKey}?linkType=all`;
         },
@@ -84,9 +83,15 @@ describe('processDPP', () => {
       const vc = await processDPP(dataDPP, contextDPP);
       expect(vc).toEqual({
         vc: expectVCResult,
-        linkResolver: contextDPP.dpp.dlrVerificationPage + '/' + contextDPP.dpp.dlrIdentificationKeyType + '/' + dataDPP.data.herd.identifier + '?linkType=all',
+        linkResolver:
+          contextDPP.dpp.dlrVerificationPage +
+          '/' +
+          contextDPP.dpp.dlrIdentificationKeyType +
+          '/' +
+          dataDPP.data.herd.identifier +
+          '?linkType=all',
       });
-      expect(getStorageServiceLink).toHaveBeenCalled();
+      expect(uploadData).toHaveBeenCalled();
       expect(registerLinkResolver).toHaveBeenCalled();
 
       const dppContext = contextDPP.dpp;
@@ -100,6 +105,7 @@ describe('processDPP', () => {
         dppContext.dlrVerificationPage,
         dlrContext.dlrAPIUrl,
         dlrContext.dlrAPIKey,
+        dlrContext.namespace,
         dataDPP.qualifierPath,
         LinkType.certificationLinkType,
       );

diff --git a/packages/services/src/__tests__/processDigitalFacilityRecord.test.ts b/packages/services/src/__tests__/processDigitalFacilityRecord.test.ts
@@ -1,5 +1,5 @@
 import * as vckitService from '../vckit.service';
-import { getStorageServiceLink } from '../storage.service';
+import { uploadData } from '../storage.service';
 import * as linkResolverService from '../linkResolver.service';
 import { Result } from '../types/validateContext';
 import * as validateContext from '../validateContext';
@@ -11,7 +11,7 @@ jest.mock('../vckit.service', () => ({
   issueVC: jest.fn(),
 }));
 jest.mock('../storage.service', () => ({
-  getStorageServiceLink: jest.fn(),
+  uploadData: jest.fn(),
 }));
 jest.mock('../linkResolver.service', () => ({
   registerLinkResolver: jest.fn(),
@@ -40,7 +40,7 @@ describe('processDigitalFacilityRecord', () => {
     (vckitService.issueVC as jest.Mock).mockImplementation(() => ({
       credentialSubject: { id: 'https://example.com/123' },
     }));
-    (getStorageServiceLink as jest.Mock).mockResolvedValue('https://exampleStorage.com/vc.json');
+    (uploadData as jest.Mock).mockResolvedValue('https://exampleStorage.com/vc.json');
 
     jest
       .spyOn(validateContext, 'validateDigitalFacilityRecordContext')

diff --git a/packages/services/src/__tests__/processDigitalIdentityAnchor.test.ts b/packages/services/src/__tests__/processDigitalIdentityAnchor.test.ts
@@ -1,5 +1,5 @@
 import * as vckitService from '../vckit.service';
-import { getStorageServiceLink } from '../storage.service';
+import { uploadData } from '../storage.service';
 import * as linkResolverService from '../linkResolver.service';
 import { Result } from '../types/validateContext';
 import * as validateContext from '../validateContext';
@@ -11,7 +11,7 @@ jest.mock('../vckit.service', () => ({
   issueVC: jest.fn(),
 }));
 jest.mock('../storage.service', () => ({
-  getStorageServiceLink: jest.fn(),
+  uploadData: jest.fn(),
 }));
 jest.mock('../linkResolver.service', () => ({
   registerLinkResolver: jest.fn(),
@@ -40,7 +40,7 @@ describe('processDigitalIdentityAnchor', () => {
     (vckitService.issueVC as jest.Mock).mockImplementation(() => ({
       credentialSubject: { id: 'https://example.com/123' },
     }));
-    (getStorageServiceLink as jest.Mock).mockResolvedValue('https://exampleStorage.com/vc.json');
+    (uploadData as jest.Mock).mockResolvedValue('https://exampleStorage.com/vc.json');
 
     jest
       .spyOn(validateContext, 'validateDigitalIdentityAnchorContext')

diff --git a/packages/services/src/__tests__/storage.test.ts b/packages/services/src/__tests__/storage.test.ts
@@ -9,7 +9,6 @@ jest.mock('../utils/httpService', () => ({
   },
 }));
 
-
 describe('storage service', () => {
   afterEach(() => {
     jest.resetAllMocks();
@@ -42,7 +41,6 @@ describe('storage service', () => {
     });
     expect(url).toEqual({
       url: `https://dev-verifiable-credentials.com/${path}`,
-
     });
   });
 
@@ -64,7 +62,7 @@ describe('storage service', () => {
         headers: [],
       },
     });
-    expect(url).toEqual(`https://dev-verifiable-credentials.com/${path}`);
+    expect(url).toEqual({ url: `https://dev-verifiable-credentials.com/${path}` });
   });
 
   // error cases

diff --git a/packages/services/src/__tests__/transactionEvent.test.ts b/packages/services/src/__tests__/transactionEvent.test.ts
@@ -3,7 +3,7 @@ import * as linkResolverService from '../linkResolver.service';
 import * as helpers from '../epcisEvents/helpers';
 import * as validateContext from '../validateContext';
 import { processTransactionEvent } from '../epcisEvents/transactionEvent';
-import { getStorageServiceLink } from '../storage.service';
+import { uploadData } from '../storage.service';
 import { Result } from '../types/validateContext';
 import { ITransactionEventContext } from '../types/types';
 import { publicAPI } from '../utils/httpService';
@@ -13,7 +13,7 @@ jest.mock('../vckit.service', () => ({
   issueVC: jest.fn(),
 }));
 jest.mock('../storage.service', () => ({
-  getStorageServiceLink: jest.fn(),
+  uploadData: jest.fn(),
 }));
 jest.mock('../linkResolver.service', () => ({
   registerLinkResolver: jest.fn(),
@@ -68,7 +68,7 @@ describe('processTransactionEvent', () => {
 
   it('should process transaction event', async () => {
     (vckitService.issueVC as jest.Mock).mockImplementationOnce(() => transactionVCMock);
-    (getStorageServiceLink as jest.Mock).mockImplementation(({ url, _data, path }) => {
+    (uploadData as jest.Mock).mockImplementation(({ url, _data, path }) => {
       return `${url}/${path}`;
     });
     jest
@@ -82,7 +82,7 @@ describe('processTransactionEvent', () => {
       vc: transactionVCMock,
       linkResolver: transactionEventDLRMock,
     });
-    expect(getStorageServiceLink).toHaveBeenCalled();
+    expect(uploadData).toHaveBeenCalled();
     expect(validateContext.validateTransactionEventContext).toHaveBeenCalled();
     expect(linkResolverService.registerLinkResolver).toHaveBeenCalled();
   });
@@ -169,7 +169,7 @@ describe('processTransactionEvent', () => {
         dlr: { ...context.dlr, dlrAPIUrl: 'http://invalid-dlr.com' },
       };
       (vckitService.issueVC as jest.Mock).mockImplementationOnce(() => transactionVCMock);
-      (getStorageServiceLink as jest.Mock).mockResolvedValueOnce('https://storage.com/vc.json');
+      (uploadData as jest.Mock).mockResolvedValueOnce('https://storage.com/vc.json');
       jest
         .spyOn(validateContext, 'validateTransactionEventContext')
         .mockReturnValueOnce({ ok: true, value: context } as Result<ITransactionEventContext>);
@@ -181,7 +181,7 @@ describe('processTransactionEvent', () => {
       expect(error.message).toBe('Invalid DLR API link resolver url');
       expect(validateContext.validateTransactionEventContext).toHaveBeenCalled();
       expect(vckitService.issueVC).toHaveBeenCalled();
-      expect(getStorageServiceLink).toHaveBeenCalled();
+      expect(uploadData).toHaveBeenCalled();
     }
   });
 });