Merge pull request #388 from kaogeek/dev-shiorin

[API] เมื่ออนุมัติโพสเติมเต็ม แล้วจำนวน repost ไม่ขึ้น #382
kaogeek · Dec 9, 2021 · 5f16184 · 5f16184
2 parents cccacbb + c5e95d3
commit 5f16184
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/api-spanboon/package.json b/api-spanboon/package.json
@@ -79,6 +79,7 @@
     "graphql": "15.4.0",
     "helmet": "^4.2.0",
     "imagemagick": "^0.1.3",
+    "jsdom": "^17.0.0",
     "jsonfile": "6.1.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",

diff --git a/api-spanboon/src/api/processors/UserFollowSectionProcessor.ts b/api-spanboon/src/api/processors/UserFollowSectionProcessor.ts
@@ -19,6 +19,7 @@ import { S3Service } from '../services/S3Service';
 import { ObjectID } from 'mongodb';
 import moment from 'moment';
 import { PLATFORM_NAME_TH } from '../../constants/SystemConfig';
+import { POST_TYPE } from '../../constants/PostType';
 
 export class UserFollowSectionProcessor extends AbstractSectionModelProcessor {
 
@@ -131,6 +132,9 @@ export class UserFollowSectionProcessor extends AbstractSectionModelProcessor {
                 lastestFilter.whereConditions.deleted = false;
                 lastestFilter.whereConditions.hidden = false;
                 lastestFilter.whereConditions.startDateTime = { $lte: today };
+                lastestFilter.whereConditions.type= {
+                    $nin: [POST_TYPE.FULFILLMENT]
+                }; // remove fulfillment post type comment this for showing all post type.
 
                 // overide start datetime
                 const dateTimeAndArray = [];

diff --git a/api-spanboon/src/api/processors/UserRecommendSectionProcessor.ts b/api-spanboon/src/api/processors/UserRecommendSectionProcessor.ts
@@ -16,6 +16,7 @@ import moment from 'moment';
 import { PLATFORM_NAME_TH } from '../../constants/SystemConfig';
 import { ObjectID } from 'mongodb';
 import { S3Service } from '../services/S3Service';
+import { POST_TYPE } from '../../constants/PostType';
 
 export class UserRecommendSectionProcessor extends AbstractSectionModelProcessor {
 
@@ -90,8 +91,11 @@ export class UserRecommendSectionProcessor extends AbstractSectionModelProcessor
                 const matchStmt: any = {
                     isDraft: false,
                     deleted: false,
-                    hidden: false
-                };
+                    hidden: false,
+                    type: {
+                        $nin: [POST_TYPE.FULFILLMENT] // remove fulfillment post type comment this for showing all post type.
+                    }
+                }; 
                 if (userId !== undefined && userId !== '') {
                     // ! impl 
                 } else if (clientId !== undefined) {