Skip to content
Snippets Groups Projects
Commit 401159ba authored by Boyan Tsolov's avatar Boyan Tsolov
Browse files

fix: names, base class that is extended upon

parent 00514632
No related branches found
No related tags found
1 merge request!44Preparations for ui
Pipeline #65918 passed with stage
in 1 minute and 49 seconds
Showing
with 101 additions and 116 deletions
......@@ -7,7 +7,7 @@ import {
ConnectionEvent,
CreateInvitationResponseDto,
GatewayAcceptedResponseDto,
ConnectionRefDto,
ConnectionReqDto,
makeEvent,
} from "@ocm-engine/dtos";
......@@ -21,7 +21,7 @@ export class AppController {
async create(
@Body()
payload: {
data: null | CreateInvitationResponseDto | ConnectionRefDto;
data: null | CreateInvitationResponseDto | ConnectionReqDto;
type: ConnectionEvent;
source: string;
},
......
......@@ -2,7 +2,7 @@ import { Body, Controller, Get, Param, Post, UseFilters } from "@nestjs/common";
import { AllExceptionsHandler } from "../exception.handler";
import { AttestationManagerClient } from "@ocm-engine/clients";
import {
CredentialRefDto,
CredentialReqDto,
CreateCredentialDefinitionRequsetDto,
CreateSchemaRequestDto,
CRED_DEF_CREATE,
......@@ -11,7 +11,7 @@ import {
CRED_OFFER_ACCEPT,
CRED_OFFER_LIST,
GatewayAcceptedResponseDto,
SchemaRefDto,
SchemaReqDto,
IssueCredentialRequestDto,
MakeBasicMessageRequestDto,
MESSAGE_MAKE,
......@@ -165,8 +165,8 @@ export class AttestationController {
"Method will fetch specific schema or return null. The id of the response will be matched when you receive event from the websocket",
tags: ["Schema"],
})
async getSchemaById(@Body() schemaRequestDto: SchemaRefDto) {
return this.amClient.sendPayload<SchemaRefDto>({
async getSchemaById(@Body() schemaRequestDto: SchemaReqDto) {
return this.amClient.sendPayload<SchemaReqDto>({
pattern: "schemas",
payload: {
source: "/schemas-by-id",
......@@ -504,7 +504,7 @@ export class AttestationController {
tags: ["Credentials Offers"],
})
acceptCredential(@Param("credential_record_id") credentialRecordId: string) {
const data = new CredentialRefDto();
const data = new CredentialReqDto();
data.credentialRecordId = credentialRecordId;
return this.amClient.sendPayload({
pattern: "credentials",
......
......@@ -15,7 +15,7 @@ import {
CONNECTION_LIST,
CreateInvitationResponseDto,
GatewayAcceptedResponseDto,
ConnectionRefDto,
ConnectionReqDto,
} from "@ocm-engine/dtos";
import { AllExceptionsHandler } from "../exception.handler";
import {
......@@ -238,10 +238,10 @@ export class ConnectionController {
tags: ["Connections"],
})
async getById(@Param("id") id: string) {
const request = new ConnectionRefDto();
const request = new ConnectionReqDto();
request.connectionId = id;
return this.cmClient.sendPayload<ConnectionRefDto>({
return this.cmClient.sendPayload<ConnectionReqDto>({
pattern: "connections",
payload: {
source: "/connections/:id",
......
import { Body, Controller, Get, Param, Post, UseFilters } from "@nestjs/common";
import {
ProofRefDto,
ProofReqDto,
GatewayAcceptedResponseDto,
SchemaRefDto,
SchemaReqDto,
IssueProofRequestDto,
PROOF_ACCEPT,
PROOF_DECLINE,
......@@ -60,7 +60,7 @@ export class ProofController {
tags: ["Credentials Proof"],
})
proofs() {
return this.pmClient.sendPayload<SchemaRefDto>({
return this.pmClient.sendPayload<SchemaReqDto>({
pattern: "proofs",
payload: {
source: "/credential/proofs",
......@@ -106,10 +106,10 @@ export class ProofController {
tags: ["Credentials Proof"],
})
getProofById(@Param("proof_record_id") proofRecordId: string) {
const data = new ProofRefDto();
const data = new ProofReqDto();
data.proofRecordId = proofRecordId;
return this.pmClient.sendPayload<ProofRefDto>({
return this.pmClient.sendPayload<ProofReqDto>({
pattern: "proofs",
payload: {
source: "/credentials/proof/:proof_record_id",
......@@ -228,8 +228,8 @@ export class ProofController {
"Method accept credential proof. The id of the response will be matched when you receive event from the websocket",
tags: ["Credentials Proof"],
})
acceptProof(@Body() acceptProofRequestDto: ProofRefDto) {
return this.pmClient.sendPayload<ProofRefDto>({
acceptProof(@Body() acceptProofRequestDto: ProofReqDto) {
return this.pmClient.sendPayload<ProofReqDto>({
pattern: "proofs",
payload: {
source: "/credentials/proofs/accept",
......@@ -275,10 +275,10 @@ export class ProofController {
tags: ["Credentials Proof"],
})
declineProofRequest(@Param("proof_record_id") proofRecordId: string) {
const data = new ProofRefDto();
const data = new ProofReqDto();
data.proofRecordId = proofRecordId;
return this.pmClient.sendPayload<ProofRefDto>({
return this.pmClient.sendPayload<ProofReqDto>({
pattern: "proofs",
payload: {
source: "/credentials/proof/:proof_record_id/decline",
......
......@@ -3,7 +3,7 @@ import { Body, Controller, Logger } from "@nestjs/common";
import { ProducerService } from "@ocm-engine/nats";
import { MessagePattern, RpcException } from "@nestjs/microservices";
import {
ProofRefDto,
ProofReqDto,
CloudEventDto,
GatewayAcceptedResponseDto,
makeEvent,
......@@ -20,7 +20,7 @@ export class AppController {
async create(
@Body()
payload: {
data: null | ProofRefDto;
data: null | ProofReqDto;
type: ProofEvent;
source: string;
},
......
import { Injectable, Logger } from "@nestjs/common";
import { AgentService } from "../askar/agent.service";
import {
CredentialRefDto,
ProofRefDto,
CredentialReqDto,
ProofReqDto,
CloudEventDto,
CONNECTION_ACCEPT,
CONNECTION_CREATE,
......@@ -16,8 +16,8 @@ import {
CRED_LIST,
CRED_OFFER_ACCEPT,
CRED_OFFER_LIST,
ConnectionRefDto,
SchemaRefDto,
ConnectionReqDto,
SchemaReqDto,
IssueCredentialRequestDto,
IssueProofRequestDto,
MakeBasicMessageRequestDto,
......@@ -58,7 +58,7 @@ export class EventHandlerService {
break;
case CONNECTION_GET:
dto = event.data as ConnectionRefDto;
dto = event.data as ConnectionReqDto;
data = await this.agentService.getConnectionById(dto.connectionId);
break;
......@@ -71,7 +71,7 @@ export class EventHandlerService {
break;
case SCHEMA_GET:
dto = event.data as SchemaRefDto;
dto = event.data as SchemaReqDto;
data = await this.agentService.getSchemaById(dto.schemaId);
break;
case CRED_DEF_CREATE:
......@@ -95,7 +95,7 @@ export class EventHandlerService {
break;
case CRED_OFFER_ACCEPT:
dto = event.data as CredentialRefDto;
dto = event.data as CredentialReqDto;
data = await this.agentService.acceptCredential(
dto.credentialRecordId,
);
......@@ -111,18 +111,18 @@ export class EventHandlerService {
break;
case PROOF_GET:
dto = event.data as ProofRefDto;
dto = event.data as ProofReqDto;
data = await this.agentService.getProofById(dto.proofRecordId);
break;
case PROOF_ACCEPT:
data = await this.agentService.acceptProof(
event.data as ProofRefDto,
event.data as ProofReqDto,
);
break;
case PROOF_DECLINE:
dto = event.data as ProofRefDto;
dto = event.data as ProofReqDto;
data = await this.agentService.declineProofRequest(
dto.proofRecordId,
);
......
......@@ -8,7 +8,7 @@ import {
IssueProofRequestDto,
CreateSchemaRequestDto,
MakeBasicMessageRequestDto,
ProofRefDto,
ProofReqDto,
} from "@ocm-engine/dtos";
import { AllExceptionsHandler } from "./exception.handler";
......@@ -79,12 +79,12 @@ export class RestController {
}
@Get("credential/proof/:proof_record_id")
getProof(@Param("proof_record_id") data: ProofRefDto) {
getProof(@Param("proof_record_id") data: ProofReqDto) {
return this.agentService.getProofById(data.proofRecordId);
}
@Post(`/credential/proof/accept`)
acceptProof(@Body() acceptProofRequestDto: ProofRefDto) {
acceptProof(@Body() acceptProofRequestDto: ProofReqDto) {
return this.agentService.acceptProof(acceptProofRequestDto);
}
......
......@@ -2,7 +2,7 @@ import { Injectable } from "@nestjs/common";
import { AskarService } from "./askar.service";
import {
ConnectionRecordDto,
ProofRefDto,
ProofReqDto,
ConnectionNotFoundError,
CreateCredentialDefinitionRequsetDto,
CreddefRecordDto,
......@@ -55,7 +55,7 @@ export class AgentService {
const r = new ConnectionRecordDto();
r.connectionName = connectionRecord.theirLabel;
r.connectionId = connectionRecord.id;
r.id = connectionRecord.id;
r.did = connectionRecord.did;
r.invitationDid = connectionRecord.invitationDid;
r.outOfBandId = connectionRecord.outOfBandId;
......@@ -69,7 +69,7 @@ export class AgentService {
let connectionArray = agentResponse.map((singleConnectionRes) => {
let connectionResponse = new ConnectionRecordDto();
connectionResponse.connectionId = singleConnectionRes.id;
connectionResponse.id = singleConnectionRes.id;
connectionResponse.state = singleConnectionRes.state;
connectionResponse.connectionName = singleConnectionRes.theirLabel;
connectionResponse.alias = singleConnectionRes.alias;
......@@ -97,7 +97,7 @@ export class AgentService {
}
let connectionResponse = new ConnectionRecordDto();
connectionResponse.connectionId = agentResponse.id;
connectionResponse.id = agentResponse.id;
connectionResponse.state = agentResponse.state;
connectionResponse.connectionName = agentResponse.theirLabel;
connectionResponse.alias = agentResponse.alias;
......@@ -115,7 +115,7 @@ export class AgentService {
let schemaResponse = agentResponse.map((singleSchemaRes) => {
let schemaResponse = new SchemaRecordDto();
schemaResponse.schemaId = singleSchemaRes.schemaId;
schemaResponse.id = singleSchemaRes.schemaId;
schemaResponse.name = singleSchemaRes.schema.name;
schemaResponse.attributes = singleSchemaRes.schema.attrNames;
schemaResponse.version = singleSchemaRes.schema.version;
......@@ -140,7 +140,7 @@ export class AgentService {
}
let schemaResponse = new SchemaRecordDto();
schemaResponse.schemaId = agentResponse.schemaId;
schemaResponse.id = agentResponse.schemaId;
schemaResponse.name = agentResponse.schema.name;
schemaResponse.attributes = agentResponse.schema.attrNames;
schemaResponse.version = agentResponse.schema.version;
......@@ -170,7 +170,7 @@ export class AgentService {
const response = new SchemaRecordDto();
response.name = schemaResult.schemaState.schema.name;
response.schemaId = schemaResult.schemaState.schemaId;
response.id = schemaResult.schemaState.schemaId;
response.issuerId = schemaResult.schemaState.schema.issuerId;
response.version = schemaResult.schemaState.schema.version;
response.attributes = schemaResult.schemaState.schema.attrNames;
......@@ -198,7 +198,7 @@ export class AgentService {
}
const response = new CreddefRecordDto();
response.credentialDefinitionId =
response.id =
credDef.credentialDefinitionState.credentialDefinitionId;
response.schemaId =
credDef.credentialDefinitionState.credentialDefinition.schemaId;
......@@ -229,7 +229,7 @@ export class AgentService {
console.log(JSON.stringify(credentialExchangeRecord, null, 2));
const response = new CredentialRecordDto();
response.credentialId = credentialExchangeRecord.id;
response.id = credentialExchangeRecord.id;
response.connectionId = credentialExchangeRecord.connectionId;
response.attributes = credentialExchangeRecord.credentialAttributes;
response.createdAt = credentialExchangeRecord.createdAt;
......@@ -257,7 +257,7 @@ export class AgentService {
});
const response = new CredentialRecordDto();
response.credentialId = credentialExchangeRecord.id;
response.id = credentialExchangeRecord.id;
response.connectionId = credentialExchangeRecord.connectionId;
response.attributes = credentialExchangeRecord.credentialAttributes;
response.createdAt = credentialExchangeRecord.createdAt;
......@@ -273,7 +273,7 @@ export class AgentService {
const response: Array<CredentialRecordDto> = [];
for (const offer of credentials) {
const t = new CredentialRecordDto();
t.credentialId = offer.id;
t.id = offer.id;
t.connectionId = offer.connectionId;
t.createdAt = offer.createdAt;
t.attributes = offer.credentialAttributes;
......@@ -291,7 +291,7 @@ export class AgentService {
const response: Array<CredentialRecordDto> = [];
for (const offer of offers) {
const t = new CredentialRecordDto();
t.credentialId = offer.id;
t.id = offer.id;
t.connectionId = offer.connectionId;
t.createdAt = offer.createdAt;
t.attributes = offer.credentialAttributes;
......@@ -359,7 +359,7 @@ export class AgentService {
});
const response = new ProofRecordDto();
response.proofId = exchangeRecord.id;
response.id = exchangeRecord.id;
response.connectionId = exchangeRecord.connectionId;
response.state = exchangeRecord.state;
response.updatedAt = exchangeRecord.updatedAt;
......@@ -376,7 +376,7 @@ export class AgentService {
const response: Array<ProofRecordDto> = [];
for (const proof of proofs) {
const t = new ProofRecordDto();
t.proofId = proof.id;
t.id = proof.id;
t.connectionId = proof.connectionId;
t.state = proof.state;
t.updatedAt = proof.updatedAt;
......@@ -397,7 +397,7 @@ export class AgentService {
const proofResponse = new ProofRecordDto();
proofResponse.proofId = proofRecord.id;
proofResponse.id = proofRecord.id;
proofResponse.connectionId = proofRecord.connectionId;
proofResponse.state = proofRecord.state;
proofResponse.updatedAt = proofRecord.updatedAt;
......@@ -406,7 +406,7 @@ export class AgentService {
return proofResponse;
};
acceptProof = async (acceptProofDto: ProofRefDto) => {
acceptProof = async (acceptProofDto: ProofReqDto) => {
if (acceptProofDto.proofUrl) {
return this.acceptOobProof(acceptProofDto.proofUrl);
}
......@@ -436,7 +436,7 @@ export class AgentService {
const response = new ProofRecordDto();
response.proofId = acceptedRecord.id;
response.id = acceptedRecord.id;
response.state = acceptedRecord.state;
response.updatedAt = acceptedRecord.updatedAt;
response.createdAt = acceptedRecord.createdAt;
......@@ -461,7 +461,7 @@ export class AgentService {
console.log(JSON.stringify(proof, null, 2));
const response = new ProofRecordDto();
response.proofId = proof.id;
response.id = proof.id;
response.connectionId = proof.connectionId;
response.state = proof.state;
response.updatedAt = proof.updatedAt;
......@@ -477,7 +477,7 @@ export class AgentService {
});
const declineResponse = new ProofRecordDto();
declineResponse.proofId = resultFromDecline.id;
declineResponse.id = resultFromDecline.id;
declineResponse.connectionId = resultFromDecline.connectionId;
declineResponse.state = resultFromDecline.state;
declineResponse.updatedAt = resultFromDecline.updatedAt;
......
import { IsDateString, IsNotEmpty, IsString } from "class-validator";
export class BaseRecordDto {
@IsString()
@IsNotEmpty()
id: string;
@IsDateString()
@IsNotEmpty()
createdAt: Date;
@IsDateString()
updatedAt?: Date;
}
\ No newline at end of file
import { IsDateString, IsNotEmpty, IsString } from "class-validator";
import { BaseRecordDto } from "./base.record.dto";
// INFO: should cover:
......@@ -7,12 +7,7 @@ import { IsDateString, IsNotEmpty, IsString } from "class-validator";
// 2. accept connection response
export class ConnectionRecordDto {
//@example 6464b521-005a-4379-91e0-a3692b31cafd
@IsNotEmpty()
@IsString()
connectionId: string;
export class ConnectionRecordDto extends BaseRecordDto {
@IsNotEmpty()
@IsString()
state: string;
......@@ -31,8 +26,4 @@ export class ConnectionRecordDto {
@IsString()
outOfBandId?: string;
@IsDateString()
@IsNotEmpty()
createdAt: Date;
}
\ No newline at end of file
import { IsNotEmpty, IsString } from "class-validator";
import { BaseRecordDto } from "./base.record.dto";
// INFO: should cover:
......@@ -7,10 +8,7 @@ import { IsNotEmpty, IsString } from "class-validator";
// 2. create credential definition response
export class CreddefRecordDto {
@IsNotEmpty()
@IsString()
credentialDefinitionId: string;
export class CreddefRecordDto extends BaseRecordDto {
@IsNotEmpty()
@IsString()
......
......@@ -7,6 +7,7 @@ import {
} from "class-validator";
import { Type } from "class-transformer";
import { IssueCredentialAttributes } from "../requests/issue.credential.request.dto";
import { BaseRecordDto } from "./base.record.dto";
// INFO: should cover:
......@@ -16,25 +17,25 @@ import { IssueCredentialAttributes } from "../requests/issue.credential.request.
export class Credential {
@IsNotEmpty()
@IsString()
credentialRecordType: string;
// export class Credential extends BaseRecordDto {
// @IsNotEmpty()
// @IsString()
// credentialRecordType: string;
@IsNotEmpty()
@IsString()
credentialRecordId: string;
}
// @IsNotEmpty()
// @IsString()
// credentialRecordId: string;
// }
export class CredentialRecordDto {
@IsArray()
@ValidateNested({ each: true })
@Type(() => Credential)
credentials?: Array<Credential>;
export class CredentialRecordDto extends BaseRecordDto {
// @IsArray()
// @ValidateNested({ each: true })
// @Type(() => Credential)
// credentials?: Array<Credential>;
@IsNotEmpty()
@IsString()
credentialId: string;
credentialRecordType: string;
@IsString()
connectionId?: string;
......@@ -43,8 +44,4 @@ export class CredentialRecordDto {
@ValidateNested({ each: true })
@Type(() => IssueCredentialAttributes)
attributes?: Array<IssueCredentialAttributes>;
@IsNotEmpty()
@IsDateString()
createdAt: Date;
}
......@@ -3,6 +3,7 @@ import {
IsNotEmpty,
IsString
} from "class-validator";
import { BaseRecordDto } from "./base.record.dto";
// INFO: should cover:
......@@ -11,22 +12,11 @@ import {
// 2. get proof response
// 3. issue proof response
export class ProofRecordDto {
@IsString()
@IsNotEmpty()
proofId: string;
export class ProofRecordDto extends BaseRecordDto {
@IsString()
connectionId?: string;
@IsString()
@IsNotEmpty()
state: string;
@IsDateString()
updatedAt?: Date;
@IsNotEmpty()
@IsDateString()
createdAt: Date;
}
import { IsDateString, IsNotEmpty, IsString } from "class-validator";
import { BaseRecordDto } from "./base.record.dto";
// INFO: should cover:
......@@ -6,11 +7,7 @@ import { IsDateString, IsNotEmpty, IsString } from "class-validator";
// 1. create schema response
// 2. get schema response
export class SchemaRecordDto {
@IsNotEmpty()
@IsString()
schemaId: string;
export class SchemaRecordDto extends BaseRecordDto {
@IsString()
@IsNotEmpty()
name: string;
......@@ -22,9 +19,6 @@ export class SchemaRecordDto {
@IsString()
version: string;
@IsDateString()
updatedAt?: Date;
@IsString()
issuerId?: string;
......
......@@ -6,7 +6,7 @@ import { IsNotEmpty, IsString } from "class-validator";
// 1. get connection request
export class ConnectionRefDto {
export class ConnectionReqDto {
//@example 6464b521-005a-4379-91e0-a3692b31cafd
@IsNotEmpty()
@IsString()
......
......@@ -5,7 +5,7 @@ import { IsNotEmpty, IsString } from "class-validator";
// 1. get credential definition request
export class CreddefRefDto {
export class CreddefReqDto {
@IsNotEmpty()
@IsString()
credentialDefinitionId: string;
......
......@@ -9,7 +9,7 @@ import { IsNotEmpty, IsString } from "class-validator";
export class CredentialRefDto {
export class CredentialReqDto {
//@example cf8395a5-9a53-4e06-8a5d-04e0fc00ca04
@IsNotEmpty()
@IsString()
......
......@@ -7,7 +7,7 @@ import { IsNotEmpty, IsString } from "class-validator";
// 2. decline proof request
// 3. accept proof request
export class ProofRefDto {
export class ProofReqDto {
@IsString()
@IsNotEmpty()
proofRecordId: string;
......
......@@ -5,7 +5,7 @@ import { IsNotEmpty, IsString } from "class-validator";
// 1. get schema request
export class SchemaRefDto {
export class SchemaReqDto {
//@example "did:indy:LEDNGER:SXM76gQwRnjkgoz2oBnGjd/anoncreds/v0/SCHEMA/test schema/1.0.2"
@IsNotEmpty()
@IsString()
......
import { IsNotEmpty, IsString } from "class-validator";
import { BaseRecordDto } from "../generics/base.record.dto";
export class MakeBasicMessageResponseDto {
@IsNotEmpty()
@IsString()
id: string;
export class MakeBasicMessageResponseDto extends BaseRecordDto {
// @example 6464b521-005a-4379-91e0-a3692b31cafd
@IsNotEmpty()
@IsString()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment