Merge pull request #49 from HamzaSha1/ZOD-349-weekly-spending-data-not-displaying-in-the-child-profile-parent-view

Zod 349 weekly spending data not displaying in the child profile parent view

src/card/services/card.service.ts

@@ -163,8 +163,8 @@ export class CardService {
     return finalAmount.toNumber();
   }
 
-  getWeeklySummary(juniorId: string, startDate?: Date, endDate?: Date) {
-    return this.transactionService.getWeeklySummary(juniorId, startDate, endDate);
+  getWeeklySummary(juniorId: string) {
+    return this.transactionService.getWeeklySummary(juniorId);
   }
 
   fundIban(iban: string, amount: number) {

src/card/services/transaction.service.ts

@@ -84,28 +84,15 @@ export class TransactionService {
     return existingTransaction;
   }
 
-  async getWeeklySummary(juniorId: string, startDate?: Date, endDate?: Date) {
-    let startOfWeek: Date;
-    let endOfWeek: Date;
-
-    if (startDate && endDate) {
-      startOfWeek = startDate;
-      endOfWeek = endDate;
-    } else {
-      const now = moment();
-      const dayOfWeek = now.day();
-      
-      startOfWeek = moment().subtract(dayOfWeek, 'days').startOf('day').toDate();
-      
-      endOfWeek = moment().add(6 - dayOfWeek, 'days').endOf('day').toDate();
-    }
+  async getWeeklySummary(juniorId: string) {
+    const endOfWeek = moment().toDate();
+    const startOfWeek = moment().subtract(1, 'week').toDate();
 
     const transactions = await this.transactionRepository.getTransactionsForCardWithinDateRange(
       juniorId,
       startOfWeek,
       endOfWeek,
     );
-    
     const summary = {
       startOfWeek: startOfWeek,
       endOfWeek: endOfWeek,

src/i18n/ar/app.json

@@ -19,10 +19,6 @@
     "TOKEN_EXPIRED": "رمز المستخدم منتهي الصلاحية."
   },
 
-  "QR": {
-    "CODE_USED_OR_EXPIRED": "تم استخدام رمز QR مسبقًا أو انتهت صلاحيته."
-  },
-
   "USER": {
     "PHONE_ALREADY_VERIFIED": "تم التحقق من رقم الهاتف بالفعل.",
     "EMAIL_ALREADY_VERIFIED": "تم التحقق من عنوان البريد الإلكتروني بالفعل.",

src/i18n/en/app.json

@@ -19,10 +19,6 @@
     "TOKEN_EXPIRED": "The user token has expired."
   },
 
-  "QR": {
-    "CODE_USED_OR_EXPIRED": "The QR code has already been used or expired."
-  },
-
   "USER": {
     "PHONE_ALREADY_VERIFIED": "The phone number has already been verified.",
     "EMAIL_ALREADY_VERIFIED": "The email address has already been verified.",

src/junior/controllers/junior.controller.ts

@@ -151,17 +151,11 @@ export class JuniorController {
   @UseGuards(RolesGuard)
   @AllowedRoles(Roles.GUARDIAN)
   @ApiDataResponse(WeeklySummaryResponseDto)
-  @ApiQuery({ name: 'startUtc', required: false, type: String, example: '2025-10-20T00:00:00.000Z', description: 'Start date (defaults to start of current week)' })
-  @ApiQuery({ name: 'endUtc', required: false, type: String, example: '2025-10-26T23:59:59.999Z', description: 'End date (defaults to end of current week)' })
   async getWeeklySummary(
     @Param('juniorId', CustomParseUUIDPipe) juniorId: string,
     @AuthenticatedUser() user: IJwtPayload,
-    @Query('startUtc') startUtc?: string,
-    @Query('endUtc') endUtc?: string,
   ) {
-    const startDate = startUtc ? new Date(startUtc) : undefined;
-    const endDate = endUtc ? new Date(endUtc) : undefined;
-    const summary = await this.juniorService.getWeeklySummary(juniorId, user.sub, startDate, endDate);
+    const summary = await this.juniorService.getWeeklySummary(juniorId, user.sub);
     return ResponseFactory.data(summary);
   }
 

src/junior/services/junior.service.ts

@@ -5,7 +5,6 @@ import { Roles } from '~/auth/enums';
 import { CardService, TransactionService } from '~/card/services';
 import { NeoLeapService } from '~/common/modules/neoleap/services';
 import { PageOptionsRequestDto } from '~/core/dtos';
-import { ErrorCategory } from '~/core/enums';
 import { setIf } from '~/core/utils';
 import { CustomerService } from '~/customer/services';
 import { DocumentService, OciService } from '~/document/services';
@@ -159,14 +158,7 @@ export class JuniorService {
   async validateToken(token: string) {
     this.logger.log(`Validating token ${token}`);
     const juniorId = await this.userTokenService.validateToken(token, UserType.JUNIOR);
-    const junior = await this.findJuniorById(juniorId!, true);
-
-    if (junior.customer?.user?.password) {
-      this.logger.error(`Token ${token} already used for junior ${juniorId}`);
-      throw new BadRequestException({ message: 'QR.CODE_USED_OR_EXPIRED', category: ErrorCategory.BUSINESS_ERROR });
-    }
-
-    return junior;
+    return this.findJuniorById(juniorId!, true);
   }
 
   async generateToken(juniorId: string) {
@@ -220,7 +212,7 @@ export class JuniorService {
     this.logger.log(`Junior ${juniorId} deleted successfully`);
   }
 
-  async getWeeklySummary(juniorId: string, guardianId: string, startDate?: Date, endDate?: Date) {
+  async getWeeklySummary(juniorId: string, guardianId: string) {
     const doesBelong = await this.doesJuniorBelongToGuardian(guardianId, juniorId);
 
     if (!doesBelong) {
@@ -229,7 +221,7 @@ export class JuniorService {
     }
 
     this.logger.log(`Getting weekly summary for junior ${juniorId}`);
-    return this.cardService.getWeeklySummary(juniorId, startDate, endDate);
+    return this.cardService.getWeeklySummary(juniorId);
   }
 
   async getJuniorHome(juniorId: string, userId: string, size: number): Promise<JuniorHomeResponseDto> {

src/user/services/user.service.ts

@@ -226,15 +226,7 @@ export class UserService {
 
     if (userWithEmail) {
       if (userWithEmail.id === userId) {
-        this.logger.log(`Generating OTP for current email ${email} for user ${userId}`);
-        await this.userRepository.update(userId, { isEmailVerified: false });
-        
-        return this.otpService.generateAndSendOtp({
-          userId,
-          recipient: email,
-          otpType: OtpType.EMAIL,
-          scope: OtpScope.VERIFY_EMAIL,
-        });
+        return;
       }
 
       this.logger.error(`Email ${email} is already taken by another user`);