test: add test for new storage

src/core/agent/agent.ts

@@ -50,7 +50,6 @@ class Agent {
   private storageSession!: SqliteSession | IonicSession;
 
   private basicStorageService!: BasicStorage;
-
   private identifierStorage!: IdentifierStorage;
   private credentialStorage!: CredentialStorage;
   private connectionStorage!: ConnectionStorage;

src/core/agent/services/agentService.ts

@@ -6,11 +6,8 @@ import { CredentialStorage } from "../records/credentialStorage";
 import { AgentServicesProps } from "../agent.types";
 
 abstract class AgentService {
-  // protected readonly basicStorage: StorageApi;
   protected readonly signifyClient: SignifyClient;
   protected readonly eventService: EventService;
-  // protected readonly identifierStorage: IdentifierStorage;
-  // protected readonly credentialStorage: CredentialStorage;
 
   constructor(agentServicesProps: AgentServicesProps) {
     this.signifyClient = agentServicesProps.signifyClient;

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

@@ -5,7 +5,6 @@ import {
 } from "../records/credentialMetadataRecord.types";
 import { CredentialMetadataRecord } from "../records/credentialMetadataRecord";
 import { EventService } from "./eventService";
-import { RecordType } from "../../storage/storage.types";
 import { NotificationRoute } from "../agent.types";
 
 const basicStorage = jest.mocked({
@@ -111,14 +110,25 @@ const credentialStorage = jest.mocked({
 });
 
 const agentServicesProps = {
-  basicStorage: basicStorage as any,
   signifyClient: signifyClient as any,
   eventService: new EventService(),
-  identifierStorage: identifierStorage as any,
-  credentialStorage: credentialStorage as any,
 };
 
-const credentialService = new CredentialService(agentServicesProps);
+const notificationStorage = jest.mocked({
+  save: jest.fn(),
+  delete: jest.fn(),
+  deleteById: jest.fn(),
+  update: jest.fn(),
+  findById: jest.fn(),
+  findAllByQuery: jest.fn(),
+  getAll: jest.fn(),
+});
+
+const credentialService = new CredentialService(
+  agentServicesProps,
+  credentialStorage as any,
+  notificationStorage as any
+);
 
 const now = new Date();
 const nowISO = now.toISOString();
@@ -396,38 +406,38 @@ describe("Credential service of agent", () => {
   });
 
   test("Should be able to getUnhandledIpexGrantNotifications", async () => {
-    const basicRecord = {
+    const notificationRecord = {
       _tags: {
         isDismiss: true,
-        type: RecordType.KERIA_NOTIFICATION,
         route: NotificationRoute.Credential,
       },
       id: "AIeGgKkS23FDK4mxpfodpbWhTydFz2tdM64DER6EdgG-",
       createdAt: new Date(),
-      content: {
+      a: {
         r: NotificationRoute.Credential,
         d: "EF6Nmxz8hs0oVc4loyh2J5Sq9H3Z7apQVqjO6e4chtsp",
       },
     };
-    basicStorage.findAllByQuery = jest.fn().mockResolvedValue([basicRecord]);
+    notificationStorage.findAllByQuery = jest
+      .fn()
+      .mockResolvedValue([notificationRecord]);
     expect(
       await credentialService.getUnhandledIpexGrantNotifications()
     ).toStrictEqual([
       {
-        id: basicRecord.id,
-        createdAt: basicRecord.createdAt,
-        a: basicRecord.content,
+        id: notificationRecord.id,
+        createdAt: notificationRecord.createdAt,
+        a: notificationRecord.a,
       },
     ]);
   });
 
   test("Should pass the filter throught findAllByQuery when call getUnhandledIpexGrantNotifications", async () => {
-    basicStorage.findAllByQuery = jest.fn().mockResolvedValue([]);
+    notificationStorage.findAllByQuery = jest.fn().mockResolvedValue([]);
     await credentialService.getUnhandledIpexGrantNotifications({
       isDismissed: false,
     });
-    expect(basicStorage.findAllByQuery).toBeCalledWith({
-      type: RecordType.KERIA_NOTIFICATION,
+    expect(notificationStorage.findAllByQuery).toBeCalledWith({
       route: NotificationRoute.Credential,
       isDismissed: false,
     });

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

@@ -29,14 +29,14 @@ const identifierStorage = jest.mocked({
 });
 
 const agentServicesProps = {
-  basicStorage: {} as any,
   signifyClient: signifyClient as any,
   eventService: new EventService(),
-  identifierStorage: identifierStorage as any,
-  credentialStorage: {} as any,
 };
 
-const delegationService = new DelegationService(agentServicesProps);
+const delegationService = new DelegationService(
+  agentServicesProps,
+  identifierStorage as any
+);
 
 describe("Delegation sig service of agent", () => {
   beforeEach(() => {

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

@@ -103,14 +103,14 @@ const credentialStorage = jest.mocked({
 });
 
 const agentServicesProps = {
-  basicStorage: basicStorage as any,
   signifyClient: signifyClient as any,
   eventService: new EventService(),
-  identifierStorage: identifierStorage as any,
-  credentialStorage: credentialStorage as any,
 };
 
-const identifierService = new IdentifierService(agentServicesProps);
+const identifierService = new IdentifierService(
+  agentServicesProps,
+  identifierStorage as any
+);
 
 jest.mock("../../../core/agent/agent", () => ({
   Agent: {

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

@@ -2,7 +2,7 @@ import { EventService } from "./eventService";
 import { IpexCommunicationService } from "./ipexCommunicationService";
 import { CredentialStatus } from "./credentialService.types";
 
-const basicStorage = jest.mocked({
+const notificationStorage = jest.mocked({
   open: jest.fn(),
   save: jest.fn(),
   delete: jest.fn(),
@@ -13,7 +13,7 @@ const basicStorage = jest.mocked({
       return {
         id,
         createdAt: "2024-04-29T11:01:04.903Z",
-        content: {
+        a: {
           d: "saidForUuid",
         },
       };
@@ -133,11 +133,8 @@ const signifyClient = jest.mocked({
 const eventService = new EventService();
 
 const agentServicesProps = {
-  basicStorage: basicStorage as any,
   signifyClient: signifyClient as any,
   eventService,
-  identifierStorage: identifierStorage as any,
-  credentialStorage: credentialStorage as any,
 };
 
 jest.mock("../../../core/agent/agent", () => ({
@@ -151,7 +148,10 @@ jest.mock("../../../core/agent/agent", () => ({
 }));
 
 const ipexCommunicationService = new IpexCommunicationService(
-  agentServicesProps
+  agentServicesProps,
+  identifierStorage as any,
+  credentialStorage as any,
+  notificationStorage as any
 );
 
 describe("Ipex communication service of agent", () => {
@@ -176,7 +176,7 @@ describe("Ipex communication service of agent", () => {
       id: "id",
       status: CredentialStatus.CONFIRMED,
     });
-    expect(basicStorage.deleteById).toBeCalledWith(id);
+    expect(notificationStorage.deleteById).toBeCalledWith(id);
   });
 
   test("cannot accept ACDC if the notification is missing in the DB", async () => {
@@ -190,10 +190,10 @@ describe("Ipex communication service of agent", () => {
   test("cannot accept ACDC if identifier is not locally stored", async () => {
     // @TODO - foconnor: Ensure syncing process resovles this edge case of identifier in cloud but not local prior to release.
     const id = "uuid";
-    basicStorage.findById = jest.fn().mockResolvedValue({
+    notificationStorage.findById = jest.fn().mockResolvedValue({
       id,
       createdAt: "2024-04-29T11:01:04.903Z",
-      content: {
+      a: {
         d: "saidForUuid",
       },
     });
@@ -205,7 +205,7 @@ describe("Ipex communication service of agent", () => {
     );
     expect(credentialStorage.saveCredentialMetadataRecord).toBeCalled();
     expect(credentialStorage.updateCredentialMetadata).not.toBeCalled();
-    expect(basicStorage.deleteById).not.toBeCalled();
+    expect(notificationStorage.deleteById).not.toBeCalled();
   });
 
   // This test should go when this has been made event driven.

src/core/agent/services/ipexCommunicationService.ts

@@ -38,7 +38,7 @@ class IpexCommunicationService extends AgentService {
 
   protected readonly identifierStorage: IdentifierStorage;
   protected readonly credentialStorage: CredentialStorage;
-  protected readonly notificationStorage!: NotificationStorage;
+  protected readonly notificationStorage: NotificationStorage;
 
   constructor(
     agentServiceProps: AgentServicesProps,

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

@@ -6,9 +6,8 @@ import { ConnectionStatus, NotificationRoute } from "../agent.types";
 import { Agent } from "../agent";
 import { EventService } from "./eventService";
 import { MultiSigService } from "./multiSigService";
-import { RecordType } from "../../storage/storage.types";
 
-const basicStorage = jest.mocked({
+const notificationStorage = jest.mocked({
   open: jest.fn(),
   save: jest.fn(),
   delete: jest.fn(),
@@ -101,14 +100,15 @@ const identifierStorage = jest.mocked({
 });
 
 const agentServicesProps = {
-  basicStorage: basicStorage as any,
   signifyClient: signifyClient as any,
   eventService: new EventService(),
-  identifierStorage: identifierStorage as any,
-  credentialStorage: {} as any,
 };
 
-const multiSigService = new MultiSigService(agentServicesProps);
+const multiSigService = new MultiSigService(
+  agentServicesProps,
+  identifierStorage as any,
+  notificationStorage as any
+);
 
 let mockResolveOobi = jest.fn();
 let mockGetIdentifiers = jest.fn();
@@ -346,7 +346,7 @@ describe("Multisig sig service of agent", () => {
 
   test("can join the multisig inception", async () => {
     const multisigIdentifier = "newMultisigIdentifierAid";
-    basicStorage.findById = jest.fn().mockResolvedValue({
+    notificationStorage.findById = jest.fn().mockResolvedValue({
       content: {
         d: "d",
       },
@@ -618,7 +618,7 @@ describe("Multisig sig service of agent", () => {
     identifierStorage.getIdentifierMetadata = jest
       .fn()
       .mockResolvedValue(metadata);
-    basicStorage.findById = jest.fn().mockResolvedValue({
+    notificationStorage.findById = jest.fn().mockResolvedValue({
       content: {
         d: "d",
       },
@@ -662,7 +662,7 @@ describe("Multisig sig service of agent", () => {
     identifierStorage.getIdentifierMetadata = jest
       .fn()
       .mockResolvedValue(metadata);
-    basicStorage.findById = jest.fn().mockResolvedValue({
+    notificationStorage.findById = jest.fn().mockResolvedValue({
       content: {
         d: "d",
       },
@@ -1021,38 +1021,38 @@ describe("Multisig sig service of agent", () => {
   });
 
   test("Can get unhandled Multisig Identifier notifications", async () => {
-    const basicRecord = {
+    const notificationRecord = {
       _tags: {
         isDismiss: true,
-        type: RecordType.KERIA_NOTIFICATION,
         route: NotificationRoute.MultiSigIcp,
       },
       id: "AIeGgKkS23FDK4mxpfodpbWhTydFz2tdM64DER6EdgG-",
       createdAt: new Date(),
-      content: {
+      a: {
         r: NotificationRoute.MultiSigIcp,
         d: "EF6Nmxz8hs0oVc4loyh2J5Sq9H3Z7apQVqjO6e4chtsp",
       },
     };
-    basicStorage.findAllByQuery = jest.fn().mockResolvedValue([basicRecord]);
+    notificationStorage.findAllByQuery = jest
+      .fn()
+      .mockResolvedValue([notificationRecord]);
     expect(
       await multiSigService.getUnhandledMultisigIdentifiers()
     ).toStrictEqual([
       {
-        id: basicRecord.id,
-        createdAt: basicRecord.createdAt,
-        a: basicRecord.content,
+        id: notificationRecord.id,
+        createdAt: notificationRecord.createdAt,
+        a: notificationRecord.a,
       },
     ]);
   });
 
   test("Should pass the filter throught findAllByQuery when call getUnhandledMultisigIdentifiers", async () => {
-    basicStorage.findAllByQuery = jest.fn().mockResolvedValue([]);
+    notificationStorage.findAllByQuery = jest.fn().mockResolvedValue([]);
     await multiSigService.getUnhandledMultisigIdentifiers({
       isDismissed: false,
     });
-    expect(basicStorage.findAllByQuery).toBeCalledWith({
-      type: RecordType.KERIA_NOTIFICATION,
+    expect(notificationStorage.findAllByQuery).toBeCalledWith({
       route: NotificationRoute.MultiSigIcp,
       isDismissed: false,
       $or: [

src/core/storage/ionicStorage/ionicStorage.test.ts

@@ -1,5 +1,4 @@
 import { IonicStorage } from "./ionicStorage";
-import { RecordType } from "../storage.types";
 import { BasicRecord } from "../../agent/records";
 
 const startTime = new Date();

src/core/storage/sqliteStorage/sqliteStorage.test.ts

@@ -1,8 +1,7 @@
 import { SqliteStorage } from "./sqliteStorage";
 import { convertDbQuery } from "./utils";
-import { RecordType, StorageRecord } from "../storage.types";
+import { StorageRecord } from "../storage.types";
 import { BasicRecord } from "../../agent/records";
-import { SqliteSession } from "./sqliteSession";
 
 const startTime = new Date();
 

src/ui/pages/CreatePassword/CreatePassword.tsx

@@ -21,7 +21,6 @@ import { ScrollablePageLayout } from "../../components/layout/ScrollablePageLayo
 import { PageFooter } from "../../components/PageFooter";
 import { passwordStrengthChecker } from "../../utils/passwordStrengthChecker";
 import { PasswordValidation } from "../../components/PasswordValidation";
-import { RecordType } from "../../../core/storage/storage.types";
 import { useAppIonRouter } from "../../hooks";
 
 const CreatePassword = () => {
@@ -68,9 +67,6 @@ const CreatePassword = () => {
         await Agent.agent.basicStorage.save({
           id: MiscRecordId.OP_PASS_HINT,
           content: { value: hintValue },
-          tags: {
-            type: RecordType.OP_PASS_HINT,
-          },
         });
       }
     }