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

[SRT-20]: add basic models and CRUD #13

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[SRT-20]: add basic models and CRUD #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ac1147
[SRT-20]: add basic models and CRUD
Jus1x-by Jun 17, 2023
65c0a0a
[SRT-20]: return accidentally deleted migration
Jus1x-by Jun 17, 2023
34ff332
[SRT-20]: remove unused imports
Jus1x-by Jun 19, 2023
eee965d
[SRT-20]: remove MustBe decorator
Jus1x-by Jun 19, 2023
ec5887a
[SRT-20]: remove country/city update from UpdateNighbout request
Jus1x-by Jun 19, 2023
b7199b6
[SRT-20]: replace enitity decorators for createdAt, updatedAt
Jus1x-by Jun 19, 2023
69da810
[SRT-20]: add validateIf
Jus1x-by Jun 19, 2023
7011e11
[SRT-20]: got it
Jus1x-by Jun 19, 2023
382b54d
[SRT-20]: change update
Jus1x-by Jun 22, 2023
c503f1a
[SRT-20]: add missing userRepository
Jus1x-by Jun 26, 2023
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
5 changes: 5 additions & 0 deletions sr-back/src/app/modules/neighbour-profile/entities/neighbour-profile.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
} from 'typeorm';
import { User } from '../../user/entities/user.entity';
import { Area } from 'src/area/entities/area.entity';
import { ValidateIf } from 'class-validator';

export enum Gender {
man = 'man',
Expand Down Expand Up @@ -51,11 +52,15 @@ export class NeighbourProfile {
@Column()
petsDescription: string;

@Column({ nullable: true })
@OneToOne(() => Area)
@JoinColumn()
@ValidateIf((u) => u.city)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

@ValidateIf((u) => !u.city)

Проверяем, что страна не нулл в том случае, когда город не указан

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Типа у нас должна быть указана или страна или город, обязательно что-то одно

country: Area;

@Column({ nullable: true })
@OneToOne(() => Area)
@ValidateIf((u) => u.country)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А город нужно проверять, если страна не указана

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

вроде понял что хочешь

@JoinColumn()
city: Area;

Expand Down
5 changes: 4 additions & 1 deletion sr-back/src/app/modules/neighbour-profile/neighbour-profile.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,13 @@ export class NeighbourProfileService {
return (await this.neighbourProfileRepository.delete({ user })).affected;
}

async getNeighbourProfile(id: number): Promise<NeighbourProfile | never> {
async getNeighbourProfileByUserId(
id: number,
): Promise<NeighbourProfile | never> {
try {
return await this.neighbourProfileRepository.findOneOrFail({
where: { id },
relations: { user: true },
});
} catch (error) {
if (error instanceof EntityNotFoundError) {
Expand Down