Skip to content

Commit cfcb162

Browse files
Merge pull request #280 from boostcampwm-2024/feature-be-#276
변경 사항만 데이터베이스에 반영
2 parents 3fc0405 + f3bee5f commit cfcb162

File tree

19 files changed

+507
-618
lines changed

19 files changed

+507
-618
lines changed

apps/backend/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
"class-transformer": "^0.5.1",
3939
"class-validator": "^0.14.1",
4040
"lib0": "^0.2.98",
41-
"node-ts-cache": "^4.4.0",
42-
"node-ts-cache-storage-memory": "^4.4.0",
4341
"passport": "^0.7.0",
4442
"passport-kakao": "^1.0.1",
4543
"passport-naver": "^1.0.6",
@@ -97,4 +95,4 @@
9795
"coverageDirectory": "../coverage",
9896
"testEnvironment": "node"
9997
}
100-
}
98+
}

apps/backend/src/edge/edge.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ import { NodeModule } from 'src/node/node.module';
1010
imports: [TypeOrmModule.forFeature([Edge]), forwardRef(() => NodeModule)],
1111
controllers: [EdgeController],
1212
providers: [EdgeService, EdgeRepository],
13-
exports: [EdgeService]
13+
exports: [EdgeService],
1414
})
1515
export class EdgeModule {}

apps/backend/src/edge/edge.service.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ export class EdgeService {
5959
}
6060
return edges;
6161
}
62-
async findEdgeByFromNodeAndToNode(fromNodeId: number, toNodeId: number){
62+
async findEdgeByFromNodeAndToNode(fromNodeId: number, toNodeId: number) {
6363
return this.edgeRepository.findOne({
6464
where: {
6565
fromNode: { id: fromNodeId },
6666
toNode: { id: toNodeId },
6767
},
6868
relations: ['fromNode', 'toNode'],
69-
}); }
69+
});
70+
}
7071
}

apps/backend/src/node-cache/node-cache.module.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

apps/backend/src/node-cache/node-cache.service.ts

Lines changed: 0 additions & 43 deletions
This file was deleted.

apps/backend/src/node/node.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ export class NodeService {
115115
y: true,
116116
page: {
117117
id: true,
118-
title: true, // content 제외하고 title만 선택
118+
title: true,
119+
emoji: true,
119120
},
120121
},
121122
});

apps/backend/src/page/dtos/updatePage.dto.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ export class UpdatePageDto {
77
description: '페이지 제목.',
88
})
99
@IsString()
10-
title: string;
10+
@IsOptional()
11+
title?: string;
1112

1213
@ApiProperty({
1314
example: "{'doc' : 'type'}",
1415
description: '페이지 내용 JSON 형태',
1516
})
1617
@IsJSON()
17-
content: JSON;
18+
@IsOptional()
19+
content?: JSON;
1820

1921
@ApiProperty({
2022
example: '📝',

apps/backend/src/page/page.service.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,10 @@ export class PageService {
5858
throw new PageNotFoundException();
5959
}
6060
// 페이지 정보를 갱신한다.
61-
const { title, content, emoji } = dto;
62-
page.title = title;
63-
page.content = content;
64-
if (emoji !== undefined) {
65-
page.emoji = emoji;
66-
}
61+
const newPage = Object.assign({}, page, dto);
6762

68-
return await this.pageRepository.save(page);
63+
// 변경된 페이지를 저장
64+
return await this.pageRepository.save(newPage);
6965
}
7066

7167
async findPageById(id: number): Promise<Page> {

apps/backend/src/yjs/yjs.module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { Module } from '@nestjs/common';
22
import { YjsService } from './yjs.service';
33
import { NodeModule } from 'src/node/node.module';
4-
import { NodeCacheModule } from 'src/node-cache/node-cache.module';
54
import { PageModule } from '../page/page.module';
65
import { EdgeModule } from '../edge/edge.module';
76

87
@Module({
9-
imports: [NodeModule, PageModule, EdgeModule, NodeCacheModule],
8+
imports: [NodeModule, PageModule, EdgeModule],
109
providers: [YjsService],
1110
})
1211
export class YjsModule {}

0 commit comments

Comments
 (0)