Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/739 - Account module migrated from identity to state #773

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Feature/739 - Account module migrated from identity to state #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/bri-3/src/bri/identity/identity.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Module } from '@nestjs/common';
import { AccountModule } from './bpiAccounts/accounts.module';
import { AccountModule } from '../state/bpiAccounts/accounts.module';
import { SubjectAccountModule } from './bpiSubjectAccounts/subjectAccounts.module';
import { SubjectModule } from './bpiSubjects/subjects.module';

Expand Down
6 changes: 3 additions & 3 deletions examples/bri-3/src/bri/state/agents/state.agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Injectable, NotFoundException } from '@nestjs/common';

import MerkleTree from 'merkletreejs';
import { BpiAccountStorageAgent } from '../../identity/bpiAccounts/agents/bpiAccountsStorage.agent';
import { BpiAccount } from '../../identity/bpiAccounts/models/bpiAccount';
import { BpiAccountStorageAgent } from '../bpiAccounts/agents/bpiAccountsStorage.agent';
import { BpiAccount } from '../bpiAccounts/models/bpiAccount';
import { MerkleTreeAgent } from '../../merkleTree/agents/merkleTree.agent';
import { MerkleTreeStorageAgent } from '../../merkleTree/agents/merkleTreeStorage.agent';
import { Witness } from '../../zeroKnowledgeProof/models/witness';
import { StateTreeLeafValueContent } from '../models/stateTreeLeafValueContent';
import { InjectMapper } from '@automapper/nestjs';
import { Mapper } from '@automapper/core';
import { LEAF_STATE_VALUE_NOT_FOUND_ERR_MESSAGE } from '../../identity/bpiAccounts/api/err.messages';
import { LEAF_STATE_VALUE_NOT_FOUND_ERR_MESSAGE } from '../bpiAccounts/api/err.messages';

// TODO: #741 We should follow this approach everywhere for storage
// https://www.prisma.io/docs/guides/performance-and-optimization/prisma-client-transactions-guide#scenario-pre-computed-ids-and-the-transaction-api
Expand Down
2 changes: 1 addition & 1 deletion ...i/identity/bpiAccounts/accounts.module.ts → .../bri/state/bpiAccounts/accounts.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Module } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { MerkleModule } from '../../merkleTree/merkle.module';
import { SubjectAccountModule } from '../bpiSubjectAccounts/subjectAccounts.module';
import { SubjectAccountModule } from '../../identity/bpiSubjectAccounts/subjectAccounts.module';
import { AccountsProfile } from './accounts.profile';
import { BpiAccountAgent } from './agents/bpiAccounts.agent';
import { BpiAccountStorageAgent } from './agents/bpiAccountsStorage.agent';
Expand Down
0 .../identity/bpiAccounts/accounts.profile.ts → ...bri/state/bpiAccounts/accounts.profile.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...y/bpiAccounts/agents/bpiAccounts.agent.ts → ...e/bpiAccounts/agents/bpiAccounts.agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import { v4 } from 'uuid';
import { BpiSubjectAccount } from '../../bpiSubjectAccounts/models/bpiSubjectAccount';
import { BpiSubjectAccount } from '../../../identity/bpiSubjectAccounts/models/bpiSubjectAccount';

import { NOT_FOUND_ERR_MESSAGE } from '../api/err.messages';
import { BpiAccount } from '../models/bpiAccount';
Expand Down
2 changes: 1 addition & 1 deletion ...counts/agents/bpiAccountsStorage.agent.ts → ...counts/agents/bpiAccountsStorage.agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { PrismaService } from '../../../../../prisma/prisma.service';
import { Witness } from '../../../zeroKnowledgeProof/models/witness';
import { NOT_FOUND_ERR_MESSAGE } from '../api/err.messages';
import { BpiAccount } from '../models/bpiAccount';
import { StateTreeLeafValueContent } from '../../../state/models/stateTreeLeafValueContent';
import { StateTreeLeafValueContent } from '../../models/stateTreeLeafValueContent';

// Repositories are the only places that talk the Prisma language of models.
// They are always mapped to and from domain objects so that the business layer of the application
Expand Down
16 changes: 8 additions & 8 deletions ...iAccounts/api/accounts.controller.spec.ts → ...iAccounts/api/accounts.controller.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
import { MerkleTreeStorageAgent } from '../../../merkleTree/agents/merkleTreeStorage.agent';
import { MerkleModule } from '../../../merkleTree/merkle.module';
import { BpiMerkleTree } from '../../../merkleTree/models/bpiMerkleTree';
import { BpiSubjectAccountAgent } from '../../bpiSubjectAccounts/agents/bpiSubjectAccounts.agent';
import { BpiSubjectAccountStorageAgent } from '../../bpiSubjectAccounts/agents/bpiSubjectAccountsStorage.agent';
import { NOT_FOUND_ERR_MESSAGE as SUBJECT_ACCOUNT_NOT_FOUND_ERR_MESSAGE } from '../../bpiSubjectAccounts/api/err.messages';
import { BpiSubjectAccount } from '../../bpiSubjectAccounts/models/bpiSubjectAccount';
import { SubjectAccountsProfile } from '../../bpiSubjectAccounts/subjectAccounts.profile';
import { BpiSubjectStorageAgent } from '../../bpiSubjects/agents/bpiSubjectsStorage.agent';
import { BpiSubject } from '../../bpiSubjects/models/bpiSubject';
import { SubjectsProfile } from '../../bpiSubjects/subjects.profile';
import { BpiSubjectAccountAgent } from '../../../identity/bpiSubjectAccounts/agents/bpiSubjectAccounts.agent';
import { BpiSubjectAccountStorageAgent } from '../../../identity/bpiSubjectAccounts/agents/bpiSubjectAccountsStorage.agent';
import { NOT_FOUND_ERR_MESSAGE as SUBJECT_ACCOUNT_NOT_FOUND_ERR_MESSAGE } from '../../../identity/bpiSubjectAccounts/api/err.messages';
import { BpiSubjectAccount } from '../../../identity/bpiSubjectAccounts/models/bpiSubjectAccount';
import { SubjectAccountsProfile } from '../../../identity/bpiSubjectAccounts/subjectAccounts.profile';
import { BpiSubjectStorageAgent } from '../../../identity/bpiSubjects/agents/bpiSubjectsStorage.agent';
import { BpiSubject } from '../../../identity/bpiSubjects/models/bpiSubject';
import { SubjectsProfile } from '../../../identity/bpiSubjects/subjects.profile';
import { AccountsProfile } from '../accounts.profile';
import { BpiAccountAgent } from '../agents/bpiAccounts.agent';
import { BpiAccountStorageAgent } from '../agents/bpiAccountsStorage.agent';
Expand All @@ -36,7 +36,7 @@
let accountController: AccountController;
let accountStorageAgentMock: DeepMockProxy<BpiAccountStorageAgent>;
let subjectAccountStorageAgentMock: DeepMockProxy<BpiSubjectAccountStorageAgent>;
let merkleTreeStorageAgentMock: DeepMockProxy<MerkleTreeStorageAgent>;

Check warning on line 39 in examples/bri-3/src/bri/state/bpiAccounts/api/accounts.controller.spec.ts

View workflow job for this annotation

GitHub Actions / ci (ubuntu-latest, 16.17.0) 

'merkleTreeStorageAgentMock' is assigned a value but never used

beforeAll(async () => {
process.env.MERKLE_TREE_HASH_ALGH = 'sha256';
Expand Down
0 ...ty/bpiAccounts/api/accounts.controller.ts → ...te/bpiAccounts/api/accounts.controller.ts
View file
Open in desktop
File renamed without changes.
0 ...dtos/request/createBpiAccount.dto.spec.ts → ...dtos/request/createBpiAccount.dto.spec.ts
View file
Open in desktop
File renamed without changes.
0 .../api/dtos/request/createBpiAccount.dto.ts → .../api/dtos/request/createBpiAccount.dto.ts
View file
Open in desktop
File renamed without changes.
0 .../api/dtos/request/updateBpiAccount.dto.ts → .../api/dtos/request/updateBpiAccount.dto.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ounts/api/dtos/response/bpiAccount.dto.ts → ...ounts/api/dtos/response/bpiAccount.dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AutoMap } from '@automapper/classes';
import { MerkleTreeDto } from '../../../../..//merkleTree/api/dtos/response/merkleTree.dto';
import { BpiSubjectAccountDto } from '../../../../bpiSubjectAccounts/api/dtos/response/bpiSubjectAccount.dto';
import { MerkleTreeDto } from '../../../../../merkleTree/api/dtos/response/merkleTree.dto';
import { BpiSubjectAccountDto } from '../../../../../identity/bpiSubjectAccounts/api/dtos/response/bpiSubjectAccount.dto';

export class BpiAccountDto {
@AutoMap()
Expand Down
0 .../identity/bpiAccounts/api/err.messages.ts → ...bri/state/bpiAccounts/api/err.messages.ts
View file
Open in desktop
File renamed without changes.
0 ...ateBpiAccount/createBpiAccount.command.ts → ...ateBpiAccount/createBpiAccount.command.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ccount/createBpiAccountCommand.handler.ts → ...ccount/createBpiAccountCommand.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { BpiSubjectAccountAgent } from '../../../bpiSubjectAccounts/agents/bpiSubjectAccounts.agent';
import { BpiSubjectAccountAgent } from '../../../../identity/bpiSubjectAccounts/agents/bpiSubjectAccounts.agent';
import { BpiAccountAgent } from '../../agents/bpiAccounts.agent';
import { BpiAccountStorageAgent } from '../../agents/bpiAccountsStorage.agent';
import { CreateBpiAccountCommand } from './createBpiAccount.command';
Expand Down
0 ...eteBpiAccount/deleteBpiAccount.command.ts → ...eteBpiAccount/deleteBpiAccount.command.ts
View file
Open in desktop
File renamed without changes.
0 ...ccount/deleteBpiAccountCommand.handler.ts → ...ccount/deleteBpiAccountCommand.handler.ts
View file
Open in desktop
File renamed without changes.
0 ...Accounts/getAllBpiAccountQuery.handler.ts → ...Accounts/getAllBpiAccountQuery.handler.ts
View file
Open in desktop
File renamed without changes.
0 ...AllBpiAccounts/getAllBpiAccounts.query.ts → ...AllBpiAccounts/getAllBpiAccounts.query.ts
View file
Open in desktop
File renamed without changes.
0 ...BpiAccountById/getBpiAccountById.query.ts → ...BpiAccountById/getBpiAccountById.query.ts
View file
Open in desktop
File renamed without changes.
0 ...untById/getBpiAccountByIdQuery.handler.ts → ...untById/getBpiAccountByIdQuery.handler.ts
View file
Open in desktop
File renamed without changes.
0 ...ateBpiAccount/updateBpiAccount.command.ts → ...ateBpiAccount/updateBpiAccount.command.ts
View file
Open in desktop
File renamed without changes.
0 ...ccount/updateBpiAccountCommand.handler.ts → ...ccount/updateBpiAccountCommand.handler.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...identity/bpiAccounts/models/bpiAccount.ts → ...ri/state/bpiAccounts/models/bpiAccount.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AutoMap } from '@automapper/classes';
import { BpiMerkleTree } from '../../../merkleTree/models/bpiMerkleTree';
import { BpiSubjectAccount } from '../../bpiSubjectAccounts/models/bpiSubjectAccount';
import { BpiSubjectAccount } from '../../../identity/bpiSubjectAccounts/models/bpiSubjectAccount';

export class BpiAccount {
@AutoMap()
Expand Down
2 changes: 1 addition & 1 deletion ...3/src/bri/state/capabilities/getStateContent/getStateTreeLeafValueContentQuery.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Mapper } from '@automapper/core';
import { InjectMapper } from '@automapper/nestjs';
import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
import { BpiAccountAgent } from '../../../identity/bpiAccounts/agents/bpiAccounts.agent';
import { BpiAccountAgent } from '../../bpiAccounts/agents/bpiAccounts.agent';
import { MerkleTreeAgent } from '../../../merkleTree/agents/merkleTree.agent';
import { StateAgent } from '../../agents/state.agent';
import { StateTreeLeafValueContentDto } from '../../api/dtos/response/stateTreeLeafValueContent.dto';
Expand Down
2 changes: 1 addition & 1 deletion examples/bri-3/src/bri/state/models/stateTreeLeafValueContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AutoMap } from '@automapper/classes';
import { BpiAccount } from '../../identity/bpiAccounts/models/bpiAccount';
import { BpiAccount } from '../bpiAccounts/models/bpiAccount';
import MerkleTree from 'merkletreejs';

export class StateTreeLeafValueContent {
Expand Down
2 changes: 1 addition & 1 deletion examples/bri-3/src/bri/state/state.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Module } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { AccountModule } from '../identity/bpiAccounts/accounts.module';
import { AccountModule } from './bpiAccounts/accounts.module';
import { MerkleModule } from '../merkleTree/merkle.module';
import { StateAgent } from './agents/state.agent';

Expand Down
2 changes: 1 addition & 1 deletion examples/bri-3/src/bri/workgroup/workflows/agents/workflows.agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from '../api/err.messages';
import { Workflow } from '../models/workflow';
import { WorkflowStorageAgent } from './workflowsStorage.agent';
import { BpiAccount } from 'src/bri/identity/bpiAccounts/models/bpiAccount';
import { BpiAccount } from 'src/bri/state/bpiAccounts/models/bpiAccount';

@Injectable()
export class WorkflowAgent {
Expand Down
4 changes: 2 additions & 2 deletions examples/bri-3/src/bri/workgroup/workflows/api/workflows.controller.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { DeepMockProxy, mockDeep } from 'jest-mock-extended';
import { validate as uuidValidate, version as uuidVersion } from 'uuid';
import { uuid } from 'uuidv4';
import { TestDataHelper } from '../../../../shared/testing/testData.helper';
import { BpiAccountAgent } from '../../../identity/bpiAccounts/agents/bpiAccounts.agent';
import { BpiAccountStorageAgent } from '../../../identity/bpiAccounts/agents/bpiAccountsStorage.agent';
import { BpiAccountAgent } from '../../../state/bpiAccounts/agents/bpiAccounts.agent';
import { BpiAccountStorageAgent } from '../../../state/bpiAccounts/agents/bpiAccountsStorage.agent';
import { BpiSubjectAccountAgent } from '../../../identity/bpiSubjectAccounts/agents/bpiSubjectAccounts.agent';
import { WORKFLOW_NOT_FOUND_ERR_MESSAGE } from '../../workflows/api/err.messages';
import { WorkgroupAgent } from '../../workgroups/agents/workgroups.agent';
Expand Down
4 changes: 2 additions & 2 deletions .../src/bri/workgroup/workflows/capabilities/createWorkflow/createWorkflowCommand.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { BpiAccountAgent } from '../../../../identity/bpiAccounts/agents/bpiAccounts.agent';
import { BpiAccountStorageAgent } from '../../../../identity/bpiAccounts/agents/bpiAccountsStorage.agent';
import { BpiAccountAgent } from '../../../../state/bpiAccounts/agents/bpiAccounts.agent';
import { BpiAccountStorageAgent } from '../../../../state/bpiAccounts/agents/bpiAccountsStorage.agent';
import { BpiSubjectAccountAgent } from '../../../../identity/bpiSubjectAccounts/agents/bpiSubjectAccounts.agent';
import { WorkgroupAgent } from '../../../../workgroup/workgroups/agents/workgroups.agent';
import { WorkflowAgent } from '../../agents/workflows.agent';
Expand Down
2 changes: 1 addition & 1 deletion examples/bri-3/src/bri/workgroup/workflows/models/workflow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AutoMap } from '@automapper/classes';
import { BpiAccount } from '../../../identity/bpiAccounts/models/bpiAccount';
import { BpiAccount } from '../../../state/bpiAccounts/models/bpiAccount';
import { Workgroup } from '../../workgroups/models/workgroup';
import { Workstep } from '../../worksteps/models/workstep';

Expand Down
2 changes: 1 addition & 1 deletion examples/bri-3/src/bri/workgroup/workflows/workflows.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Module } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { AccountModule } from '../../identity/bpiAccounts/accounts.module';
import { AccountModule } from '../../state/bpiAccounts/accounts.module';
import { SubjectAccountModule } from '../../identity/bpiSubjectAccounts/subjectAccounts.module';
import { SubjectModule } from '../../identity/bpiSubjects/subjects.module';
import { WorkgroupStorageAgent } from '../workgroups/agents/workgroupStorage.agent';
Expand Down
2 changes: 1 addition & 1 deletion examples/bri-3/src/shared/testing/builders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-empty-function */

import { BpiAccount } from '../../bri/identity/bpiAccounts/models/bpiAccount';
import { BpiAccount } from '../../bri/state/bpiAccounts/models/bpiAccount';
import { BpiSubjectAccount } from '../../bri/identity/bpiSubjectAccounts/models/bpiSubjectAccount';
import { BpiSubject } from '../../bri/identity/bpiSubjects/models/bpiSubject';
import { BpiSubjectRole } from '../../bri/identity/bpiSubjects/models/bpiSubjectRole';
Expand Down
2 changes: 1 addition & 1 deletion examples/bri-3/src/shared/testing/testData.helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { uuid } from 'uuidv4';
import { BpiAccount } from '../../bri/identity/bpiAccounts/models/bpiAccount';
import { BpiAccount } from '../../bri/state/bpiAccounts/models/bpiAccount';
import { BpiSubjectAccount } from '../../bri/identity/bpiSubjectAccounts/models/bpiSubjectAccount';
import { BpiSubject } from '../../bri/identity/bpiSubjects/models/bpiSubject';
import {
Expand Down
Loading