Skip to content

Commit

Permalink
Merge pull request #35 from plus-tdd/feature/alarm
Browse files Browse the repository at this point in the history
씨더, test.ts 빌드에서 제외
  • Loading branch information
codeing999 authored Jul 16, 2023
2 parents edae3e4 + 7e33b62 commit 6053961
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 62 deletions.
74 changes: 36 additions & 38 deletions src/module/doctor/data/doctor.db.ts
Original file line number Diff line number Diff line change
@@ -1,46 +1,44 @@
import { Repository } from "typeorm";
import { InjectRepository } from "@nestjs/typeorm";
import { Injectable } from "@nestjs/common";
import { plainToClass } from "class-transformer";
import { DoctorMapper } from "../doctor.mapper";
import { DoctorRepository } from "../domain/docter.repository";
import { DoctorEntity } from "./doctor.entity";
import { DoctorOutPutDto } from "../domain/doctor.output.dto";
import { Doctor } from "../domain/doctor.model";
import { FactoryValue } from "nestjs-seeder";
import { Repository } from 'typeorm';
import { InjectRepository } from '@nestjs/typeorm';
import { Injectable } from '@nestjs/common';
import { plainToClass } from 'class-transformer';
import { DoctorMapper } from '../doctor.mapper';
import { DoctorRepository } from '../domain/docter.repository';
import { DoctorEntity } from './doctor.entity';
import { DoctorOutPutDto } from '../domain/doctor.output.dto';
import { Doctor } from '../domain/doctor.model';

@Injectable()
export class DoctorRepositoryImpl implements DoctorRepository {
constructor(
// DB 주입
@InjectRepository(DoctorEntity)
private DoctorDB: Repository<DoctorEntity>,
) {
this.mapper = new DoctorMapper();
}

private mapper : DoctorMapper;
constructor(
// DB 주입
@InjectRepository(DoctorEntity)
private DoctorDB: Repository<DoctorEntity>,
) {
this.mapper = new DoctorMapper();
}

async findOneDoctorById(doctorId: number) : Promise<DoctorOutPutDto> {
const result = await this.DoctorDB.findOne({ where: { id: doctorId } });
return this.mapper.mapToDto(result);
}
private mapper: DoctorMapper;

async findOneDoctorById(doctorId: number): Promise<DoctorOutPutDto> {
const result = await this.DoctorDB.findOne({ where: { id: doctorId } });
return this.mapper.mapToDto(result);
}

async createMany(doctor) : Promise<boolean> {
try {
await this.DoctorDB.insert(doctor)
return true;
} catch {
return false;
}
async createMany(doctor): Promise<boolean> {
try {
await this.DoctorDB.insert(doctor);
return true;
} catch {
return false;
}
async deleteAll(): Promise<boolean> {
try {
await this.DoctorDB.clear()
return true;
} catch {
return false;
}
}
async deleteAll(): Promise<boolean> {
try {
await this.DoctorDB.clear();
return true;
} catch {
return false;
}
}
}
}
56 changes: 33 additions & 23 deletions src/module/user/data/user.entity.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import { Column, Entity, PrimaryGeneratedColumn, OneToMany, CreateDateColumn, UpdateDateColumn } from "typeorm";
import { PetEntity } from "../../pet/data/pet.entity"
import { CounselingEntity } from "../../counseling/data/counseling.entity"
import { PaymentEntity } from "../../payment/data/payment.entity";
import {
Column,
Entity,
PrimaryGeneratedColumn,
OneToMany,
CreateDateColumn,
UpdateDateColumn,
} from 'typeorm';
import { PetEntity } from '../../pet/data/pet.entity';
import { CounselingEntity } from '../../counseling/data/counseling.entity';
import { PaymentEntity } from '../../payment/data/payment.entity';
import now = jest.now;
import { Factory } from "nestjs-seeder";
//import { Factory } from "nestjs-seeder";

@Entity({
name: 'user',
Expand All @@ -13,38 +20,41 @@ export class UserEntity {
@PrimaryGeneratedColumn({ type: 'int' })
id: number;

@Factory((faker) => faker.person.fullName())
//@Factory((faker) => faker.person.fullName())
@Column('varchar', { length: 45 })
userName: string;

@Factory((faker) => faker.internet.userName())
//@Factory((faker) => faker.internet.userName())
@Column('varchar', { length: 45 })
account: string;

@Factory((faker) => faker.internet.password())
//@Factory((faker) => faker.internet.password())
@Column('varchar', { length: 100 })
password: string;

@Factory((faker) => faker.phone.number())
//@Factory((faker) => faker.phone.number())
@Column('varchar', { length: 45 })
phoneNumber: string;

@Factory((faker) => faker.date.anytime())
@CreateDateColumn({ type: "timestamp" })
//@Factory((faker) => faker.date.anytime())
@CreateDateColumn({ type: 'timestamp' })
createdAt: Date;

@Factory((faker) => faker.date.anytime())
@UpdateDateColumn({ type: "timestamp" })
//@Factory((faker) => faker.date.anytime())
@UpdateDateColumn({ type: 'timestamp' })
updatedAt: Date;

// userId 로 통일
// 유저 : 반려동물 정보 1대 다 관계 petId
@OneToMany(() => PetEntity, (PetEntity) => PetEntity.UserEntity)
PetEntity:PetEntity[]
// 유저 : 진료정보 1대 다 관계 reservationId
@OneToMany(() => CounselingEntity, (CounselingEntity) => CounselingEntity.User)
CounselingEntity:CounselingEntity[]
// 유저 : 페이먼트 1대 다 관계 paymentId
@OneToMany(() => PaymentEntity, (PaymentEntity) => PaymentEntity.User)
PaymentEntity:PaymentEntity[]
// userId 로 통일
// 유저 : 반려동물 정보 1대 다 관계 petId
@OneToMany(() => PetEntity, (PetEntity) => PetEntity.UserEntity)
PetEntity: PetEntity[];
// 유저 : 진료정보 1대 다 관계 reservationId
@OneToMany(
() => CounselingEntity,
(CounselingEntity) => CounselingEntity.User,
)
CounselingEntity: CounselingEntity[];
// 유저 : 페이먼트 1대 다 관계 paymentId
@OneToMany(() => PaymentEntity, (PaymentEntity) => PaymentEntity.User)
PaymentEntity: PaymentEntity[];
}
9 changes: 8 additions & 1 deletion tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"extends": "./tsconfig.json",
"exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
"exclude": [
"node_modules",
"test",
"dist",
"**/*spec.ts",
"*.seeder.ts",
"*.test.ts"
]
}

0 comments on commit 6053961

Please sign in to comment.