resolve: remove package-lock.json

marcusyi1 · marcusyi1 · commit 9f7a4aec0d60 · 2026-04-03T15:49:49.000-04:00
diff --git a/package.json b/package.json
@@ -28,8 +28,7 @@
     "dev": "nodemon --exec \"babel-node --ignore 'node_modules/(?!@typespec)' src/server.js\"",
     "serve": "babel-node src/server.js",
     "prepare-macos-linux": "husky install && chmod ug+x .husky/* && chmod ug+x .git/hooks/*",
-    "prepare": "husky install",
-    "postinstall": "npx puppeteer browsers install chrome"
+    "prepare": "husky install"
   },
   "author": "AK",
   "license": "ISC",
@@ -121,7 +120,7 @@
     "nodemailer": "^7.0.11",
     "parse-link-header": "^2.0.0",
     "pdfkit": "^0.17.2",
-    "puppeteer": "^24.37.5",
+    "playwright": "^1.58.2",
     "redis": "^4.2.0",
     "regression": "^2.0.1",
     "sanitize-html": "^2.16.0",
diff --git a/src/controllers/reportsController.js b/src/controllers/reportsController.js
@@ -1,14 +1,15 @@
+/* eslint-disable no-console */
 /* eslint-disable consistent-return */
 const fs = require('node:fs');
 const mongoose = require('mongoose');
 // eslint-disable-next-line import/no-unresolved
-const puppeteer = require('puppeteer');
 const reporthelperClosure = require('../helpers/reporthelper');
 const overviewReportHelperClosure = require('../helpers/overviewReportHelper');
 const { hasPermission } = require('../utilities/permissions');
 const UserProfile = require('../models/userProfile');
 const emailSender = require('../utilities/emailSender');
 const cacheModule = require('../utilities/nodeCache');
+const playwrightLogic = require('../utilities/playwrightUtil');
 
 const cacheUtil = cacheModule();
 
@@ -783,37 +784,6 @@ const reportsController = function () {
       res.status(500).send({ msg: 'Error occured while fetching data. Please try again!' });
     }
   };
-  const puppeteerLogic = async () => {
-    const { PUPPETEER_EMAIL, PUPPETEER_PASSWORD, REACT_FRONTEND_URL } = process.env;
-    if (!PUPPETEER_EMAIL || !PUPPETEER_PASSWORD) {
-      console.log('Puppeteer email or password not found in environment variables');
-    }
-    const browser = await puppeteer.launch({
-      headless: true,
-      args: ['--no-sandbox', '--disable-setuid-sandbox'],
-    });
-    const page = await browser.newPage();
-    await page.goto(`${REACT_FRONTEND_URL}/login`, { waitUntil: 'networkidle2' });
-    await page.setViewport({
-      width: 1920,
-      height: 1080,
-      deviceScaleFactor: 1.5,
-    });
-    await page.type('input[id="email"]', PUPPETEER_EMAIL, { delay: 100 });
-    await page.type('input[id="password"]', PUPPETEER_PASSWORD, { delay: 100 });
-    await page.click('.btn.btn-primary', { delay: 100 });
-    await page.waitForNavigation({ waitUntil: 'networkidle2' });
-    await page.goto(`${REACT_FRONTEND_URL}/totalorgsummary`, { waitUntil: 'networkidle2' });
-
-    // eslint-disable-next-line no-restricted-syntax
-    await new Promise((resolve) => {
-      setTimeout(resolve, 50000);
-    });
-    // take a screenshot of the page
-    await page.screenshot({ path: 'weeklyCompanySummary.png', fullPage: true });
-    // close the browser
-    await browser.close();
-  };
 
   const sendEmailReport = async (req, res) => {
     try {
@@ -822,7 +792,7 @@ const reportsController = function () {
         return res.status(400).send({ msg: 'Please provide at least one recipient' });
       }
 
-      await puppeteerLogic();
+      await playwrightLogic();
 
       const attachment = {
         filename: 'weeklyCompanySummary.png',
diff --git a/src/controllers/teamController.js b/src/controllers/teamController.js
@@ -166,11 +166,11 @@ const teamcontroller = function (Team) {
 
       // Store the old team code before updating
       const oldTeamCode = record.teamCode;
-      const newTeamCode = req.body.teamCode;
+      const newTeamCode = req.body.teamCode || '';
 
       record.teamName = req.body.teamName;
       record.isActive = req.body.isActive;
-      record.teamCode = req.body.teamCode;
+      record.teamCode = newTeamCode;
       record.createdDatetime = Date.now();
       record.modifiedDatetime = Date.now();
 
diff --git a/src/helpers/overviewReportHelper.js b/src/helpers/overviewReportHelper.js
@@ -963,33 +963,27 @@ const overviewReportHelper = function () {
 
   /** aggregates role distribution statistics
    * counts total number of volunteers that fall within each of the different roles
+   * NOTE: This shows ALL active users regardless of createdDate to provide
+   * a complete picture of current role distribution in the organization
    */
   async function getRoleDistributionStats(
     startDate,
     endDate,
     comparisonStartDate,
     comparisonEndDate,
   ) {
-    // Helper to build match stage depending on whether start/end are provided
-    const buildMatch = (s, e) => {
-      const match = { isActive: true };
-      if (s && e) {
-        match.createdDate = { $gte: new Date(s), $lte: new Date(e) };
-      }
-      return match;
-    };
+    // Always match only active users, ignore date filters for role distribution
+    // This ensures all current roles are displayed, not just recently created users
+    const buildMatch = () => ({ isActive: true });
 
     // If comparison dates provided, return both current and comparison facets
     if (comparisonStartDate && comparisonEndDate) {
       const roleStats = await UserProfile.aggregate([
         {
           $facet: {
-            current: [
-              { $match: buildMatch(startDate, endDate) },
-              { $group: { _id: '$role', count: { $sum: 1 } } },
-            ],
+            current: [{ $match: buildMatch() }, { $group: { _id: '$role', count: { $sum: 1 } } }],
             comparison: [
-              { $match: buildMatch(comparisonStartDate, comparisonEndDate) },
+              { $match: buildMatch() },
               { $group: { _id: '$role', count: { $sum: 1 } } },
             ],
           },
@@ -1003,7 +997,7 @@ const overviewReportHelper = function () {
     }
 
     // No comparison: return same shape as before (array of {_id: role, count})
-    const matchStage = buildMatch(startDate, endDate);
+    const matchStage = buildMatch();
     const result = await UserProfile.aggregate([
       { $match: matchStage },
       { $group: { _id: '$role', count: { $sum: 1 } } },
diff --git a/src/helpers/userHelper.js b/src/helpers/userHelper.js
@@ -13,7 +13,6 @@
 const path = require('node:path');
 const fs = require('fs');
 // eslint-disable-next-line import/no-unresolved
-const puppeteer = require('puppeteer');
 const mongoose = require('mongoose');
 const moment = require('moment-timezone');
 const _ = require('lodash');
@@ -34,10 +33,10 @@ const { NEW_USER_BLUE_SQUARE_NOTIFICATION_MESSAGE } = require('../constants/mess
 const timeUtils = require('../utilities/timeUtils');
 const Team = require('../models/team');
 const BlueSquareEmailAssignmentModel = require('../models/BlueSquareEmailAssignment');
+const playwrightLogic = require('../utilities/playwrightUtil');
 const myTeam = require('./helperModels/myTeam');
 const dashboardHelper = require('./dashboardhelper')();
 const reportHelper = require('./reporthelper')();
-
 // eslint-disable-next-line no-promise-executor-return
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
@@ -3250,56 +3249,6 @@ const userHelper = function () {
     }
   };
 
-  const puppeteerLogic = async () => {
-    // get login details from env
-    const { PUPPETEER_EMAIL, PUPPETEER_PASSWORD, REACT_FRONTEND_URL } = process.env;
-    if (!PUPPETEER_EMAIL || !PUPPETEER_PASSWORD) {
-      logger.logError('Puppeteer email or password not found in environment variables');
-    }
-    // launch puppeteer
-    const browser = await puppeteer.launch({
-      headless: true,
-      args: ['--no-sandbox', '--disable-setuid-sandbox'],
-    });
-    const page = await browser.newPage();
-    // navigate to the login page
-    await page.goto(`${REACT_FRONTEND_URL}/login`, { waitUntil: 'networkidle2' });
-    await page.setViewport({
-      width: 1920,
-      height: 1080,
-      deviceScaleFactor: 1.5,
-    });
-    // enter email and password
-    await page.type('input[id="email"]', PUPPETEER_EMAIL, { delay: 100 });
-    await page.type('input[id="password"]', PUPPETEER_PASSWORD, { delay: 100 });
-    // click the login button
-    // await page.click('button[type="submit"]', { delay: 100 });
-    await page.click('.btn.btn-primary', { delay: 100 });
-    // wait for navigation to complete
-    await page.waitForNavigation({ waitUntil: 'networkidle2' });
-
-    // go to /totalorgsummary
-    await page.goto(`${REACT_FRONTEND_URL}/totalorgsummary`, { waitUntil: 'networkidle2' });
-
-    // click on all toggle elements
-    const elements = await page.$$('.accordian-trigger');
-
-    console.log('elements', elements);
-
-    // Looping through and interacting with each element
-    for (const element of elements) {
-      await element.click();
-      await page.waitForTimeout(1000); // wait for the animation to complete
-    }
-    await page.waitForTimeout(50000);
-    // take a screenshot of the page
-    // await page.setViewport({ width: 1920, height: 1080 });
-    await page.screenshot({ path: 'weeklyCompanySummary.png', fullPage: true });
-
-    // close the browser
-    await browser.close();
-  };
-
   // Weekly Company Summary Email
   const weeklyCompanySummaryEmail = async () => {
     console.log('Weekly Company Summary Email');
@@ -3313,7 +3262,7 @@ const userHelper = function () {
     <p>One Community</p>`;
 
     // generate screenshot
-    await puppeteerLogic();
+    await playwrightLogic();
     console.log('Puppeteer logic completed');
 
     // create an attachment object
diff --git a/src/routes/educationRouter.js b/src/routes/educationRouter.js
@@ -1,5 +1,4 @@
 const express = require('express');
-
 const controller = require('../controllers/educationUserProfileController');
 
 const studentProfileRouter = express.Router();
diff --git a/src/utilities/playwrightUtil.js b/src/utilities/playwrightUtil.js
@@ -0,0 +1,79 @@
+/* eslint-disable no-console */
+const { execSync } = require('node:child_process');
+const { chromium } = require('playwright');
+
+async function ensureBrowserInstalled() {
+  try {
+    // Try launching once
+    const browser = await chromium.launch({
+      headless: true,
+      args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
+    });
+    await browser.close();
+  } catch (err) {
+    console.warn('Browser launch failed, attempting install...', err);
+
+    try {
+      // Force install without relying on .bin/playwright
+      execSync('node node_modules/playwright/cli.js install chromium', {
+        stdio: 'inherit',
+      });
+    } catch (installErr) {
+      console.error('Playwright browser installation failed:', installErr);
+      throw installErr;
+    }
+  }
+}
+
+const playwrightLogic = async () => {
+  try {
+    const { PUPPETEER_EMAIL, PUPPETEER_PASSWORD, REACT_FRONTEND_URL } = process.env;
+
+    if (!PUPPETEER_EMAIL || !PUPPETEER_PASSWORD) {
+      console.log('Playwright email or password not found in environment variables');
+    }
+
+    await ensureBrowserInstalled();
+
+    const browser = await chromium.launch({
+      headless: true,
+      args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
+    });
+
+    const context = await browser.newContext({
+      viewport: { width: 1920, height: 1080 },
+    });
+
+    const page = await context.newPage();
+
+    // Login page
+    await page.goto(`${REACT_FRONTEND_URL}/login`, { waitUntil: 'networkidle' });
+
+    await page.fill('input[id="email"]', PUPPETEER_EMAIL);
+    await page.fill('input[id="password"]', PUPPETEER_PASSWORD);
+
+    await page.click('.btn.btn-primary');
+
+    // Wait for navigation after login
+    await page.waitForNavigation({ waitUntil: 'networkidle' });
+
+    // Navigate to report page
+    await page.goto(`${REACT_FRONTEND_URL}/totalorgsummary`, { waitUntil: 'networkidle' });
+
+    // Wait for full load (instead of setTimeout)
+    await page.waitForLoadState('networkidle');
+
+    // Screenshot
+    await page.screenshot({
+      path: 'weeklyCompanySummary.png',
+      fullPage: true,
+    });
+
+    await browser.close();
+  } catch (err) {
+    console.error('Playwright error:', err);
+    throw err;
+  }
+};
+
+module.exports = playwrightLogic;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`const express = require('express');`
`2`		`-`
`3`	`2`	`const controller = require('../controllers/educationUserProfileController');`
`4`	`3`
`5`	`4`	`const studentProfileRouter = express.Router();`