Merge branch 'main' of github.com:oddsteam/training-api

.github/workflows/ci.dev.yml

@@ -78,4 +78,5 @@ jobs:
             aws ecr get-login-password --region ap-southeast-1 | docker login --username AWS --password-stdin 844772501268.dkr.ecr.ap-southeast-1.amazonaws.com
             docker pull $DOCKER_IMAGE_WITH_TAG
             docker stop training-api | true
+            docker rm training-api | true
             docker run -p 3001:3001 --name training-api -d $DOCKER_IMAGE_WITH_TAG -e $DB_URI

.github/workflows/ci.prod.yml

@@ -78,4 +78,5 @@ jobs:
             aws ecr get-login-password --region ap-southeast-1 | docker login --username AWS --password-stdin 844772501268.dkr.ecr.ap-southeast-1.amazonaws.com
             docker pull $DOCKER_IMAGE_WITH_TAG
             docker stop training-api | true
+            docker rm training-api | true
             docker run -p 3001:3001 --name training-api -d $DOCKER_IMAGE_WITH_TAG -e $DB_URI

README.md

@@ -4,4 +4,10 @@ node v20
 
 npm i
 
-npm run start
+npm run start
+
+------
+กรณีที่ต้องการใช้ email service ให้ทำการ set up ดังนี้
+
+1. ติดตั้ง [aws cli](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html)
+2. configure aws credentials ด้วย command `aws configure` (credentials อยู่ใน discord)

package.json

@@ -14,6 +14,7 @@
     "@babel/core": "^7.24.3",
     "@babel/node": "^7.23.9",
     "@babel/preset-env": "^7.24.3",
+    "aws-sdk": "^2.1589.0",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",

src/controllers/reminder.js

@@ -1,46 +1,17 @@
-const createContent = function (class_detail, enrollmentInfo) {
-    return `Hello ${enrollmentInfo.fullName} <br> Welcome! Also looking forward to joining with you for 3 days of Certified LeSS Practitioner: Principles to Practices by Bas Vodde.<br>`
-}
+const classService = require('../services/classes');
+const enrollmentService = require('../services/classes');
 
 const setEmailClassReminder = function (req, res){ 
-
-    const classes = [{
-        id: 1,
-        description: `ตอนผู้สอนทั้ง 2 มาเป็น ScrumMaster ใหม่ ๆ เราพบช่วงเวลายากลำบากหลายครั้ง`,
-        place:"Geeky Base All Star",
-        googleMapUrl: "https://maps.app.goo.gl/UQKuNzejJNNwVB2K9",
-        startDate: "2024-03-22T04:51:16.100Z",
-        endDate: "31/3/2024",
-        instructor: [{name: 'Jane'}]
-      },
-      {
-        id: 2,
-        description: `ตอนผู้สอนทั้ง 2 มาเป็น ScrumMaster ใหม่ ๆ เราพบช่วงเวลายากลำบากหลายครั้ง`,
-        place:"Geeky Base All Star",
-        googleMapUrl: "https://maps.app.goo.gl/UQKuNzejJNNwVB2K9",
-        startDate: "2024-03-22T04:51:16.100Z",
-        endDate: "31/3/2024",
-        instructor: [{name: 'Jane'}]
-      }]
-
-      for (let cls in classes) {
-        const enrollmentInfo = {
-          classId: 1,
-          email: 1,
-          fullName: "Roofimon",
-        }
-        const content = createContent(cls, enrollmentInfo);
-        console.log(content)
-        const startDate = new Date(cls.startDate)
-        console.log("ss", startDate)
-        const dateNow = Date.now()
-        // if (startDate.getDate() - 5 === dateNow) {
-        //   // sendEmail(enrollmentInfo.email, cls.name, content);
-        //   console.log("Send email")
-        // } 
-      }
-
-      res.send("Success")
+  const classesData = classService.getClasses();
+    for (let cls in classesData) {
+      const enrollmentData = enrollmentService.getEnrollmentByClassId(cls.classId)
+      const startDate = new Date(cls.startDate)
+      const dateNow = Date.now()
+      if (startDate.getDate() - 5 === dateNow) {
+        sendEmail(enrollmentData.email, cls.name, cls.preClassContent);
+      } 
+    }
+  res.send("Success")
 }
 
 exports.setEmailClassReminder = setEmailClassReminder;

src/services/enrollment.js

@@ -7,3 +7,12 @@ export const create = async (body) => {
     console.log(error);
   }
 };
+
+export const getEnrollmentByClassId = async (classId) => {
+  try {
+    const data = await EnrollmentModel.findOne({ classId });
+    return data;
+  } catch (error) {
+    console.log(error);
+  }
+};