feat: [#37]

oxopolitics-internship-for-elice · Nov 2, 2022 · e668ae9 · e668ae9
1 parent 826aaa0
commit e668ae9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 59 deletions.
diff --git a/server/src/app.module.ts b/server/src/app.module.ts
@@ -15,6 +15,7 @@ import { PoliticianModule } from './politician/politician.module';
       useNewUrlParser: true,
       useUnifiedTopology: true,
       connectionFactory: (connection) => {
+        console.log(process.env.MONGODB_URI)
         if (connection.readyState === 1) {
           Logger.log('DB connected');
           console.log('################ MongoDB connected #################');

diff --git a/server/src/issue/issue.controller.ts b/server/src/issue/issue.controller.ts
@@ -33,17 +33,11 @@ export class IssueController {
     try {
       const { targetPolitician, regiStatus, ranked, pageOptions } = issueQuery;
 
-      // 메인페이지 모든 정치인, 인생 전체 그래프
-      // if (!targetPolitician) {
-      //   const issues = await this.issueService.getAllIssues();
-      //   return response.json(issues);
-      // }
-
       // 등록된 이슈
       if (regiStatus && !ranked) {
         const issues = await this.issueService.getIssuesRegistered(targetPolitician, pageOptions);
 
-        const itemCount = await this.issueService.getAllIssuesCount('active');
+        const itemCount = await this.issueService.getAllActiveIssuesCount();
         const pageMeta = new PageMetaDto({ pageOptions, itemCount });
         return response.json({ data: issues, meta: pageMeta });
       }
@@ -56,7 +50,7 @@ export class IssueController {
 
       // 미등록 이슈 나머지
       else if (!regiStatus && !ranked) {
-        const itemCount = await this.issueService.getAllIssuesCount('inactive');
+        const itemCount = await this.issueService.getAllInactiveIssuesCount();
 
         if (itemCount <= 3) {
           return response.json({ data: [] });

diff --git a/server/src/issue/issue.service.ts b/server/src/issue/issue.service.ts
@@ -19,60 +19,18 @@ export class IssueService {
     const { targetPolitician, issueDate, content, title, link } = body;
     const result = await new this.issueModel({ targetPolitician, issueDate, content, title, link, regiUser }).save();
 
-    // // test case 만들기 위한 임시
-    // const result = await new this.issueModel({ ...body, regiUser }).save();
-
-    // const setRegiStatusInactiveJob = scheduleJob(regiDueDate, () => {
-    //   this.setRegiStatus(save._id, 'expired');
-    // });
-
     return result;
   }
 
-  // async getAllIssues() {
-  //   const allIssues = await this.issueModel.aggregate([
-  //     {
-  //       $project: {
-  //         _id: 1,
-  //         targetPolitician: 1,
-  //         issueDate: 1,
-  //         totalPolls: { $add: ['$poll.total.pro', '$poll.total.neu', '$poll.total.con'] },
-  //         score: { $subtract: ['$poll.total.pro', '$poll.total.con'] },
-  //       },
-  //     },
-  //     { $sort: { totalPolls: -1 } },
-  //     { $limit: 40 },
-  //     { $sort: { issueDate: 1 } },
-  //     {
-  //       $group: { _id: '$targetPolitician', issues: { $push: '$$ROOT' } },
-  //     },
-  //     {
-  //       $lookup: {
-  //         from: 'politicians',
-  //         localField: '_id',
-  //         foreignField: '_id',
-  //         as: 'politicianInfo',
-  //         pipeline: [
-  //           {
-  //             $project: {
-  //               issues: 0,
-  //               _id: 0,
-  //               createdAt: 0,
-  //               updatedAt: 0,
-  //               __v: 0,
-  //             },
-  //           },
-  //         ],
-  //       },
-  //     },
-  //   ]);
-
-  //   return allIssues;
-  // }
+  // regiStatus: 'active'
+  async getAllActiveIssuesCount(): Promise<number> {
+    return await this.issueModel.find({ regiStatus: 'active' }).count();
+  }
 
-  // regiStatus type needed
-  async getAllIssuesCount(regiStatus): Promise<number> {
-    return await this.issueModel.find({ regiStatus }).count();
+  // regiStatus: 'inactive'
+  async getAllInactiveIssuesCount(): Promise<number> {
+    const due = DateTime.now().minus({ weeks: 1 }).toBSON();
+    return await this.issueModel.find({ regiStatus: 'inactive', createdAt: { $gt: due } }).count();
   }
 
   // return type needed
@@ -88,7 +46,7 @@ export class IssueService {
   // return type needed
   async getIssueNotRegisteredRanked(id: string): Promise<Issue[]> {
     const due = DateTime.now().minus({ weeks: 1 }).toBSON();
-    
+
     const issues = await this.issueModel.aggregate([
       {
         $match: { $expr: { $eq: ['$targetPolitician', { $toObjectId: id }] } },

diff --git a/server/src/main.ts b/server/src/main.ts
@@ -3,6 +3,7 @@ import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 
 async function bootstrap() {
+  console.log(process.env.MONGODB_URI)
   const app = await NestFactory.create(AppModule);
   app.enableCors();
   app.useGlobalPipes(

diff --git a/server/src/politician/politician.service.ts b/server/src/politician/politician.service.ts
@@ -30,6 +30,11 @@ export class PoliticianService {
           foreignField: 'targetPolitician',
           as: 'count',
           pipeline: [
+            {
+              $match: {
+                regiStatus: 'active',
+              },
+            },
             {
               $count: 'count',
             },
@@ -43,6 +48,11 @@ export class PoliticianService {
           foreignField: 'targetPolitician',
           as: 'issues',
           pipeline: [
+            {
+              $match: {
+                regiStatus: 'active',
+              },
+            },
             {
               $project: {
                 issueDate: 1,