Skip to content

Commit

Permalink
fix : test 를 위해 데이터타입 유동화
Browse files Browse the repository at this point in the history
  • Loading branch information
kangjuhyup committed Oct 28, 2024
1 parent 725a067 commit 63e3405
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 115 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
dist

.env
.env.test

.env.db
db
.vscode
out
6 changes: 4 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const { pathsToModuleNameMapper } = require('ts-jest')
const { compilerOptions } = require('./tsconfig')
const { pathsToModuleNameMapper } = require('ts-jest');
const { compilerOptions } = require('./tsconfig');
require('dotenv').config({ path: './.env.test' });

module.exports = {
moduleFileExtensions: ['js', 'json', 'ts'],
rootDir: './src',
Expand Down
7 changes: 6 additions & 1 deletion src/database/entity/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import { YN } from '@util/yn';
import { DefaultColumn } from '@database/column/default';

export class DefaultEntity {
@Column({ name: DefaultColumn.useYn, type: 'char', length: 1, default: YN.Y })
@Column({
name: DefaultColumn.useYn,
type: process.env.NODE_ENV === 'test' ? 'varchar' : 'char',
length: 1,
default: YN.Y,
})
useYn: YN;

@Column({ name: DefaultColumn.creator, type: 'varchar', length: 20 })
Expand Down
2 changes: 1 addition & 1 deletion src/database/entity/letter.attachment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class LetterAttachmentEntity extends DefaultEntity {

@PrimaryColumn({
name: LetterAttachmentColumn.attachmentCode,
type: 'char',
type: process.env.NODE_ENV === 'test' ? 'varchar' : 'char',
length: 5,
})
attachmentCode: string;
Expand Down
2 changes: 1 addition & 1 deletion src/database/entity/letter.cateogry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { LetterCategoryColumn } from '@database/column/letter.category.column';
export class LetterCategoryEntity extends DefaultEntity {
@PrimaryColumn({
name: LetterCategoryColumn.letterCategoryCode,
type: 'char',
type: process.env.NODE_ENV === 'test' ? 'varchar' : 'char',
length: 5,
})
letterCategoryCode: LetterCategoryCode;
Expand Down
8 changes: 4 additions & 4 deletions src/database/entity/letter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ export class LetterEntity extends DefaultEntity {
letterId: number;
@Column({
name: UserColumn.userId,
type: 'char',
type: process.env.NODE_ENV === 'test' ? 'varchar' : 'char',
nullable: false,
})
userId: string;

@Column({
name: LetterCategoryColumn.letterCategoryCode,
type: 'char',
type: process.env.NODE_ENV === 'test' ? 'varchar' : 'char',
length: 5,
nullable: false,
})
Expand All @@ -59,7 +59,7 @@ export class LetterEntity extends DefaultEntity {

@Column({
name: LetterColumn.commentYn,
type: 'char',
type: process.env.NODE_ENV === 'test' ? 'varchar' : 'char',
length: 1,
nullable: false,
default: YN.N,
Expand All @@ -68,7 +68,7 @@ export class LetterEntity extends DefaultEntity {

@Column({
name: LetterColumn.attendYn,
type: 'char',
type: process.env.NODE_ENV === 'test' ? 'varchar' : 'char',
length: 1,
nullable: false,
default: YN.N,
Expand Down
12 changes: 6 additions & 6 deletions src/database/entity/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ export class UserEntity extends DefaultEntity {
@PrimaryGeneratedColumn('uuid', { name: UserColumn.userId })
userId: string;

@Column({name:UserColumn.nickName})
nickName : string;
@Column({ name: UserColumn.nickName })
nickName: string;

@Column({name:UserColumn.phone})
phone : string;
@Column({ name: UserColumn.phone })
phone: string;

@Column({name:UserColumn.password})
password : string;
@Column({ name: UserColumn.password })
password: string;
@OneToMany(() => LetterEntity, (letter) => letter.user, { nullable: true })
letter?: LetterEntity[];
}
13 changes: 7 additions & 6 deletions src/database/repository/param/user.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { UserEntity } from "@database/entity/user";
import { DefaultParameter } from "./default";
import { UserEntity } from '@database/entity/user';
import { DefaultParameter } from './default';

export class SelectUser extends DefaultParameter {
userId : string;
phone : string;
userId: string;
phone: string;
}

export class InsertUser extends DefaultParameter {
user : Pick<UserEntity,'nickName'|'phone'|'password'>
}
user: Pick<UserEntity, 'nickName' | 'phone' | 'password'>;
creator: string;
}
93 changes: 0 additions & 93 deletions src/test/app.e2e-spec.ts

This file was deleted.

0 comments on commit 63e3405

Please sign in to comment.