Dear ${user.firstName},
+You have received a new blue square for not meeting the required hours.
+Infringement details:
+${infringement.description}
+Additional hours for next week: ${additionalHours} hours.
+Thank you for your continued dedication.
+Best regards,
+One Community
`; + const deleteBlueSquareAfterYear = async () => { const nowLA = moment().tz('America/Los_Angeles'); diff --git a/src/models/educationPortal/browsableLessonPlanModel.js b/src/models/educationPortal/browsableLessonPlanModel.js index c414e58013..ec5795b107 100644 --- a/src/models/educationPortal/browsableLessonPlanModel.js +++ b/src/models/educationPortal/browsableLessonPlanModel.js @@ -26,7 +26,7 @@ const BrowsableLessonPlanSchema = new mongoose.Schema( materials: [{ type: String }], metadata: { type: mongoose.Schema.Types.Mixed }, }, - { timestamps: true } + { timestamps: true }, ); // Text index for search functionality @@ -44,4 +44,8 @@ BrowsableLessonPlanSchema.index({ featured: 1, createdAt: -1 }); BrowsableLessonPlanSchema.index({ savedCount: -1 }); BrowsableLessonPlanSchema.index({ views: -1 }); -module.exports = mongoose.model('BrowsableLessonPlan', BrowsableLessonPlanSchema, 'browsableLessonPlans'); \ No newline at end of file +module.exports = mongoose.model( + 'BrowsableLessonPlan', + BrowsableLessonPlanSchema, + 'browsableLessonPlans', +); diff --git a/src/routes/educationPortal/browsableLessonPlanRouter.js b/src/routes/educationPortal/browsableLessonPlanRouter.js index 7dd13b3131..11ffe6b508 100644 --- a/src/routes/educationPortal/browsableLessonPlanRouter.js +++ b/src/routes/educationPortal/browsableLessonPlanRouter.js @@ -16,4 +16,4 @@ module.exports = function (BrowsableLessonPlanModel, UserProfileModel) { router.get('/student/saved-interests/check', controller.checkIfSaved); return router; -}; \ No newline at end of file +}; diff --git a/src/test/factories/testTimeEntryBuilder.js b/src/test/factories/testTimeEntryBuilder.js new file mode 100644 index 0000000000..151a8d5419 --- /dev/null +++ b/src/test/factories/testTimeEntryBuilder.js @@ -0,0 +1,26 @@ +const TimeEntry = require('../../models/timeentry'); + +class TimeEntryBuilder { + constructor() { + this.data = []; + return this; + } + addEntry(userId, dateOfWork, totalHours, isTangible = true, entryType = 'task') { + this.data.push({ + personId: userId, + dateOfWork: dateOfWork, + isTangible: isTangible, + entryType: entryType, + totalSeconds: totalHours * 3600, + createdDateTime: new Date(), + isActive: true, + }); + return this; + } + async buildAndSave() { + const entries = await TimeEntry.create(this.data); + return entries; + } +} + +module.exports = TimeEntryBuilder; \ No newline at end of file diff --git a/src/test/factories/testUserBuilder.js b/src/test/factories/testUserBuilder.js new file mode 100644 index 0000000000..760fe9803a --- /dev/null +++ b/src/test/factories/testUserBuilder.js @@ -0,0 +1,103 @@ +const UserProfile = require('../../models/userProfile'); +const TimeEntry = require('../../models/timeentry'); +const createUser = require('../db/createUser'); + +const moment = require('moment-timezone'); + +class UserBuilder { + /** + * Default user: + * 1. Core Team + * 2. Created 2 weeks ago + * 3. Weekly committed hours: 10 + * 4. Missed hours: 0 + */ + constructor() { + this.now = moment.tz('America/Los_Angeles'); + + this.data = { + infringements: [], + weeklycommittedHours: 10, + role: 'Core Team', + missedHours: 0, + startDate: this.now.clone().subtract(2, 'weeks').toDate(), + weeklySummaries: [], + infringements: [], + }; + + return this; + } + + asCoreTeam() { + this.data.role = 'Core Team'; + return this; + } + + asVolunteer() { + this.data.role = 'Volunteer'; + return this; + } + + withCommittedHours(hours) { + this.data.weeklycommittedHours = hours; + return this; + } + + withStartDate(date) { + this.data.startDate = date; + return this; + } + + withInfringements(number) { + this.data.infringements = Array(number) + .fill() + .map((_, i) => ({ + date: this.now.clone().subtract(i + 1, 'weeks').toDate(), + description: `Infringement ${i + 1}`, + })); + return this; + } + + withMissessedHours(hours) { + this.data.missedHours = hours; + return this; + } + + withWeeklySummary(text) { + this.data.weeklySummaries.push({ + dueDate: this.now.clone().endOf('week').toDate(), + summary: text, + uploadDate: this.now.clone().toDate() + }); + return this; + } + + override(fields) { + Object.assign(this.data, fields); + return this; + } + + async buildAndSave() { + // Create fresh user + const user = await createUser(); + + // Apply all builder fields directly to the user instance + for (const [key, value] of Object.entries(this.data)) { + user[key] = value; + } + + await user.save(); + return user; + } + + /** + * Build an unsaved user object + */ + async build() { + const user = await createUser(); + Object.assign(user, this.data); + return user; + } +} + +module.exports = UserBuilder; diff --git a/src/test/timeNotMetCoreTeamTest.test.js b/src/test/timeNotMetCoreTeamTest.test.js new file mode 100644 index 0000000000..bfc67482a6 --- /dev/null +++ b/src/test/timeNotMetCoreTeamTest.test.js @@ -0,0 +1,275 @@ +/* eslint-disable */ +const { MongoMemoryServer } = require('mongodb-memory-server'); +const mongoose = require('mongoose'); +const moment = require('moment-timezone'); +const UserBuilder = require("./factories/testUserBuilder"); +const TimeEntryBuilder = require("./factories/testTimeEntryBuilder"); + +// Import models first +const UserProfile = require('../models/userProfile'); +const TimeEntry = require('../models/timeentry'); +const createUser = require('./db/createUser'); + +const userHelper = require('../helpers/userHelper')(); + +const WEEKLY_SUMMARY = "Lorem ipsum dolor sit amet consectetur adipiscing elit quisque faucibus ex sapien vitae pellentesque sem placerat in id cursus mi pretium tellus duis convallis tempus leo eu aenean sed diam urna tempor pulvinar vivamus fringilla lacus nec metus bibendum egestas iaculis massa nisl malesuada lacinia integer nunc posuere ut hendrerit semper vel class aptent taciti." +// Mock other dependencies +jest.mock('../helpers/dashboardhelper'); +jest.mock('../utilities/emailSender'); +jest.mock('../startup/logger'); + +describe('Time Not Met Core Team Test', () => { + let mongoServer; + let userProfileModel; + let timeEntryModel; + let realDate; + + let now, lastWeekStart, lastWeekEnd; + + beforeAll(async () => { + mongoServer = await MongoMemoryServer.create(); + await mongoose.connect(mongoServer.getUri()); + + // Initialize models + userProfileModel = UserProfile; + timeEntryModel = TimeEntry; + }); + + beforeEach(async () => { + await UserProfile.deleteMany({}); + await TimeEntry.deleteMany({}); + const sundayPST = moment.tz('2025-11-09 00:10:00', 'America/Los_Angeles'); + realDate = Date.now; + global.Date.now = jest.fn(() => sundayPST.valueOf()); + + now = moment.tz('America/Los_Angeles'); + lastWeekStart = now.clone().startOf('week').subtract(1, 'week'); + lastWeekEnd = now.clone().endOf('week').subtract(1, 'week'); + }); + + afterEach(() => { + global.Date.now = realDate; + }); + + afterAll(async () => { + await mongoose.disconnect(); + await mongoServer.stop(); + }); + + + describe('Less than 5 Blue Squares', () => { + it('should not assign blue square if no missed hours', async () => { + // 1. Create test user + + const user = await new UserBuilder().withWeeklySummary(WEEKLY_SUMMARY).buildAndSave(); + + // 2. Create test entries with properly formatted string dates + + const timeEntryBuilder = await new TimeEntryBuilder().addEntry( + user._id, + lastWeekStart.clone().add(1, 'day').format('YYYY-MM-DD'), // Monday + 4 // 4 hours + ).addEntry( + user._id, + lastWeekStart.clone().add(3, 'days').format('YYYY-MM-DD'), // Wednesday + 4 // 4 hours + ).addEntry( + user._id, + lastWeekStart.clone().add(5, 'days').format('YYYY-MM-DD'), // Friday + 2 // 2 hours + ).buildAndSave(); + + // 4. Final assertions + await userHelper.assignBlueSquareForTimeNotMet(); + await userHelper.applyMissedHourForCoreTeam(); + + const updatedUser = await UserProfile.findById(user._id); + + expect(updatedUser.infringements.length).toBe(0); + expect(updatedUser.missedHours).toBe(0); + }); + + it('should assign first blue square when 2 hours missed (8/10)', async () => { + // 1. Create test user with no existing infringements + + const user = await new UserBuilder().withWeeklySummary(WEEKLY_SUMMARY).buildAndSave(); + + // 2. Create time entries totaling 8 hours (2 hours short) + const timeEntryBuilder = await new TimeEntryBuilder().addEntry( + user._id, + lastWeekStart.clone().add(1, 'day').format('YYYY-MM-DD'), // Monday + 3 // 3 hours + ).addEntry( + user._id, + lastWeekStart.clone().add(3, 'days').format('YYYY-MM-DD'), // Wednesday + 5 // 5 hours + ).buildAndSave(); + + // 3. Execute the blue square assignment + await userHelper.applyMissedHourForCoreTeam(); + await userHelper.assignBlueSquareForTimeNotMet(); + + // 4. Verify results + const updatedUser = await UserProfile.findById(user._id); + + // Should have exactly 1 new infringement (blue square) + expect(updatedUser.infringements.length).toBe(1); + // Should show 2 missed hours (10 committed - 8 worked) + expect(updatedUser.missedHours).toBe(2); + }); + + }); + + describe('More than 5 Blue Squares ', () => { + it('should maintain 6 infringements and 0 missed hours when logging exact committed hours', async () => { + // 6 existing infringements + const user = await new UserBuilder().withInfringements(6).withWeeklySummary(WEEKLY_SUMMARY).buildAndSave(); + + // 10 hours (2 entries of 5 hours) - exactly meets commitment + const timeEntryBuilder = await new TimeEntryBuilder().addEntry( + user._id, + lastWeekStart.clone().add(1, 'day').format('YYYY-MM-DD'), + 5 // 5 hours + ).addEntry( + user._id, + lastWeekStart.clone().add(3, 'days').format('YYYY-MM-DD'), + 5 // 5 hours + ).buildAndSave(); + + // Execute + await userHelper.assignBlueSquareForTimeNotMet(); + await userHelper.applyMissedHourForCoreTeam(); + + // Verify + const updatedUser = await UserProfile.findById(user._id); + // did not miss any hours so nothing changes + expect(updatedUser.infringements.length).toBe(6); + expect(updatedUser.missedHours).toBe(0); + }); + + it('should only carry forward missed hours with a penalty hours', async () => { + // Create user with 6 existing blue squares and 3 missed hours + + const user = await new UserBuilder().withInfringements(6).withMissessedHours(3).withWeeklySummary(WEEKLY_SUMMARY).buildAndSave(); + + // Log only 8 hours this week (2 hours short) + const timeEntryBuilder = await new TimeEntryBuilder().addEntry( + user._id, + lastWeekStart.clone().add(2, 'day').format('YYYY-MM-DD'), + 4 // 4 hours + ).addEntry( + user._id, + lastWeekStart.clone().add(4, 'days').format('YYYY-MM-DD'), + 4 // 4 hours + ).buildAndSave(); + + // Execute the functions + await userHelper.assignBlueSquareForTimeNotMet(); + await userHelper.applyMissedHourForCoreTeam(); + + // Verify Week 6 results + const updatedUser = await UserProfile.findById(user._id); + + // Should have 7 infringements (added new one for this week) + expect(updatedUser.infringements.length).toBe(7); + + // Should have 6 missed hours (3 previous + 2 new + 1 penalty (more than 5 blue squares)) + expect(updatedUser.missedHours).toBe(6); + }); + + it('should only add missed hours (no penalty) for 5th blue square', async () => { + // 1. Create user with 4 Blue Squares + const user = await new UserBuilder().withInfringements(4).withWeeklySummary(WEEKLY_SUMMARY).buildAndSave(); + + // Log only 7 hours (3 hours short) + const timeEntryBuilder = await new TimeEntryBuilder().addEntry( + user._id, + lastWeekStart.clone().add(2, 'day').format('YYYY-MM-DD'), + 3 // 3 hours + ).addEntry( + user._id, + lastWeekStart.clone().add(4, 'days').format('YYYY-MM-DD'), + 4 // 4 hours + ).buildAndSave(); + + // Execute the functions + await userHelper.assignBlueSquareForTimeNotMet(); + await userHelper.applyMissedHourForCoreTeam(); + + // Verify results + const updatedUser = await UserProfile.findById(user._id); + + // Should have exactly 5 infringements (added the 5th) + expect(updatedUser.infringements.length).toBe(5); + + // Should only carry forward missed hours (no penalty yet) + // Missed hours: 10 - 7 = 3 + expect(updatedUser.missedHours).toBe(3); + }); + }); + + describe('Edge Cases', () => { + it('should handle zero committed hours scenario', async () => { + // User with 0 committed hours shouldn't get infringements + const user = await new UserBuilder().withCommittedHours(0).withWeeklySummary(WEEKLY_SUMMARY).buildAndSave(); + + await userHelper.assignBlueSquareForTimeNotMet(); + await userHelper.applyMissedHourForCoreTeam(); + + const updatedUser = await UserProfile.findById(user._id); + expect(updatedUser.infringements.length).toBe(0); + expect(updatedUser.missedHours).toBe(0); + }); + + it('should handle user with no time entries at all', async () => { + // User with no time entries should get full missed hours + const user = await new UserBuilder().withWeeklySummary(WEEKLY_SUMMARY).buildAndSave(); + + // No time entries + + await userHelper.assignBlueSquareForTimeNotMet(); + await userHelper.applyMissedHourForCoreTeam(); + + const updatedUser = await UserProfile.findById(user._id); + expect(updatedUser.infringements.length).toBe(1); + expect(updatedUser.missedHours).toBe(10); + }); + + it('should not assign additional hours for non-Core Team members', async () => { + const user = await new UserBuilder().withWeeklySummary(WEEKLY_SUMMARY).asVolunteer().buildAndSave(); + + // No time entries = would normally trigger blue square + await userHelper.assignBlueSquareForTimeNotMet(); + await userHelper.applyMissedHourForCoreTeam(); + + const updatedUser = await UserProfile.findById(user._id); + expect(updatedUser.infringements.length).toBe(1); + expect(updatedUser.missedHours).toBe(0); // Non-Core Team doesn't accumulate missed hours + }); + + + it('should not assign penalty hours when blue squares > 5 but time entries meet committed hours', async () => { + // Create user with 5 existing blue squares + const user = await new UserBuilder().withInfringements(6).withWeeklySummary(WEEKLY_SUMMARY).buildAndSave(); + + const timeEntryBuilder = await new TimeEntryBuilder().addEntry( + user._id, + lastWeekStart.clone().add(1, 'day').format('YYYY-MM-DD'), + 5 // 5 hours + ).addEntry( + user._id, + lastWeekStart.clone().add(3, 'days').format('YYYY-MM-DD'), + 5 // 5 hours + ).buildAndSave(); + + await userHelper.assignBlueSquareForTimeNotMet(); + await userHelper.applyMissedHourForCoreTeam(); + + const updatedUser = await UserProfile.findById(user._id); + + // Should not get a new blue square since hours were met + expect(updatedUser.infringements.length).toBe(6); + expect(updatedUser.missedHours).toBe(0); + }); + }); +});