Merge pull request #921 from sparrowapp-dev/release/2.35.0

Release/2.35.0 to release-v2.

Author: aakashreddy-p

.github/workflows/staging.yml

@@ -2,43 +2,43 @@ name: Staging
 on:
   push:
     branches:
-      - release/2.34.0
+      - release/2.35.0
 
 jobs:
-   build:
-      runs-on: ubuntu-latest
-      steps:
-         - uses: actions/checkout@master
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
 
-         - uses: Azure/docker-login@v1
-           with:
-              login-server: sparrowprod.azurecr.io
-              username: ${{ secrets.REGISTRY_USERNAME }}
-              password: ${{ secrets.REGISTRY_PASSWORD }}
+      - uses: Azure/docker-login@v1
+        with:
+          login-server: sparrowprod.azurecr.io
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
 
-         - run: |
-              docker build . -t sparrowprod.azurecr.io/sparrow-api:${{ github.run_number }} --build-arg GITHUB_TOKEN=${{ secrets.SPARROW_GITHUB_TOKEN }}
-              docker push sparrowprod.azurecr.io/sparrow-api:${{ github.run_number }}
-   deploy:
-      needs: build
-      runs-on: ubuntu-latest
-      steps:
-         - uses: actions/checkout@master
-         - uses: richardrigutins/replace-in-files@v1
-           with:
-              files: "./deploymentManifests/deployment.yml"
-              search-text: '_BUILD__ID_'
-              replacement-text: '${{ github.run_number }}'
+      - run: |
+          docker build . -t sparrowprod.azurecr.io/sparrow-api:${{ github.run_number }} --build-arg GITHUB_TOKEN=${{ secrets.SPARROW_GITHUB_TOKEN }}
+          docker push sparrowprod.azurecr.io/sparrow-api:${{ github.run_number }}
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: richardrigutins/replace-in-files@v1
+        with:
+          files: "./deploymentManifests/deployment.yml"
+          search-text: "_BUILD__ID_"
+          replacement-text: "${{ github.run_number }}"
 
-         - uses: azure/[email protected]
+      - uses: azure/[email protected]
 
-         - uses: Azure/k8s-set-context@v2
-           with:
-              kubeconfig: ${{ secrets.KUBE_CONFIG }}
+      - uses: Azure/k8s-set-context@v2
+        with:
+          kubeconfig: ${{ secrets.KUBE_CONFIG }}
 
-         - uses: Azure/k8s-deploy@v4
-           with:
-              action: deploy
-              namespace: sparrow-staging
-              manifests: |
-                 ./deploymentManifests/deployment.yml
+      - uses: Azure/k8s-deploy@v4
+        with:
+          action: deploy
+          namespace: sparrow-staging
+          manifests: |
+            ./deploymentManifests/deployment.yml

migrations/add-community-plan-to-teams.migration.ts

@@ -0,0 +1,66 @@
+import { Injectable, Inject, OnModuleInit } from "@nestjs/common";
+import { Db, ObjectId } from "mongodb";
+import { Collections } from "@src/modules/common/enum/database.collection.enum";
+import { LimitArea } from "@src/modules/common/models/plan.model";
+import { ConfigService } from "@nestjs/config";
+
+@Injectable()
+export class AddCommunityPlanToTeamsMigration implements OnModuleInit {
+  private hasRun = false;
+
+  constructor(
+    @Inject("DATABASE_CONNECTION") private readonly db: Db,
+    private readonly configService: ConfigService,
+  ) {}
+
+  async onModuleInit(): Promise<void> {
+    if (this.hasRun) return;
+
+    try {
+      console.log("Running AddCommunityPlanToTeamsMigration...");
+
+      const teamCollection = this.db.collection(Collections.TEAM);
+      const planCollection = this.db.collection(Collections.PLAN);
+
+      // Get the default hub plan name from config
+      const defaultHubPlan =
+        this.configService.get<string>("app.defaultHubPlan");
+      // Fetch the plan from plan collection
+      const planDoc = await planCollection.findOne({ name: defaultHubPlan });
+      if (!planDoc) {
+        console.warn(
+          `Plan '${defaultHubPlan}' not found in plan collection. Skipping team updates.`,
+        );
+        return;
+      }
+      const { _id, ...planData } = planDoc;
+
+      // Update teams that don't have a plan or where plan.id is missing
+      const query = {
+        $or: [
+          { plan: { $exists: false } },
+          { plan: null },
+          { "plan.id": { $exists: false } },
+        ],
+      };
+
+      const update = {
+        $set: {
+          plan: {
+            id: _id,
+            ...planData,
+          },
+        },
+      };
+
+      const result = await teamCollection.updateMany(query, update);
+      console.log(
+        `Updated ${result.modifiedCount} team(s) with the Community plan.`,
+      );
+
+      this.hasRun = true;
+    } catch (error) {
+      console.error("Error during AddCommunityPlanToTeamsMigration:", error);
+    }
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-sparrow-api",
-  "version": "2.34.0",
+  "version": "2.35.0",
   "description": "Backend APIs for Project Sparrow.",
   "author": "techdome",
   "license": "",
@@ -36,7 +36,8 @@
     "start:migration-superadmin": "ts-node -r tsconfig-paths/register src/migration-superadmin.ts",
     "start:migration-email": "ts-node -r tsconfig-paths/register src/migration-emailId.ts",
     "start:add-test-request": "ts-node -r tsconfig-paths/register src/add-tests-to-request.ts",
-    "start:add-testflow-schedule": "ts-node -r tsconfig-paths/register src/update-plan-testflow-schedule.ts"
+    "start:add-testflow-schedule": "ts-node -r tsconfig-paths/register src/update-plan-testflow-schedule.ts",
+    "start:add-community-plan-to-teams": "ts-node -r tsconfig-paths/register src/add-community-plan-to-teams.ts"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.54.0",

src/add-community-plan-to-teams.ts

@@ -0,0 +1,43 @@
+import { NestFactory } from "@nestjs/core";
+import { Module, Provider } from "@nestjs/common";
+import { MongoClient, Db } from "mongodb";
+import { ConfigModule, ConfigService } from "@nestjs/config";
+import configuration from "./modules/common/config/configuration";
+import { AddCommunityPlanToTeamsMigration } from "migrations/add-community-plan-to-teams.migration";
+
+const databaseProvider: Provider = {
+  provide: "DATABASE_CONNECTION",
+  useFactory: async (configService: ConfigService): Promise<Db> => {
+    const dbUrl = configService.get<string>("db.url");
+    const dbName = configService.get<string>("db.name");
+
+    if (!dbUrl) {
+      throw new Error("Database URL is not defined in the configuration.");
+    }
+
+    const client = new MongoClient(dbUrl);
+    await client.connect();
+    return client.db(dbName);
+  },
+  inject: [ConfigService],
+};
+
+@Module({
+  imports: [
+    ConfigModule.forRoot({
+      isGlobal: true,
+      load: [configuration],
+    }),
+  ],
+  providers: [databaseProvider, AddCommunityPlanToTeamsMigration],
+})
+class MigrationModule {}
+
+async function run() {
+  const app = await NestFactory.createApplicationContext(MigrationModule);
+  const migration = app.get(AddCommunityPlanToTeamsMigration);
+  await migration.onModuleInit();
+  await app.close();
+}
+
+run();

src/modules/common/enum/testflow.enum.ts

@@ -37,12 +37,21 @@ export interface EmailData {
   scheduleRunPassedCount: number;
   scheduleRunFailedCount: number;
   scheduleRunTotalRequest: number;
-  scheduleRunPassPercentage: string; 
+  scheduleRunPassPercentage: string;
   scheduleTotalTime: string | number;
   scheduleRunEnvName: string;
   isSuccess: boolean;
   isFailed: boolean;
   isPartial: boolean;
+  testflowDataSummary?: DatasetSummaryItem[];
+}
+
+export interface DatasetSummaryItem {
+  datasetName: string;
+  requestCount: number;
+  passedCount: number;
+  failedCount: number;
+  duration: string;
 }
 
 export interface OnceConfig {