Fix cron jobs issue and update Footer info

NTNU-SmallSatLab · Aug 12, 2024 · 5dfb7e5 · 5dfb7e5
1 parent 37456ad
commit 5dfb7e5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/backend/config/functions/cronTask.js b/backend/config/functions/cronTask.js
@@ -18,21 +18,30 @@ module.exports = {
             catalogNumberNORAD: { $ne: null },
           }
         });
-        await Promise.all(satellites.map(async satellite => {
-          const historicalOrbitalData = await fetchOrbitalData(strapi, satellite.catalogNumberNORAD);
-          await strapi.entityService.update('api::satellite.satellite', satellite.id, {
-            data: {
-              historicalOrbitalData: historicalOrbitalData,
-            }
-          })
-        }));
+        await Promise.all(
+          satellites.map(async (satellite) => {
+          const fetchedData = await fetchOrbitalData(satellite.catalogNumberNORAD);
+          return { id: satellite.id, historicalOrbitalData: fetchedData };
+        })).then(async (historicalOrbitalData) => {
+          await strapi.db.transaction(async (trx) => {
+            // Fetch data for each satellite
+            historicalOrbitalData.map(async (satellite) => {
+              // Update the database with the new data
+              const updatedSat = await strapi.entityService.update('api::satellite.satellite', satellite.id, {
+                data: {
+                  historicalOrbitalData: satellite.historicalOrbitalData,
+                },
+              }, { trx });
+            })
+          });
+        })
       } catch (error) {
         console.error(error);
         return;
       }
     },
     options: {
-      rule: "0 0 0 8 * *", // Every month on the 3rd at midnight
+      rule: "0 0 0 3 * *", // Every month on the 3rd at midnight
     },
   },
 };
diff --git a/backend/config/functions/satelliteUtils.js b/backend/config/functions/satelliteUtils.js
@@ -1,7 +1,7 @@
 // backend/utils/satelliteUtils.js
 const axios = require('axios');
 
-async function fetchOrbitalData(strapi, noradId) {
+async function fetchOrbitalData(noradId) {
   try {
     // Authentication to Space-Track
     const authResponse = await axios.post('https://www.space-track.org/ajaxauth/login', {

diff --git a/frontend/src/components/layout/Footer.tsx b/frontend/src/components/layout/Footer.tsx
@@ -18,28 +18,22 @@ export default function Footer() {
                     <div className="flex flex-col gap-2 text-center">
                         <div className="flex flex-wrap justify-center gap-x-4">
                             <a
-                                href="https://www.x.com/NTNU"
-                                className="hover:underline"
-                            >
-                                Twitter
-                            </a>
-                            <a
-                                href="https://www.facebook.com/ntnu.no"
+                                href="https://www.facebook.com/NTNUSmallSat"
                                 className="hover:underline"
                             >
                                 Facebook
                             </a>
                             <a
-                                href="https://www.instagram.com/ntnu"
+                                href="https://www.instagram.com/ntnusmallsat/"
                                 className="hover:underline"
                             >
                                 Instagram
                             </a>
                             <a
-                                href="https://www.youtube.com/user/ntnuinfo"
+                                href="https://www.linkedin.com/company/20559539/"
                                 className="hover:underline"
                             >
-                                Youtube
+                                LinkedIn
                             </a>
                         </div>
                         <div className="flex flex-row justify-center">