Merge pull request #252 from quockhanhtn/dev

Un-comment user tracking code
quockhanhtn · Jul 22, 2022 · a84b19d · a84b19d
2 parents 7851800 + ece7604
commit a84b19d
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 34 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -28,12 +28,12 @@ export default function App() {
   const dispatch = useDispatch();
   const { isInitialized, isAuthenticated } = useAuth();
 
-  // useInterval(
-  //   () => {
-  //     dispatch(sendTrackingData());
-  //   },
-  //   isDevMode ? 10 : 5
-  // );
+  useInterval(
+    () => {
+      dispatch(sendTrackingData());
+    },
+    isDevMode ? 10 : 5
+  );
 
   useEffect(() => {
     if (isInitialized && isAuthenticated) {

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -32,6 +32,7 @@
   "license": "MIT",
   "dependencies": {
     "@slack/web-api": "^6.7.1",
+    "axios": "^0.27.2",
     "bcrypt": "^5.0.1",
     "dateformat": "^2.2.0",
     "express": "^4.17.1",
@@ -56,7 +57,6 @@
     "socket.io": "^4.4.1"
   },
   "devDependencies": {
-    "axios": "^0.26.1",
     "csv-writer": "^1.6.0",
     "html-to-text": "^8.1.0",
     "nodemon": "^2.0.14"

diff --git a/server/src/index.js b/server/src/index.js
@@ -41,26 +41,26 @@ serverApi.listen(serverPort, () => {
 
     const scheduleOpts = { scheduled: true, timezone: 'Asia/Ho_Chi_Minh' };
 
-    // // schedule task run every hour at minute 45
-    // cron.schedule('20 * * * *', async () => {
-    //   SlackUtils.sendMessage('*[USER_BEHAVIOR]* Running a task every hour at minute 45 to import user behavior to FPT');
-    //   LogUtils.info('SERVER', 'Running a task every hour at minute 45 to import user behavior to FPT');
+    // schedule task run every hour at minute 45
+    cron.schedule('20 * * * *', async () => {
+      SlackUtils.sendMessage('*[USER_BEHAVIOR]* Running a task every hour at minute 45 to import user behavior to FPT');
+      LogUtils.info('SERVER', 'Running a task every hour at minute 45 to import user behavior to FPT');
 
-    //   fptService.importUserBehaviorToFpt();
-    // }, scheduleOpts);
+      fptService.importUserBehaviorToFpt();
+    }, scheduleOpts);
 
-    // // schedule task run every day at 02:00 AM import product data to FPT
-    // cron.schedule('0 2 * * *', () => {
-    //   LogUtils.info('SERVER', 'Running a task every day at 02:00 AM to import product data to FPT');
-    //   SlackUtils.sendMessage('*[RECOMMEND_IMPORT]* Running a task every day at 03:00 AM to product import data to FPT');
-    //   fptService.importProductDataToFpt()
-    // }, scheduleOpts);
+    // schedule task run every day at 02:00 AM import product data to FPT
+    cron.schedule('0 2 * * *', () => {
+      LogUtils.info('SERVER', 'Running a task every day at 02:00 AM to import product data to FPT');
+      SlackUtils.sendMessage('*[RECOMMEND_IMPORT]* Running a task every day at 03:00 AM to product import data to FPT');
+      fptService.importProductDataToFpt()
+    }, scheduleOpts);
 
-    // // schedule task run every day at 04:00 AM to update recommend data
-    // cron.schedule('0 4 * * *', () => {
-    //   LogUtils.info('SERVER', 'Running a task every day at 04:00 AM to to update recommend data');
-    //   SlackUtils.sendMessage('*[RECOMMEND_UPDATE]* Running a task every day at 04:00 AM to update recommend data');
-    //   fptService.updateRecommendData()
-    // }, scheduleOpts);
+    // schedule task run every day at 04:00 AM to update recommend data
+    cron.schedule('0 4 * * *', () => {
+      LogUtils.info('SERVER', 'Running a task every day at 04:00 AM to to update recommend data');
+      SlackUtils.sendMessage('*[RECOMMEND_UPDATE]* Running a task every day at 04:00 AM to update recommend data');
+      fptService.updateRecommendData()
+    }, scheduleOpts);
   }
 });