Feat : AI 분류 폴더 이름 리스트get api, AI 분류 링크 리스트 get api #26

hye-on · 2024-06-29T17:15:26Z

PR 내용

BaseDocument 의 createdAt, updatedAt을 타입을 string에서 Date로 수정
AI 분류 폴더 이름 리스트 get api
AI 분류 링크 리스트 get api
postAIClassification의 keywords타입을 string으로 변경

PR 중점사항

잘 부탁드립니다

Marades · 2024-06-29T18:16:32Z

src/modules/classification/classification.service.ts

+    @InjectModel(Folder.name) private folderModel: Model<Folder>,
+    @InjectModel(PostAIClassification.name)
+    private postAiClassificationModel: Model<PostAIClassification>,
+    @InjectModel(Post.name) private postModel: Model<Post>,


이부분 나중에 repo로 빼보면 좋을 거 같당

Marades · 2024-06-29T18:24:16Z

src/modules/classification/classification.service.ts

+  async getFolderNameList(
+    userId: Types.ObjectId,
+  ): Promise<AIFolderNameServiceDto[]> {
+    const folders = await this.folderModel.find({ userId }).exec();


요거 내가 folderRepo에 findByUserId라는 메소드로 만들어놨으~

오빠꺼 아직 머지 안되서 머지되면 수정할께!

Marades · 2024-06-29T18:26:41Z

src/modules/classification/dto/getAIFolderNameLIst.dto.ts

+  name: string;
+
+  constructor(data: FolderDocument) {
+    (this.id = data._id.toString()), (this.name = data.name);


요 부분 먼가 포매팅이 잘못 된 거 같당

JonghunAn · 2024-06-29T18:19:16Z

src/infrastructure/database/schema/post.schema.ts

@@ -14,6 +14,7 @@ export class Post {

  @Prop({ required: true })
  title!: string;
+  //TODO : 사진 추가


(˵ •̀ ᴗ - ˵ ) ✧
사진은 프론트에서 url 전달주면 opengraph로 가져오기로함! 필드 없어도 돼

JonghunAn · 2024-06-29T18:48:59Z

src/modules/classification/classification.service.ts

+    const folders = await this.folderModel.find({ userId }).exec();
+    const folderIds = folders.map((folder) => folder._id);


**(/¯◡‿◡)/¯✧·˚ : *✧·˚ : ***
이거 폴더 id만 필요한거면 folders 가져와서 map 하지말고 요렇게 하는 방법도 있네~
근데 folder schema는 필드가 많지않아서 건회가 만들어둔 findByUserId 써두 될듯~

https://www.zerocho.com/category/MongoDB/post/59bd148b1474c800194b695a

Suggested change

const folders = await this.folderModel.find({ userId }).exec();

const folderIds = folders.map((folder) => folder._id);

const folders = await this.folderModel.find({ userId }).select('')exec();

const folderIds = folders.map((folder) => folder._id);

오호 땡큐
건회오빠꺼 머지되면 만들어둔 findByUserId 써서 수정할께!

JonghunAn · 2024-06-29T18:54:21Z

src/modules/classification/classification.service.ts

+    const classifications = await this.postAiClassificationModel
+      .find({ suggestedFolderId: { $in: folderIds } })
+      .exec();
+
+    const uniqueFolderIds = [
+      ...new Set(
+        classifications.map((classification) =>
+          classification.suggestedFolderId.toString(),
+        ),
+      ),
+    ];


˵ •̀ ᴗ - ˵ ) ✧

Suggested change

const classifications = await this.postAiClassificationModel

.find({ suggestedFolderId: { $in: folderIds } })

.exec();

const uniqueFolderIds = [

...new Set(

classifications.map((classification) =>

classification.suggestedFolderId.toString(),

),

),

];

const classifications = await this.postAiClassificationModel.distinct(folder_id).

.find({ suggestedFolderId: { $in: folderIds } })

.exec();

폴더 아이디를 중복을 제외하고 가져오고 싶으면 Set 하지말고 쿼리에서 distinct 쓰는게 맞을 것 같아~
문법은 지원하는데 저렇게 쓰는지는 한번 테스트해봐~
https://mongoosejs.com/docs/api/query.html#Query.prototype.distinct()

JonghunAn · 2024-06-29T19:02:16Z

src/modules/classification/dto/getAIPostList.dto.ts

+  constructor(data: InputType) {
+    this.id = data.id;
+    this.title = data.title;
+    this.url = data.url;
+    this.description = data.description;
+    this.keywords = data.aiClassificationId.keywords;
+    this.createdAt = data.aiClassificationId.createdAt;
+  }


Suggested change

constructor(data: InputType) {

this.id = data.id;

this.title = data.title;

this.url = data.url;

this.description = data.description;

this.keywords = data.aiClassificationId.keywords;

this.createdAt = data.aiClassificationId.createdAt;

}

constructor(post: postSchema, ai: aiClassificationSchema ) {

this.id = post.id;

this.title = post.title;

this.url = post.url;

this.description = post.description;

this.keywords = ai.keywords;

this.createdAt = ai.aiClassificationId.createdAt;

}

src/modules/classification/classification.service.ts

JonghunAn · 2024-06-29T19:06:35Z

src/modules/classification/dto/getAIPostList.dto.ts

+type InputType = Document<
+  unknown,
+  {},
+  MergeType<
+    Post,
+    {
+      aiClassificationId: PostAIClassification;
+    }
+  >
+> &
+  Omit<Post, 'aiClassificationId'> & {
+    aiClassificationId: PostAIClassification;
+  } & {
+    _id: Types.ObjectId;
+  };


(˵ •̀ ᴗ - ˵ ) ✧
요건 serviceDto에서 constructor에서 paramter 받을때 도메인 스키마별로 받으면 필요없음!

JonghunAn · 2024-06-29T19:09:36Z

src/modules/classification/dto/getAIPostList.dto.ts

+export class AIPostListResponse {
+  @ApiProperty({ type: [AIPostServiceDto] })
+  @Type(() => AIPostServiceDto)
+  list: AIPostServiceDto[];
+
+  constructor(data: AIPostServiceDto[]) {
+    this.list = data;
+  }
+}


(˵ •̀ ᴗ - ˵ ) ✧
ResponseDto는 /classification/response 아래에 별도 클래스 파일로 분리해줘~

J-Hoplin · 2024-06-29T19:12:27Z

src/modules/classification/classification.service.ts

+    return matchedFolders.map((folder) => new AIFolderNameServiceDto(folder));
+  }
+
+  async getPostList(folderId: string): Promise<AIPostServiceDto[]> {


혜온아 이부분도 @GetUser로 사용자 ID 가져와서 사용자 분기도 같이 해줘야할것 같아!

Marades · 2024-06-29T19:12:27Z

src/modules/classification/dto/getAIFolderNameLIst.dto.ts

+  @ApiProperty({ description: '폴더 id' })
+  @IsNotEmpty()
+  @IsString()


(˵ •̀ ᴗ - ˵ ) ✧
service dto라서 요 데코레이터들도 빼도 될 거 같아!

서비스 dto에서 스웨거 관련 데코레이터도 제거해?
스웨거에서 스키마 볼 때 필요하지 않나해서

bd3c19b

e4e0f1c

JonghunAn · 2024-06-29T19:18:46Z

src/modules/classification/classification.controller.ts

+import { AIPostListResponse } from './dto/getAIPostList.dto';
+import { AIFolderNameListResponse } from './dto/getAIFolderNameLIst.dto';
+
+@Controller('ai')


Suggested change

@Controller('ai')

@Controller('classification')

JonghunAn · 2024-06-29T19:22:20Z

src/infrastructure/database/schema/postAIClassification.schema.ts


 @Schema({
  collection: 'post_ai_classifications',
  timestamps: true,
  versionKey: false,
 })
-export class PostAIClassification {
+export class PostAIClassification extends BaseDocument {


Suggested change

export class PostAIClassification extends BaseDocument {

export class AIClassification extends BaseDocument {

J-Hoplin

수고했어!!👍

hye-on added 6 commits June 29, 2024 21:05

Feature : AI로 분류 추천한 폴더 이름 리스트 get api

8c60056

Merge branch 'development' into feature/ai-domain

1ec8b47

Chore : BaseDocument 날짜 필드 string-> Date로 타입수정

2c99b7e

Chore : PostAIClassification의 keywords타입을 string으로 변경

a5b1ac2

Featrue : AI분류 폴더 이름 List Get api, AI 분류 각 폴더의 링크 List Get api 구현

8a9d898

Merge branch 'development' into feature/ai-domain

77580bd

hye-on requested review from JonghunAn, Marades and J-Hoplin as code owners June 29, 2024 17:15

github-actions bot added document 문서화 관련 작업 수정 및 생성 feature labels Jun 29, 2024

hye-on added 2 commits June 30, 2024 02:16

Chore : 주석 제거

e9abb46

Chore : deletedAt이 null인 것만 가져오게 수정

63e5f58

Marades reviewed Jun 29, 2024

View reviewed changes

Chore : 링크 리스트 get api response에 id 추가

ccf6809

Marades reviewed Jun 29, 2024

View reviewed changes

JonghunAn requested changes Jun 29, 2024

View reviewed changes

J-Hoplin reviewed Jun 29, 2024

View reviewed changes

Marades reviewed Jun 29, 2024

View reviewed changes

JonghunAn reviewed Jun 29, 2024

View reviewed changes

hye-on added 9 commits July 2, 2024 17:57

Chore : 리뷰 반영. getAIFolderNameList dto 포맷팅 수정

68ade94

Chore : TODO 주석 삭제

aea6e40

Chore : distinct를 이용해 중복제거하게 수정

53e166c

Chore : 리뷰 반영. mergeType을 스키마별로 분리해서 받게 수정.

09892b7

Chore : 리뷰 반영. 링크리스트가져올 때 userId도 체크하게 수정

9764ef8

Chore : 필요없는 타입 삭제

6f4f0f3

Chore : 리뷰 반영. 서비스 dto에서 필요없는 데코레이터 삭제

e4e0f1c

Chore : 리뷰 반영. 컨트롤러 path 변경. ai->classification

33f950a

Chore : 리뷰 반영. 스키마 이름 수정. PostAIClassification->AIClassification

0df80c4

hye-on added 3 commits July 2, 2024 19:31

Chore : 리뷰 반영. 서비스 dto에 스웨거 관련 데코레이터 삭제

bd3c19b

Chore : 리뷰 반영. response dto 들 response아래로 위치 이동

68e4b20

Chore : 리뷰 반영. 스키마 이름 수정

b3c8851

J-Hoplin approved these changes Jul 2, 2024

View reviewed changes

Merge branch 'development' into feature/ai-domain

e1f50ef

JonghunAn approved these changes Jul 2, 2024

View reviewed changes

hye-on merged commit 2a4cbfa into development Jul 2, 2024
1 check failed

J-Hoplin deleted the feature/ai-domain branch July 3, 2024 15:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat : AI 분류 폴더 이름 리스트get api, AI 분류 링크 리스트 get api #26

Feat : AI 분류 폴더 이름 리스트get api, AI 분류 링크 리스트 get api #26

hye-on commented Jun 29, 2024

Marades Jun 29, 2024

hye-on Jun 29, 2024

Marades Jun 29, 2024

hye-on Jul 2, 2024

Marades Jun 29, 2024

hye-on Jul 2, 2024

hye-on Jul 2, 2024

JonghunAn Jun 29, 2024

hye-on Jul 2, 2024

hye-on Jul 2, 2024

JonghunAn Jun 29, 2024

hye-on Jul 2, 2024 •

edited

Loading

JonghunAn Jun 29, 2024 •

edited

Loading

hye-on Jul 2, 2024

hye-on Jul 2, 2024

JonghunAn Jun 29, 2024

hye-on Jul 2, 2024

hye-on Jul 2, 2024

JonghunAn Jun 29, 2024 •

edited

Loading

hye-on Jul 2, 2024

JonghunAn Jun 29, 2024

hye-on Jul 2, 2024

J-Hoplin Jun 29, 2024

hye-on Jul 2, 2024

Marades Jun 29, 2024 •

edited

Loading

hye-on Jul 2, 2024

hye-on Jul 2, 2024

JonghunAn Jun 29, 2024

hye-on Jul 2, 2024

JonghunAn Jun 29, 2024

hye-on Jul 2, 2024

J-Hoplin left a comment

		const folders = await this.folderModel.find({ userId }).exec();
		const folderIds = folders.map((folder) => folder._id);

	export class PostAIClassification extends BaseDocument {
	export class AIClassification extends BaseDocument {

Feat : AI 분류 폴더 이름 리스트get api, AI 분류 링크 리스트 get api #26

Feat : AI 분류 폴더 이름 리스트get api, AI 분류 링크 리스트 get api #26

Conversation

hye-on commented Jun 29, 2024

PR 내용

PR 중점사항

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hye-on Jul 2, 2024 • edited Loading

Choose a reason for hiding this comment

JonghunAn Jun 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JonghunAn Jun 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Marades Jun 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

J-Hoplin left a comment

Choose a reason for hiding this comment

hye-on Jul 2, 2024 •

edited

Loading

JonghunAn Jun 29, 2024 •

edited

Loading

JonghunAn Jun 29, 2024 •

edited

Loading

Marades Jun 29, 2024 •

edited

Loading