Update emails.js

emails.js

@@ -9,26 +9,69 @@ const pool = new Pool(config);
 
 // ***** update daily top 3 news
 
+// const updateEmailNews = async (req, res) => {
+//   try {
+
+//     const catList = ["science", "india", 'business',
+//       "sports", "entertainment", "technology", "world"];
+
+//     catList.forEach(async (cat) => {
+
+//       const data = await getTopNews(cat);
+
+//       data.forEach(async (d) => {
+
+//         const summary = await getSummary(d.article_url);
+
+//         //set news in database
+//         try {
+//           const query = `
+//                   update top_news set 
+//                   title = $1, article_url = $2, source =  $3, summary =  $4, published_date = $5 where category = '${cat}_${data.indexOf(d) + 1}' ;
+//               `;
+//           const values = [
+//             d.title,
+//             d.article_url,
+//             d.source_name,
+//             summary,
+//             d.published_date
+//           ];
+
+//           await pool.query(query, values);
+//         } catch (er) {
+//           console.log(er);
+//         }
+
+//       });
+
+//     });
+
+//     res.send({ "status": "running" });
+
+
+//   } catch (e) {
+//     console.log(e);
+//   }
+
+// }
+
 const updateEmailNews = async (req, res) => {
   try {
-
     const catList = ["science", "india", 'business',
       "sports", "entertainment", "technology", "world"];
 
-    catList.forEach(async (cat) => {
-
+    const promises = catList.map(async (cat) => {
       const data = await getTopNews(cat);
 
-      data.forEach(async (d) => {
-
-        const summary = await getSummary(d.article_url);
-
-        //set news in database
+      const articlePromises = data.map(async (d) => {
         try {
+          const summary = await getSummary(d.article_url);
+
           const query = `
-                  update top_news set 
-                  title = $1, article_url = $2, source =  $3, summary =  $4, published_date = $5 where category = '${cat}_${data.indexOf(d) + 1}' ;
-              `;
+            UPDATE top_news SET 
+            title = $1, article_url = $2, source =  $3, summary =  $4, published_date = $5
+            WHERE category = '${cat}_${data.indexOf(d) + 1}';
+          `;
           const values = [
             d.title,
             d.article_url,
@@ -41,20 +84,25 @@ const updateEmailNews = async (req, res) => {
         } catch (er) {
           console.log(er);
         }
-
       });
 
+      
+      await Promise.all(articlePromises);
     });
 
-    res.send({ "status": "running" });
+    
+    await Promise.all(promises);
 
+    
+    res.send({ "status": "completed" });
 
   } catch (e) {
     console.log(e);
+    res.status(500).send({ "error": "An error occurred" });
   }
-
 }
 
+
 async function getTopNews(category) {
   const query = `
                 select title, article_url, category, source_name, published_date from news  where category like '%${category}%' order by published_date desc limit 3;