fix(posts): return only non deleted posts and fix openAPI documentati…

…on (#7)
ost-cas-fee-adv-22-23 · Mar 14, 2023 · dc24faf · dc24faf
1 parent 1f4258f
commit dc24faf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/data/posts.service.ts b/src/data/posts.service.ts
@@ -45,7 +45,6 @@ export class PostsService {
     } else if (olderThan) {
       idQuery = LessThan(olderThan);
     }
-
 
     const [posts, count] = await this.aggregatedPosts.findAndCount({
       skip: offset,
@@ -56,7 +55,8 @@ export class PostsService {
       where: {
         parentId: IsNull(),
         id: idQuery,
-        ...(creator ? {creator} : {})
+        deleted: false,
+        ...(creator ? { creator } : {}),
       },
     });
     return { posts, count };
@@ -139,7 +139,7 @@ export class PostsService {
       where: { id },
     });
     const replies = await this.aggregatedPosts.find({
-      where: { parentId: id },
+      where: { parentId: id, deleted: false },
       order: { id: 'desc' },
     });
 

diff --git a/src/rest/posts.controller.ts b/src/rest/posts.controller.ts
@@ -130,7 +130,7 @@ export class PostsController {
     name: 'creator',
     required: false,
     description:
-      'The ID of a creator. Only posts of this should be returned. If omitted, all posts are returned.',
+      'The ID of a creator. Only posts of the given creator should be returned. If omitted, all posts are returned.',
     examples: {
       'all posts': {
         value: undefined,
@@ -152,7 +152,7 @@ export class PostsController {
           type: 'array',
           items: {
             uniqueItems: true,
-            oneOf: [postSchema, replySchema, deletedSchema],
+            ...postSchema,
           },
         },
         count: {
@@ -258,7 +258,8 @@ export class PostsController {
       type: 'array',
       uniqueItems: true,
       items: {
-        oneOf: [replySchema, deletedSchema],
+        uniqueItems: true,
+        ...replySchema,
       },
     },
   })