From 7737dcb7f66ec7f58ba99721319ca8e9675fc47f Mon Sep 17 00:00:00 2001
From: Alexey Lunin <alexey.lunin@vereign.com>
Date: Thu, 9 May 2024 05:09:35 +0300
Subject: [PATCH] OP#242 Group all askar services under one folder

---
 .../askar/src/askar-nats/askar.nats.module.ts | 16 +++++++--------
 .../src/askar-nats/event.handler.service.ts   | 16 +++++++--------
 .../askar/src/askar-rest/askar.rest.module.ts | 16 +++++++--------
 libs/askar/src/askar-rest/rest.controller.ts  | 16 +++++++--------
 libs/askar/src/askar/askar.module.ts          | 20 +++++++++----------
 .../agent-event-listener.service.ts           |  2 +-
 .../{ => services}/agent.anoncreds.service.ts |  0
 .../agent.basicMessages.service.ts            |  0
 .../agent.connections.service.ts              |  0
 .../agent.credentials.service.ts              |  2 +-
 .../{ => services}/agent.dids.service.ts      |  0
 .../{ => services}/agent.jsonld.service.ts    |  2 +-
 .../askar/{ => services}/agent.oob.service.ts |  0
 .../{ => services}/agent.proofs.service.ts    |  2 +-
 .../src/askar/{ => services}/askar.service.ts |  2 +-
 libs/askar/src/index.ts                       | 18 ++++++++---------
 16 files changed, 56 insertions(+), 56 deletions(-)
 rename libs/askar/src/askar/{ => services}/agent-event-listener.service.ts (99%)
 rename libs/askar/src/askar/{ => services}/agent.anoncreds.service.ts (100%)
 rename libs/askar/src/askar/{ => services}/agent.basicMessages.service.ts (100%)
 rename libs/askar/src/askar/{ => services}/agent.connections.service.ts (100%)
 rename libs/askar/src/askar/{ => services}/agent.credentials.service.ts (99%)
 rename libs/askar/src/askar/{ => services}/agent.dids.service.ts (100%)
 rename libs/askar/src/askar/{ => services}/agent.jsonld.service.ts (99%)
 rename libs/askar/src/askar/{ => services}/agent.oob.service.ts (100%)
 rename libs/askar/src/askar/{ => services}/agent.proofs.service.ts (99%)
 rename libs/askar/src/askar/{ => services}/askar.service.ts (99%)

diff --git a/libs/askar/src/askar-nats/askar.nats.module.ts b/libs/askar/src/askar-nats/askar.nats.module.ts
index 35bc4aa7..49b79138 100644
--- a/libs/askar/src/askar-nats/askar.nats.module.ts
+++ b/libs/askar/src/askar-nats/askar.nats.module.ts
@@ -3,14 +3,14 @@ import { ConfigModule } from "@nestjs/config";
 import { LedgersModule } from "@ocm-engine/ledgers";
 import { APP_PIPE } from "@nestjs/core";
 import { AgentConsumerService } from "./agent.consumer.service";
-import { AgentAnoncredsService } from "../askar/agent.anoncreds.service";
-import { AgentBasicMessagesService } from "../askar/agent.basicMessages.service";
-import { AgentConnectionsService } from "../askar/agent.connections.service";
-import { AgentCredentialsService } from "../askar/agent.credentials.service";
-import { AgentDidsService } from "../askar/agent.dids.service";
-import { AgentJsonldService } from "../askar/agent.jsonld.service";
-import { AgentOobService } from "../askar/agent.oob.service";
-import { AgentProofsService } from "../askar/agent.proofs.service";
+import { AgentAnoncredsService } from "../askar/services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "../askar/services/agent.basicMessages.service";
+import { AgentConnectionsService } from "../askar/services/agent.connections.service";
+import { AgentCredentialsService } from "../askar/services/agent.credentials.service";
+import { AgentDidsService } from "../askar/services/agent.dids.service";
+import { AgentJsonldService } from "../askar/services/agent.jsonld.service";
+import { AgentOobService } from "../askar/services/agent.oob.service";
+import { AgentProofsService } from "../askar/services/agent.proofs.service";
 import { ConsumerService } from "@ocm-engine/nats";
 import { GatewayClient } from "@ocm-engine/clients";
 import { EventHandlerService } from "./event.handler.service";
diff --git a/libs/askar/src/askar-nats/event.handler.service.ts b/libs/askar/src/askar-nats/event.handler.service.ts
index 88e1c771..aaff61b7 100644
--- a/libs/askar/src/askar-nats/event.handler.service.ts
+++ b/libs/askar/src/askar-nats/event.handler.service.ts
@@ -1,12 +1,12 @@
 import { Injectable, Logger } from "@nestjs/common";
-import { AgentAnoncredsService } from "../askar/agent.anoncreds.service";
-import { AgentBasicMessagesService } from "../askar/agent.basicMessages.service";
-import { AgentConnectionsService } from "../askar/agent.connections.service";
-import { AgentCredentialsService } from "../askar/agent.credentials.service";
-import { AgentDidsService } from "../askar/agent.dids.service";
-import { AgentJsonldService } from "../askar/agent.jsonld.service";
-import { AgentOobService } from "../askar/agent.oob.service";
-import { AgentProofsService } from "../askar/agent.proofs.service";
+import { AgentAnoncredsService } from "../askar/services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "../askar/services/agent.basicMessages.service";
+import { AgentConnectionsService } from "../askar/services/agent.connections.service";
+import { AgentCredentialsService } from "../askar/services/agent.credentials.service";
+import { AgentDidsService } from "../askar/services/agent.dids.service";
+import { AgentJsonldService } from "../askar/services/agent.jsonld.service";
+import { AgentOobService } from "../askar/services/agent.oob.service";
+import { AgentProofsService } from "../askar/services/agent.proofs.service";
 import {
   AcceptProofDto,
   CloudEventDto,
diff --git a/libs/askar/src/askar-rest/askar.rest.module.ts b/libs/askar/src/askar-rest/askar.rest.module.ts
index 853cc04e..b68904ff 100644
--- a/libs/askar/src/askar-rest/askar.rest.module.ts
+++ b/libs/askar/src/askar-rest/askar.rest.module.ts
@@ -1,12 +1,12 @@
 import { Module, ValidationPipe } from "@nestjs/common";
-import { AgentAnoncredsService } from "../askar/agent.anoncreds.service";
-import { AgentBasicMessagesService } from "../askar/agent.basicMessages.service";
-import { AgentConnectionsService } from "../askar/agent.connections.service";
-import { AgentCredentialsService } from "../askar/agent.credentials.service";
-import { AgentDidsService } from "../askar/agent.dids.service";
-import { AgentJsonldService } from "../askar/agent.jsonld.service";
-import { AgentOobService } from "../askar/agent.oob.service";
-import { AgentProofsService } from "../askar/agent.proofs.service";
+import { AgentAnoncredsService } from "../askar/services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "../askar/services/agent.basicMessages.service";
+import { AgentConnectionsService } from "../askar/services/agent.connections.service";
+import { AgentCredentialsService } from "../askar/services/agent.credentials.service";
+import { AgentDidsService } from "../askar/services/agent.dids.service";
+import { AgentJsonldService } from "../askar/services/agent.jsonld.service";
+import { AgentOobService } from "../askar/services/agent.oob.service";
+import { AgentProofsService } from "../askar/services/agent.proofs.service";
 import { ConfigModule } from "@nestjs/config";
 import { LedgersModule } from "@ocm-engine/ledgers";
 import { APP_PIPE } from "@nestjs/core";
diff --git a/libs/askar/src/askar-rest/rest.controller.ts b/libs/askar/src/askar-rest/rest.controller.ts
index 5fc0b0e6..c2d8a349 100644
--- a/libs/askar/src/askar-rest/rest.controller.ts
+++ b/libs/askar/src/askar-rest/rest.controller.ts
@@ -9,14 +9,14 @@ import {
   UseFilters,
   UseGuards,
 } from "@nestjs/common";
-import { AgentAnoncredsService } from "../askar/agent.anoncreds.service";
-import { AgentBasicMessagesService } from "../askar/agent.basicMessages.service";
-import { AgentConnectionsService } from "../askar/agent.connections.service";
-import { AgentCredentialsService } from "../askar/agent.credentials.service";
-import { AgentDidsService } from "../askar/agent.dids.service";
-import { AgentJsonldService } from "../askar/agent.jsonld.service";
-import { AgentOobService } from "../askar/agent.oob.service";
-import { AgentProofsService } from "../askar/agent.proofs.service";
+import { AgentAnoncredsService } from "../askar/services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "../askar/services/agent.basicMessages.service";
+import { AgentConnectionsService } from "../askar/services/agent.connections.service";
+import { AgentCredentialsService } from "../askar/services/agent.credentials.service";
+import { AgentDidsService } from "../askar/services/agent.dids.service";
+import { AgentJsonldService } from "../askar/services/agent.jsonld.service";
+import { AgentOobService } from "../askar/services/agent.oob.service";
+import { AgentProofsService } from "../askar/services/agent.proofs.service";
 import {
   CreateCredentialDefinitionRequestDto,
   OfferCredentialRequestDto,
diff --git a/libs/askar/src/askar/askar.module.ts b/libs/askar/src/askar/askar.module.ts
index 6edfac6d..44dc10a3 100644
--- a/libs/askar/src/askar/askar.module.ts
+++ b/libs/askar/src/askar/askar.module.ts
@@ -1,16 +1,16 @@
 import { Module, Global } from "@nestjs/common";
-import { AskarService } from "./askar.service";
-import { AgentAnoncredsService } from "./agent.anoncreds.service";
-import { AgentBasicMessagesService } from "./agent.basicMessages.service";
-import { AgentConnectionsService } from "./agent.connections.service";
-import { AgentCredentialsService } from "./agent.credentials.service";
-import { AgentDidsService } from "./agent.dids.service";
-import { AgentJsonldService } from "./agent.jsonld.service";
-import { AgentOobService } from "./agent.oob.service";
-import { AgentProofsService } from "./agent.proofs.service";
+import { AskarService } from "./services/askar.service";
+import { AgentAnoncredsService } from "./services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "./services/agent.basicMessages.service";
+import { AgentConnectionsService } from "./services/agent.connections.service";
+import { AgentCredentialsService } from "./services/agent.credentials.service";
+import { AgentDidsService } from "./services/agent.dids.service";
+import { AgentJsonldService } from "./services/agent.jsonld.service";
+import { AgentOobService } from "./services/agent.oob.service";
+import { AgentProofsService } from "./services/agent.proofs.service";
 import { ConfigModule } from "@nestjs/config";
 import { LedgersModule } from "@ocm-engine/ledgers";
-import { AgentEventListenerService } from "./agent-event-listener.service";
+import { AgentEventListenerService } from "./services/agent-event-listener.service";
 import { GatewayClient } from "@ocm-engine/clients";
 
 @Global()
diff --git a/libs/askar/src/askar/agent-event-listener.service.ts b/libs/askar/src/askar/services/agent-event-listener.service.ts
similarity index 99%
rename from libs/askar/src/askar/agent-event-listener.service.ts
rename to libs/askar/src/askar/services/agent-event-listener.service.ts
index 64977822..d1dde4d6 100644
--- a/libs/askar/src/askar/agent-event-listener.service.ts
+++ b/libs/askar/src/askar/services/agent-event-listener.service.ts
@@ -19,7 +19,7 @@ import {
   svdxConnectionStateChangeHandler,
   svdxProofStateChangeHandler,
   webHookHandler,
-} from "../agent.utils";
+} from "../../agent.utils";
 
 @Injectable()
 export class AgentEventListenerService implements OnModuleInit {
diff --git a/libs/askar/src/askar/agent.anoncreds.service.ts b/libs/askar/src/askar/services/agent.anoncreds.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.anoncreds.service.ts
rename to libs/askar/src/askar/services/agent.anoncreds.service.ts
diff --git a/libs/askar/src/askar/agent.basicMessages.service.ts b/libs/askar/src/askar/services/agent.basicMessages.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.basicMessages.service.ts
rename to libs/askar/src/askar/services/agent.basicMessages.service.ts
diff --git a/libs/askar/src/askar/agent.connections.service.ts b/libs/askar/src/askar/services/agent.connections.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.connections.service.ts
rename to libs/askar/src/askar/services/agent.connections.service.ts
diff --git a/libs/askar/src/askar/agent.credentials.service.ts b/libs/askar/src/askar/services/agent.credentials.service.ts
similarity index 99%
rename from libs/askar/src/askar/agent.credentials.service.ts
rename to libs/askar/src/askar/services/agent.credentials.service.ts
index fa8904a7..8cfbbbad 100644
--- a/libs/askar/src/askar/agent.credentials.service.ts
+++ b/libs/askar/src/askar/services/agent.credentials.service.ts
@@ -15,7 +15,7 @@ import {
   CredentialState,
   Query,
 } from "@credo-ts/core";
-import { waitForCredentialExchangeRecordSubject } from "../agent.utils";
+import { waitForCredentialExchangeRecordSubject } from "../../agent.utils";
 
 @Injectable()
 export class AgentCredentialsService {
diff --git a/libs/askar/src/askar/agent.dids.service.ts b/libs/askar/src/askar/services/agent.dids.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.dids.service.ts
rename to libs/askar/src/askar/services/agent.dids.service.ts
diff --git a/libs/askar/src/askar/agent.jsonld.service.ts b/libs/askar/src/askar/services/agent.jsonld.service.ts
similarity index 99%
rename from libs/askar/src/askar/agent.jsonld.service.ts
rename to libs/askar/src/askar/services/agent.jsonld.service.ts
index d69751aa..c0f8029e 100644
--- a/libs/askar/src/askar/agent.jsonld.service.ts
+++ b/libs/askar/src/askar/services/agent.jsonld.service.ts
@@ -19,7 +19,7 @@ import {
   W3cJsonLdVerifiableCredential,
 } from "@credo-ts/core";
 import { uuid } from "@credo-ts/core/build/utils/uuid";
-import { getFirstDidWebRecord } from "../agent.utils";
+import { getFirstDidWebRecord } from "../../agent.utils";
 
 @Injectable()
 export class AgentJsonldService {
diff --git a/libs/askar/src/askar/agent.oob.service.ts b/libs/askar/src/askar/services/agent.oob.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.oob.service.ts
rename to libs/askar/src/askar/services/agent.oob.service.ts
diff --git a/libs/askar/src/askar/agent.proofs.service.ts b/libs/askar/src/askar/services/agent.proofs.service.ts
similarity index 99%
rename from libs/askar/src/askar/agent.proofs.service.ts
rename to libs/askar/src/askar/services/agent.proofs.service.ts
index 11d3ed6c..fa4c5f3c 100644
--- a/libs/askar/src/askar/agent.proofs.service.ts
+++ b/libs/askar/src/askar/services/agent.proofs.service.ts
@@ -12,7 +12,7 @@ import {
 import { ProofState, Query, ProofExchangeRecord } from "@credo-ts/core";
 import { AnonCredsRequestedAttribute } from "@credo-ts/anoncreds";
 import { uuid } from "@credo-ts/core/build/utils/uuid";
-import { waitForProofExchangeRecordSubject } from "../agent.utils";
+import { waitForProofExchangeRecordSubject } from "../../agent.utils";
 
 @Injectable()
 export class AgentProofsService {
diff --git a/libs/askar/src/askar/askar.service.ts b/libs/askar/src/askar/services/askar.service.ts
similarity index 99%
rename from libs/askar/src/askar/askar.service.ts
rename to libs/askar/src/askar/services/askar.service.ts
index facf2431..84819cf9 100644
--- a/libs/askar/src/askar/askar.service.ts
+++ b/libs/askar/src/askar/services/askar.service.ts
@@ -29,7 +29,7 @@ import {
   setupEventBehaviorSubjects,
   setupSubjectTransports,
   generateDidWeb,
-} from "../agent.utils";
+} from "../../agent.utils";
 import { IConfAgent } from "@ocm-engine/config";
 import { BehaviorSubject } from "rxjs";
 import express from "express";
diff --git a/libs/askar/src/index.ts b/libs/askar/src/index.ts
index 6aecc570..c9a560b5 100644
--- a/libs/askar/src/index.ts
+++ b/libs/askar/src/index.ts
@@ -1,12 +1,12 @@
 export * from "./askar/askar.module";
-export * from "./askar/agent.anoncreds.service";
-export * from "./askar/agent.basicMessages.service";
-export * from "./askar/agent.connections.service";
-export * from "./askar/agent.credentials.service";
-export * from "./askar/agent.dids.service";
-export * from "./askar/agent.jsonld.service";
-export * from "./askar/agent.oob.service";
-export * from "./askar/agent.proofs.service";
-export * from "./askar/askar.service";
+export * from "./askar/services/agent.anoncreds.service";
+export * from "./askar/services/agent.basicMessages.service";
+export * from "./askar/services/agent.connections.service";
+export * from "./askar/services/agent.credentials.service";
+export * from "./askar/services/agent.dids.service";
+export * from "./askar/services/agent.jsonld.service";
+export * from "./askar/services/agent.oob.service";
+export * from "./askar/services/agent.proofs.service";
+export * from "./askar/services/askar.service";
 export * from "./askar.dynamic.module";
 export * from "./askar-rest/askar.rest.module";
-- 
GitLab