Merge pull request #753 from Tusharmahajan12/new_asp_apr24

Referral feedback changes

Author: Tusharmahajan12

src/adapters/postgres/cohort-adapter.ts

@@ -16,6 +16,7 @@ import {
   LessThanOrEqual,
   Equal,
   Not,
+  Between,
 } from 'typeorm';
 import { Cohort } from 'src/cohort/entities/cohort.entity';
 import { Fields } from 'src/fields/entities/fields.entity';
@@ -1380,7 +1381,7 @@ export class PostgresCohortService {
       );
 
       // Combine the arrays
-      const allowedKeys = ['userId', ...cohortAllKeys, ...customFieldsKeys];
+      const allowedKeys = ['userId', 'start_year', ...cohortAllKeys, ...customFieldsKeys];
 
       const whereClause = {};
       const searchCustomFields = {};
@@ -1565,6 +1566,20 @@ export class PostgresCohortService {
               }
               whereClause[key] = normalizedDate;
             }
+          } else if (key === 'start_year') {
+            const year = Number(value);
+            if (!Number.isInteger(year) || year <= 0) {
+              return APIResponse.error(
+                response,
+                apiId,
+                `Invalid start_year value: ${value}. Must be a valid positive integer year.`,
+                'Invalid filter value',
+                HttpStatus.BAD_REQUEST
+              );
+            }
+            const startOfYear = `${year}-01-01T00:00:00.000Z`;
+            const endOfYear = `${year}-12-31T23:59:59.999Z`;
+            whereClause['cohort_startDate'] = Between(startOfYear, endOfYear);
           } else if (cohortAllKeys.includes(key)) {
             whereClause[key] = value;
           }

src/cohort/dto/cohort-search.dto.ts

@@ -164,6 +164,16 @@ export class filtersProperty {
   @IsDateString()
   cohort_endDate?: string;
 
+  @ApiPropertyOptional({
+    type: Number,
+    description: 'Filter cohorts by the year of cohort_startDate',
+    example: 2026,
+  })
+  @Expose()
+  @IsOptional()
+  @IsNumber()
+  start_year?: number;
+
   //customFieldsName
   @ApiProperty({
     type: Object,

src/referrals/referrals.service.ts

@@ -133,23 +133,29 @@ export class ReferralsService {
     const [rows, total] = await query.getManyAndCount();
 
     const signupCounts = rows.length
-      ? await this.dataSource.query<{ referralEntityId: string; signups: number }[]>(
-          `SELECT ua."referralEntityId", COUNT(DISTINCT ua."userId")::int AS signups
+      ? await this.dataSource.query<{ referralEntityId: string; status: string; count: number }[]>(
+          `SELECT ua."referralEntityId", u."status", COUNT(DISTINCT ua."userId")::int AS count
            FROM "UserAttribution" ua
            JOIN "Users" u ON u."userId" = ua."userId"
            WHERE ua."referralEntityId" = ANY($1)
-             AND u."status" = 'active'
-           GROUP BY ua."referralEntityId"`,
+             AND u."status" IN ('active', 'inactive')
+           GROUP BY ua."referralEntityId", u."status"`,
           [rows.map((r) => r.id)],
         )
       : [];
 
-    const signupMap = new Map(signupCounts.map((s) => [s.referralEntityId, s.signups]));
+    const activeMap = new Map<string, number>();
+    const inactiveMap = new Map<string, number>();
+    for (const row of signupCounts) {
+      if (row.status === 'active') activeMap.set(row.referralEntityId, row.count);
+      else if (row.status === 'inactive') inactiveMap.set(row.referralEntityId, row.count);
+    }
 
     return {
       data: rows.map((r) => ({
         ...this.normalizeReferral({ ...r, referLink: buildReferLink(r.slug) }),
-        signups: signupMap.get(r.id) ?? 0,
+        signups: activeMap.get(r.id) ?? 0,
+        inactive_signups: inactiveMap.get(r.id) ?? 0,
       })),
       total,
       limit,