refactor: remove unnecessary cred metadata attributes

src/core/agent/records/credentialMetadataRecord.test.ts

@@ -8,10 +8,8 @@ const mockData: CredentialMetadataRecordProps = {
   id: "credential:z6Mkpph7qyemfmHt5cSEXXbhm1VbSZT789X8Ep4eA7ndGxGh",
   isArchived: true,
   issuanceDate: "2010-01-01T19:23:24Z",
-  issuerLogo: "https://placehold.co/120x22",
   credentialType: "test",
   status: CredentialMetadataRecordStatus.CONFIRMED,
-  credentialRecordId: "1",
 };
 
 describe("Credential metadata record", () => {
@@ -26,7 +24,6 @@ describe("Credential metadata record", () => {
     expect(settingsRecord.createdAt).toBe(createdAt);
     expect(settingsRecord.isArchived).toBe(mockData.isArchived);
     expect(settingsRecord.issuanceDate).toBe(mockData.issuanceDate);
-    expect(settingsRecord.issuerLogo).toBe(mockData.issuerLogo);
     expect(settingsRecord.getTags()).toMatchObject({
       isArchived: mockData.isArchived,
     });
@@ -39,10 +36,8 @@ describe("Credential metadata record", () => {
       id: mockData.id,
       isArchived: mockData.isArchived,
       issuanceDate: "2010-01-01T19:23:24Z",
-      issuerLogo: "https://placehold.co/120x22",
       credentialType: "test",
       status: CredentialMetadataRecordStatus.CONFIRMED,
-      credentialRecordId: "1",
     });
     expect(settingsRecord.createdAt.getTime()).toBeGreaterThan(
       createdAt.getTime()
@@ -55,10 +50,8 @@ describe("Credential metadata record", () => {
       id: mockData.id,
       createdAt: createdAt,
       issuanceDate: "2010-01-01T19:23:24Z",
-      issuerLogo: "https://placehold.co/120x22",
       credentialType: "test",
       status: CredentialMetadataRecordStatus.CONFIRMED,
-      credentialRecordId: "1",
     });
     expect(settingsRecord.isArchived).toBe(false);
   });

src/core/agent/records/credentialMetadataRecord.ts

@@ -8,10 +8,8 @@ class CredentialMetadataRecord extends BaseRecord {
   isArchived?: boolean;
   isDeleted?: boolean;
   issuanceDate!: string;
-  issuerLogo?: string;
   credentialType!: string;
   status!: CredentialMetadataRecordStatus;
-  credentialRecordId!: string;
   connectionId?: string;
 
   static readonly type = "CredentialMetadataRecord";
@@ -22,12 +20,10 @@ class CredentialMetadataRecord extends BaseRecord {
 
     if (props) {
       this.id = props.id;
-      this.credentialRecordId = props.credentialRecordId;
       this.isArchived = props.isArchived ?? false;
       this.isDeleted = props.isDeleted ?? false;
       this.createdAt = props.createdAt ?? new Date();
       this.issuanceDate = props.issuanceDate;
-      this.issuerLogo = props.issuerLogo;
       this.credentialType = props.credentialType;
       this.status = props.status;
       this.connectionId = props.connectionId;
@@ -39,7 +35,6 @@ class CredentialMetadataRecord extends BaseRecord {
       ...this._tags,
       isArchived: this.isArchived,
       isDeleted: this.isDeleted,
-      credentialRecordId: this.credentialRecordId,
       connectionId: this.connectionId,
     };
   }

src/core/agent/records/credentialMetadataRecord.types.ts

@@ -9,9 +9,7 @@ interface CredentialMetadataRecordProps {
   isArchived?: boolean;
   isDeleted?: boolean;
   issuanceDate: string;
-  issuerLogo?: string;
   credentialType: string;
-  credentialRecordId: string;
   status: CredentialMetadataRecordStatus;
   connectionId?: string;
 }

src/core/agent/records/credentialStorage.test.ts

@@ -19,7 +19,6 @@ const credentialStorage = new CredentialStorage(storageService as any);
 
 const id1 = "id1";
 const id2 = "id2";
-const credentialRecordId1 = "cId1";
 
 const now = new Date();
 const nowISO = now.toISOString();
@@ -28,10 +27,8 @@ const credentialMetadataProps: CredentialMetadataRecordProps = {
   id: id1,
   createdAt: now,
   issuanceDate: nowISO,
-  issuerLogo: "issuerLogoHere",
   credentialType: "credType",
   status: CredentialMetadataRecordStatus.CONFIRMED,
-  credentialRecordId: credentialRecordId1,
 };
 
 const credentialMetadataRecordA = new CredentialMetadataRecord(
@@ -68,28 +65,6 @@ describe("Connection service of agent", () => {
     ).toEqual(credentialMetadataRecordA);
   });
 
-  test("Should get credential metadata by credential record id", async () => {
-    storageService.findAllByQuery.mockResolvedValue([
-      credentialMetadataRecordA,
-    ]);
-    expect(
-      await credentialStorage.getCredentialMetadataByCredentialRecordId(
-        credentialMetadataRecordA.id
-      )
-    ).toEqual(credentialMetadataRecordA);
-  });
-
-  test("Should get credential metadata by connection record id", async () => {
-    storageService.findAllByQuery.mockResolvedValue([
-      credentialMetadataRecordB,
-    ]);
-    expect(
-      await credentialStorage.getCredentialMetadataByCredentialRecordId(
-        credentialMetadataRecordB.id
-      )
-    ).toEqual(credentialMetadataRecordB);
-  });
-
   test("Should save credential metadata record", async () => {
     await credentialStorage.saveCredentialMetadataRecord(
       credentialMetadataProps

src/core/agent/records/credentialStorage.ts

@@ -38,22 +38,6 @@ class CredentialStorage {
     return record;
   }
 
-  async getCredentialMetadataByCredentialRecordId(
-    credentialRecordId: string
-  ): Promise<CredentialMetadataRecord | null> {
-    const records = await this.storageService.findAllByQuery(
-      {
-        credentialRecordId,
-      },
-      CredentialMetadataRecord
-    );
-    const record = records[0];
-    if (!record) {
-      return null;
-    }
-    return record;
-  }
-
   async getCredentialMetadataByConnectionId(connectionId: string) {
     const record = await this.storageService.findAllByQuery(
       {

src/core/agent/services/credentialService.test.ts

@@ -105,7 +105,6 @@ const credentialStorage = jest.mocked({
   getAllCredentialMetadata: jest.fn(),
   deleteCredentialMetadata: jest.fn(),
   getCredentialMetadata: jest.fn(),
-  getCredentialMetadataByCredentialRecordId: jest.fn(),
   getCredentialMetadataByConnectionId: jest.fn(),
   saveCredentialMetadataRecord: jest.fn(),
   updateCredentialMetadata: jest.fn(),
@@ -126,15 +125,12 @@ const nowISO = now.toISOString();
 
 const id1 = "id1";
 const id2 = "id2";
-const credentialRecordId1 = "cId1";
 const credentialMetadataProps: CredentialMetadataRecordProps = {
   id: id1,
   createdAt: now,
   issuanceDate: nowISO,
-  issuerLogo: "issuerLogoHere",
   credentialType: "credType",
   status: CredentialMetadataRecordStatus.CONFIRMED,
-  credentialRecordId: credentialRecordId1,
 };
 
 const credentialMetadataRecordA = new CredentialMetadataRecord(

src/core/agent/services/credentialService.ts

@@ -67,7 +67,7 @@ class CredentialService extends AgentService {
 
     const results = await this.signifyClient.credentials().list({
       filter: {
-        "-d": { $eq: metadata.credentialRecordId },
+        "-d": { $eq: metadata.id.replace("metadata:", "") },
       },
     });
     if (results.length > 0) {
@@ -162,17 +162,14 @@ class CredentialService extends AgentService {
     credentialId: string,
     dateTime: string
   ): Promise<void> {
-    const credentialDetails: CredentialShortDetails = {
+    const credentialDetails: CredentialMetadataRecordProps = {
       id: `metadata:${credentialId}`,
       isArchived: false,
       credentialType: "",
       issuanceDate: new Date(dateTime).toISOString(),
       status: CredentialMetadataRecordStatus.PENDING,
     };
-    await this.createMetadata({
-      ...credentialDetails,
-      credentialRecordId: credentialId,
-    });
+    await this.createMetadata(credentialDetails);
   }
 
   async syncACDCs() {
@@ -182,7 +179,7 @@ class CredentialService extends AgentService {
     const unSyncedData = signifyCredentials.filter(
       (credential: any) =>
         !storedCredentials.find(
-          (item) => credential.sad.d === item.credentialRecordId
+          (item) => credential.sad.d === item.id.replace("metadata:", "")
         )
     );
     if (unSyncedData.length) {

src/core/agent/services/credentialService.types.ts

@@ -7,7 +7,7 @@ enum CredentialStatus {
 
 type CredentialShortDetails = Omit<
   CredentialMetadataRecordProps,
-  "credentialRecordId" | "connectionId" | "createdAt" | "issuerLogo"
+  "connectionId" | "createdAt"
 >;
 
 type JSONValue =

src/core/agent/services/identifierService.test.ts

@@ -97,7 +97,6 @@ const credentialStorage = jest.mocked({
   getAllCredentialMetadata: jest.fn(),
   deleteCredentialMetadata: jest.fn(),
   getCredentialMetadata: jest.fn(),
-  getCredentialMetadataByCredentialRecordId: jest.fn(),
   getCredentialMetadataByConnectionId: jest.fn(),
   saveCredentialMetadataRecord: jest.fn(),
   updateCredentialMetadata: jest.fn(),

src/core/agent/services/ipexCommunicationService.test.ts

@@ -36,7 +36,6 @@ const credentialStorage = jest.mocked({
   getAllCredentialMetadata: jest.fn(),
   deleteCredentialMetadata: jest.fn(),
   getCredentialMetadata: jest.fn(),
-  getCredentialMetadataByCredentialRecordId: jest.fn(),
   getCredentialMetadataByConnectionId: jest.fn(),
   saveCredentialMetadataRecord: jest.fn(),
   updateCredentialMetadata: jest.fn(),
@@ -168,11 +167,9 @@ describe("Ipex communication service of agent", () => {
         },
       },
     ]);
-    credentialStorage.getCredentialMetadataByCredentialRecordId = jest
-      .fn()
-      .mockResolvedValue({
-        id: "id",
-      });
+    credentialStorage.getCredentialMetadata = jest.fn().mockResolvedValue({
+      id: "id",
+    });
     await ipexCommunicationService.acceptAcdc(id);
     expect(credentialStorage.saveCredentialMetadataRecord).toBeCalled();
     expect(credentialStorage.updateCredentialMetadata).toBeCalledWith("id", {
@@ -241,9 +238,7 @@ describe("Ipex communication service of agent", () => {
         },
       },
     ]);
-    credentialStorage.getCredentialMetadataByCredentialRecordId = jest
-      .fn()
-      .mockResolvedValue(null);
+    credentialStorage.getCredentialMetadata = jest.fn().mockResolvedValue(null);
     await expect(ipexCommunicationService.acceptAcdc(id)).rejects.toThrowError(
       IpexCommunicationService.CREDENTIAL_MISSING_METADATA_ERROR_MSG
     );

src/core/agent/services/ipexCommunicationService.ts

@@ -4,7 +4,10 @@ import {
   AcdcStateChangedEvent,
   KeriaNotification,
 } from "../agent.types";
-import { CredentialMetadataRecordStatus } from "../records/credentialMetadataRecord.types";
+import {
+  CredentialMetadataRecordProps,
+  CredentialMetadataRecordStatus,
+} from "../records/credentialMetadataRecord.types";
 import { AgentService } from "./agentService";
 import {
   CredentialShortDetails,
@@ -117,10 +120,9 @@ class IpexCommunicationService extends AgentService {
     id: string,
     cred: any
   ): Promise<CredentialShortDetails> {
-    const metadata =
-      await this.credentialStorage.getCredentialMetadataByCredentialRecordId(
-        id
-      );
+    const metadata = await this.credentialStorage.getCredentialMetadata(
+      `metadata:${id}`
+    );
     if (!metadata) {
       throw new Error(
         IpexCommunicationService.CREDENTIAL_MISSING_METADATA_ERROR_MSG
@@ -140,17 +142,16 @@ class IpexCommunicationService extends AgentService {
     credentialId: string,
     dateTime: string
   ): Promise<void> {
-    const credentialDetails: CredentialShortDetails = {
+    const credentialDetails: CredentialMetadataRecordProps = {
       id: `metadata:${credentialId}`,
       isArchived: false,
       credentialType: "",
       issuanceDate: new Date(dateTime).toISOString(),
       status: CredentialMetadataRecordStatus.PENDING,
     };
-    await this.credentialStorage.saveCredentialMetadataRecord({
-      ...credentialDetails,
-      credentialRecordId: credentialId,
-    });
+    await this.credentialStorage.saveCredentialMetadataRecord(
+      credentialDetails
+    );
   }
 
   private async admitIpex(

src/ui/pages/IncomingRequest/IncomingRequest.test.tsx

@@ -116,7 +116,6 @@ const credentialStorage = jest.mocked({
   getAllCredentialMetadata: jest.fn(),
   deleteCredentialMetadata: jest.fn(),
   getCredentialMetadata: jest.fn(),
-  getCredentialMetadataByCredentialRecordId: jest.fn(),
   getCredentialMetadataByConnectionId: jest.fn(),
   saveCredentialMetadataRecord: jest.fn(),
   updateCredentialMetadata: jest.fn(),