From 33823a5151033e28e4ca9cb8b0b7508660622f43 Mon Sep 17 00:00:00 2001
From: sovrgn <boyan.tsolov@vereign.com>
Date: Thu, 5 Oct 2023 09:12:10 +0300
Subject: [PATCH] fix: basic message dto

---
 libs/askar/src/askar/agent-event-listener.service.ts        | 4 ++--
 libs/askar/src/askar/agent.service.ts                       | 4 ++--
 .../message.record.dto.ts}                                  | 6 ++----
 libs/dtos/src/events/dtoToEventTransformer.ts               | 4 ++--
 libs/dtos/src/index.ts                                      | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)
 rename libs/dtos/src/dtos/{responses/make.basic.message.response.dto.ts => generics/message.record.dto.ts} (70%)

diff --git a/libs/askar/src/askar/agent-event-listener.service.ts b/libs/askar/src/askar/agent-event-listener.service.ts
index 9cb37228..80d3b147 100644
--- a/libs/askar/src/askar/agent-event-listener.service.ts
+++ b/libs/askar/src/askar/agent-event-listener.service.ts
@@ -11,7 +11,7 @@ import {
   ProofStateChangedEvent,
 } from "@aries-framework/core";
 import {
-  MakeBasicMessageResponseDto,
+  MessageRecordDto,
   makeEvent,
   MESSAGE_MAKE,
 } from "@ocm-engine/dtos";
@@ -76,7 +76,7 @@ export class AgentEventListenerService implements OnModuleInit {
             ev.payload.basicMessageRecord.connectionId,
           );
 
-          const dto = new MakeBasicMessageResponseDto();
+          const dto = new MessageRecordDto();
           dto.message = ev.payload.basicMessageRecord.content;
           dto.id = ev.payload.basicMessageRecord.id;
           dto.connectionId = ev.payload.basicMessageRecord.connectionId;
diff --git a/libs/askar/src/askar/agent.service.ts b/libs/askar/src/askar/agent.service.ts
index 5c848b84..9f62532a 100644
--- a/libs/askar/src/askar/agent.service.ts
+++ b/libs/askar/src/askar/agent.service.ts
@@ -15,7 +15,7 @@ import {
   IssueProofRequestDto,
   ProofRecordDto,
   MakeBasicMessageRequestDto,
-  MakeBasicMessageResponseDto,
+  MessageRecordDto,
   SchemaNotCreatedError,
   SchemaNotFoundError,
 } from "@ocm-engine/dtos";
@@ -491,7 +491,7 @@ export class AgentService {
   };
 
   sendMessage = async (message: MakeBasicMessageRequestDto) => {
-    const response = new MakeBasicMessageResponseDto();
+    const response = new MessageRecordDto();
 
     const m = await this.askar.agent.basicMessages.sendMessage(
       message.connectionId,
diff --git a/libs/dtos/src/dtos/responses/make.basic.message.response.dto.ts b/libs/dtos/src/dtos/generics/message.record.dto.ts
similarity index 70%
rename from libs/dtos/src/dtos/responses/make.basic.message.response.dto.ts
rename to libs/dtos/src/dtos/generics/message.record.dto.ts
index 720dfca6..f6b56cbd 100644
--- a/libs/dtos/src/dtos/responses/make.basic.message.response.dto.ts
+++ b/libs/dtos/src/dtos/generics/message.record.dto.ts
@@ -1,19 +1,17 @@
 import { IsNotEmpty, IsString } from "class-validator";
-import { BaseRecordDto } from "../generics/base.record.dto";
+import { BaseRecordDto } from "./base.record.dto";
 
-export class MakeBasicMessageResponseDto extends BaseRecordDto {
+export class MessageRecordDto extends BaseRecordDto {
   // @example 6464b521-005a-4379-91e0-a3692b31cafd
   @IsNotEmpty()
   @IsString()
   connectionId: string;
 
   // @example "example-ocm-name"
-  @IsNotEmpty()
   @IsString()
   from?: string;
 
   // @example "example-ocm-name"
-  @IsNotEmpty()
   @IsString()
   to?: string;
 
diff --git a/libs/dtos/src/events/dtoToEventTransformer.ts b/libs/dtos/src/events/dtoToEventTransformer.ts
index 32a4f9e5..9d885143 100644
--- a/libs/dtos/src/events/dtoToEventTransformer.ts
+++ b/libs/dtos/src/events/dtoToEventTransformer.ts
@@ -15,7 +15,7 @@ import { ConnectionReqDto } from "../dtos/requests/connection.req.dto";
 import { IssueCredentialRequestDto } from "../dtos/requests/issue.credential.request.dto";
 import { IssueProofRequestDto } from "../dtos/requests/issue.proof.request.dto";
 import { CredentialReqDto } from "../dtos/requests/credential.req.dto";
-import { MakeBasicMessageResponseDto } from "../dtos/responses/make.basic.message.response.dto";
+import { MessageRecordDto } from "../dtos/generics/message.record.dto";
 import { MakeBasicMessageRequestDto } from "../dtos/requests/make.basic.message.request.dto";
 import { ProofReqDto } from "../dtos/requests/proof.req.dto";
 import { ProofRecordDto } from "../dtos/generics/proof.record.dto";
@@ -33,7 +33,7 @@ export const makeEvent = (payload: {
     | CreateCredentialDefinitionRequsetDto
     | ProofRecordDto
     | IssueCredentialRequestDto
-    | MakeBasicMessageResponseDto
+    | MessageRecordDto
     | MakeBasicMessageRequestDto;
   type:
     | SchemaEvent
diff --git a/libs/dtos/src/index.ts b/libs/dtos/src/index.ts
index b3ab1120..46976e38 100644
--- a/libs/dtos/src/index.ts
+++ b/libs/dtos/src/index.ts
@@ -6,6 +6,7 @@ export * from "./dtos/generics/creddef.record.dto";
 export * from "./dtos/generics/credential.record.dto";
 export * from "./dtos/generics/proof.record.dto";
 export * from "./dtos/generics/schema.record.dto";
+export * from "./dtos/generics/message.record.dto";
 
 
 export * from "./dtos/requests/connection.req.dto";
@@ -22,7 +23,6 @@ export * from "./dtos/requests/make.basic.message.request.dto";
 
 export * from "./dtos/responses/create.invitation.response.dto";
 export * from "./dtos/responses/gateway.accepted.response.dto";
-export * from "./dtos/responses/make.basic.message.response.dto";
 
 export * from "./errors/connection.not.found.error";
 export * from "./errors/schema.not.created.error";
-- 
GitLab