Skip to content

Commit b26340d

Browse files
committed
Fix import cycle
1 parent b3b426b commit b26340d

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

src/components/user/dto/actor.dto.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
type Role,
99
SecuredProperty,
1010
} from '~/common';
11-
import { RegisterResource } from '~/core';
1211
import { e } from '~/core/gel';
12+
import { RegisterResource } from '~/core/resources';
1313

1414
@RegisterResource({
1515
db: e.Actor,
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { Field, ObjectType } from '@nestjs/graphql';
2+
import { User } from './user.dto';
3+
4+
@ObjectType()
5+
export abstract class CreatePersonOutput {
6+
@Field()
7+
readonly user: User; // intentionally user
8+
}

src/components/user/dto/create-person.dto.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import { Field, InputType, ObjectType } from '@nestjs/graphql';
1+
import { Field, InputType } from '@nestjs/graphql';
22
import { Transform, Type } from 'class-transformer';
33
import { ValidateNested } from 'class-validator';
44
import { uniq } from 'lodash';
55
import { EmailField, IsIanaTimezone, NameField, Role } from '~/common';
66
import { UserStatus } from './user-status.enum';
7-
import { User } from './user.dto';
87

98
@InputType()
109
export abstract class CreatePerson {
@@ -51,9 +50,3 @@ export abstract class CreatePersonInput {
5150
@ValidateNested()
5251
readonly person: CreatePerson;
5352
}
54-
55-
@ObjectType()
56-
export abstract class CreatePersonOutput {
57-
@Field()
58-
readonly user: User; // intentionally user
59-
}

src/components/user/dto/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export * from './actor.dto';
22
export * from './user.dto';
33
export * from './list-users.dto';
44
export * from './create-person.dto';
5+
export * from './create-person-output.dto';
56
export * from './update-user.dto';
67
export * from './delete-user.dto';
78
export * from './check-email.dto';

src/core/authentication/dto/register.dto.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Field, InputType, ObjectType } from '@nestjs/graphql';
22
import { MinLength } from 'class-validator';
33
import { type ID } from '~/common';
4-
import { CreatePerson } from '../../../components/user/dto';
4+
import { CreatePerson } from '../../../components/user/dto/create-person.dto';
55

66
@InputType()
77
export abstract class RegisterInput extends CreatePerson {

0 commit comments

Comments
 (0)