Fixing and Refactoring: PostMapper | Modyfing Post.author to Nullable…

…<User>
devbenho · Jun 1, 2024 · 503a23d · 503a23d
1 parent 92bd7a9
commit 503a23d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 37 deletions.
diff --git a/server/package.json b/server/package.json
@@ -4,7 +4,7 @@
   "author": {
     "name": "Benho",
     "email": "Name",
-    "url": "url",
+    "url": "url"
     },
 
   "version": "1.0.0",

diff --git a/server/src/domain/entities/posts/post.ts b/server/src/domain/entities/posts/post.ts
@@ -27,7 +27,7 @@ class Post extends AuditableBaseEntity {
     title: string,
     content: string,
     authorId: string,
-    author: User,
+    author: Nullable<User>,
     likes: LikePost[],
     comments: Comment[],
     status: POST_STATUS,

diff --git a/server/src/infrastructure/posts/post.mapper.ts b/server/src/infrastructure/posts/post.mapper.ts
@@ -1,6 +1,6 @@
 import { PostPersistence } from '@infrastructure/posts';
 import { POST_STATUS } from '@domain/eums/post-status.enum';
-import { Comment, LikePost, Post, User } from '@domain/entities';
+import { Post } from '@domain/entities';
 import { UserMapper, UserPersistence } from '@infrastructure/users';
 import { CommentMapper, CommentPersistence } from '@infrastructure/comments';
 import {
@@ -17,60 +17,66 @@ class PostMapper {
       comments?: CommentPersistence[];
     },
   ): Post {
-    const author = lazyEntities?.author;
-    const likes = lazyEntities?.likes ?? [];
-    const comments = lazyEntities?.comments ?? [];
+    const domainAuthor = lazyEntities?.author
+      ? UserMapper.toDomain(lazyEntities.author)
+      : null;
+
+    const domainLikes = (lazyEntities?.likes ?? []).map(like =>
+      LikePostMapper.toDomain(like),
+    );
+    const domainComments = (lazyEntities?.comments ?? []).map(comment =>
+      CommentMapper.toDomain(comment),
+    );
+    const postStatus =
+      POST_STATUS[persistence.status.toUpperCase() as keyof typeof POST_STATUS];
 
     return Post.create(
       persistence.id,
       persistence.title,
       persistence.content,
       persistence.authorId,
-      author as any,
-      likes.map(like => LikePostMapper.toDomain(like)),
-      comments.map(comment => CommentMapper.toDomain(comment)),
-      POST_STATUS[persistence.status.toUpperCase() as keyof typeof POST_STATUS],
+      domainAuthor,
+      domainLikes,
+      domainComments,
+      postStatus,
       persistence.createdAt,
       persistence.updatedAt,
       persistence.deletedAt,
     );
   }
 
-  public static toPersistence(
-    domain: Post,
-    domainEntities?: {
-      author?: User;
-      likes?: LikePost[];
-      comments?: Comment[];
-    },
-  ): Promise<PostPersistence> {
+  public static toPersistence(domainPost: Post): PostPersistence {
     const postPersistence = new PostPersistence();
 
-    if (domain.id) {
-      postPersistence.id = domain.id;
+    if (domainPost.id) {
+      postPersistence.id = domainPost.id;
     }
-    postPersistence.title = domain.title;
-    postPersistence.content = domain.content;
-    postPersistence.authorId = domain.authorId;
 
-    postPersistence.status = domain.status.toLowerCase();
-    postPersistence.createdAt = domain.createdAt;
-    postPersistence.deletedAt = domain.deletedAt;
+    postPersistence.title = domainPost.title;
+    postPersistence.content = domainPost.content;
+    postPersistence.authorId = domainPost.authorId;
 
-    if (domainEntities?.author) {
-      postPersistence.author = UserMapper.toPersistence(domainEntities.author);
-    }
-    postPersistence.likes = domainEntities?.likes
-      ? Promise.all(domainEntities.likes.map(like => LikePostMapper.toPersistence(like)))
-      : Promise.resolve([]);
+    postPersistence.status = domainPost.status.toLowerCase(); //TODO: Refactor this
+    postPersistence.createdAt = domainPost.createdAt;
+    postPersistence.deletedAt = domainPost.deletedAt;
 
-    postPersistence.comments = domainEntities?.comments
-      ? Promise.all(domainEntities.comments.map(comment => CommentMapper.toPersistence(comment)))
-      : Promise.resolve([]);
+    if (domainPost.author)
+      postPersistence.author = Promise.resolve(
+        UserMapper.toPersistence(domainPost.author),
+      );
 
-    return Promise.resolve(postPersistence);
-  }
+    if (domainPost.likes)
+      postPersistence.likes = Promise.all(
+        domainPost.likes.map(LikePostMapper.toPersistence),
+      );
 
+    if (domainPost.comments)
+      postPersistence.comments = Promise.all(
+        domainPost.comments.map(CommentMapper.toPersistence),
+      );
+
+    return postPersistence;
+  }
 }
 
 export { PostMapper };