Merge pull request #632 from code4romania/bugfix/empty-financial-info…

…rmation

Bugfix/empty financial information

backend/src/migrations/1725278083496-OrganizationViewUpdates.ts

@@ -0,0 +1,135 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class OrganizationViewUpdates1725278083496
+  implements MigrationInterface
+{
+  name = 'OrganizationViewUpdates1725278083496';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Drop the existing view and its metadata
+    await queryRunner.query(
+      `DELETE FROM "typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
+      ['VIEW', 'OrganizationView', 'public'],
+    );
+    await queryRunner.query(`DROP VIEW "OrganizationView"`);
+
+    // Create the updated view with the following changes:
+    // 1. Modified the CASE statement for completionStatus:
+    //    - Changed from "OR status IS NULL" to "AND status IS NOT NULL"
+    //    This ensures that only non-null statuses that are not 'Completed' are considered as 'Not Completed'
+    // 2. Updated the updatedOn column:
+    //    - Added a CASE statement to return NULL if the max date is '1970-01-01'
+    //    - Cast the result to text
+    await queryRunner.query(`CREATE VIEW "OrganizationView" AS 
+            SELECT
+              "organization".id AS "id",
+              "organization".status AS "status",
+              "organization".created_on AS "createdOn",
+              CASE 
+                WHEN COUNT(DISTINCT CASE WHEN "organization_financial".status != 'Completed' AND "organization_financial".status IS NOT NULL THEN 1 END) > 0
+                  OR COUNT(DISTINCT CASE WHEN "report".status != 'Completed' AND "report".status IS NOT NULL THEN 1 END) > 0
+                  OR COUNT(DISTINCT CASE WHEN "partner".status != 'Completed' AND "partner".status IS NOT NULL THEN 1 END) > 0
+                  OR COUNT(DISTINCT CASE WHEN "investor".status != 'Completed' AND "investor".status IS NOT NULL THEN 1 END) > 0
+                THEN 'Not Completed'
+                ELSE 'Completed'
+              END AS "completionStatus",
+              "organization_general".name AS "name",
+              "organization_general".alias AS "alias",
+              "organization_general".email AS "adminEmail",
+              COUNT(DISTINCT "user".id) AS "userCount",
+              "organization_general".logo AS "logo",
+              CASE
+                WHEN MAX(GREATEST(COALESCE("organization_financial".updated_on, '1970-01-01'), COALESCE("report".updated_on, '1970-01-01'), COALESCE("partner".updated_on, '1970-01-01'), COALESCE("investor".updated_on, '1970-01-01'))) = '1970-01-01'
+                THEN NULL
+                ELSE MAX(GREATEST(COALESCE("organization_financial".updated_on, '1970-01-01'), COALESCE("report".updated_on, '1970-01-01'), COALESCE("partner".updated_on, '1970-01-01'), COALESCE("investor".updated_on, '1970-01-01')))::text
+              END AS "updatedOn"
+          FROM
+              "organization" "organization"
+              LEFT JOIN "organization_general" "organization_general" ON "organization".organization_general_id = "organization_general".id
+              LEFT JOIN "user" "user" ON "user".organization_id = "organization".id
+                AND "user".deleted_on IS NULL
+                AND "user".ROLE = 'employee'
+                AND "user".status != 'pending'
+              LEFT JOIN "organization_financial" "organization_financial" ON "organization".id = "organization_financial"."organizationId"
+              LEFT JOIN "organization_report" "organization_report" ON "organization".organization_report_id = "organization_report".id
+              LEFT JOIN "report" "report" ON "organization_report".id = "report"."organizationReportId"
+              LEFT JOIN "partner" "partner" ON "organization_report".id = "partner"."organizationReportId"
+              LEFT JOIN "investor" "investor" ON "organization_report".id = "investor"."organizationReportId"
+          WHERE
+            "organization".status != 'pending'
+          GROUP BY
+            "organization".id,
+            "organization_general".id
+        `);
+
+    // Insert metadata for the new view
+    await queryRunner.query(
+      `INSERT INTO "typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
+      [
+        'public',
+        'VIEW',
+        'OrganizationView',
+        'SELECT\n      "organization".id AS "id",\n      "organization".status AS "status",\n      "organization".created_on AS "createdOn",\n    \tCASE \n        WHEN COUNT(DISTINCT CASE WHEN "organization_financial".status != \'Completed\' AND "organization_financial".status IS NOT NULL THEN 1 END) > 0\n          OR COUNT(DISTINCT CASE WHEN "report".status != \'Completed\' AND "report".status IS NOT NULL THEN 1 END) > 0\n          OR COUNT(DISTINCT CASE WHEN "partner".status != \'Completed\' AND "partner".status IS NOT NULL THEN 1 END) > 0\n          OR COUNT(DISTINCT CASE WHEN "investor".status != \'Completed\' AND "investor".status IS NOT NULL THEN 1 END) > 0\n        THEN \'Not Completed\'\n        ELSE \'Completed\'\n    \tEND AS "completionStatus",\n      "organization_general".name AS "name",\n      "organization_general".alias AS "alias",\n      "organization_general".email AS "adminEmail",\n      COUNT(DISTINCT "user".id) AS "userCount",\n      "organization_general".logo AS "logo",\n      CASE\n        WHEN MAX(GREATEST(COALESCE("organization_financial".updated_on, \'1970-01-01\'), COALESCE("report".updated_on, \'1970-01-01\'), COALESCE("partner".updated_on, \'1970-01-01\'), COALESCE("investor".updated_on, \'1970-01-01\'))) = \'1970-01-01\'\n        THEN NULL\n        ELSE MAX(GREATEST(COALESCE("organization_financial".updated_on, \'1970-01-01\'), COALESCE("report".updated_on, \'1970-01-01\'), COALESCE("partner".updated_on, \'1970-01-01\'), COALESCE("investor".updated_on, \'1970-01-01\')))::text\n      END AS "updatedOn"\n  FROM\n      "organization" "organization"\n      LEFT JOIN "organization_general" "organization_general" ON "organization".organization_general_id = "organization_general".id\n      LEFT JOIN "user" "user" ON "user".organization_id = "organization".id\n        AND "user".deleted_on IS NULL\n        AND "user".ROLE = \'employee\'\n        AND "user".status != \'pending\'\n      LEFT JOIN "organization_financial" "organization_financial" ON "organization".id = "organization_financial"."organizationId"\n      LEFT JOIN "organization_report" "organization_report" ON "organization".organization_report_id = "organization_report".id\n      LEFT JOIN "report" "report" ON "organization_report".id = "report"."organizationReportId"\n      LEFT JOIN "partner" "partner" ON "organization_report".id = "partner"."organizationReportId"\n      LEFT JOIN "investor" "investor" ON "organization_report".id = "investor"."organizationReportId"\n  WHERE\n    "organization".status != \'pending\'\n  GROUP BY\n    "organization".id,\n    "organization_general".id',
+      ],
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Drop the updated view and its metadata
+    await queryRunner.query(
+      `DELETE FROM "typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
+      ['VIEW', 'OrganizationView', 'public'],
+    );
+    await queryRunner.query(`DROP VIEW "OrganizationView"`);
+
+    // Recreate the original view with the following differences:
+    // 1. CASE statement for completionStatus uses "OR status IS NULL" instead of "AND status IS NOT NULL"
+    // 2. updatedOn column doesn't have the CASE statement and doesn't cast to text
+    await queryRunner.query(`CREATE VIEW "OrganizationView" AS SELECT
+          "organization".id AS "id",
+          "organization".status AS "status",
+          "organization".created_on AS "createdOn",
+          CASE 
+            WHEN COUNT(DISTINCT CASE WHEN "organization_financial".status != 'Completed' OR "organization_financial".status IS NULL THEN 1 END) > 0
+              OR COUNT(DISTINCT CASE WHEN "report".status != 'Completed' OR "report".status IS NULL THEN 1 END) > 0
+              OR COUNT(DISTINCT CASE WHEN "partner".status != 'Completed' OR "partner".status IS NULL THEN 1 END) > 0
+              OR COUNT(DISTINCT CASE WHEN "investor".status != 'Completed' OR "investor".status IS NULL THEN 1 END) > 0
+            THEN 'Not Completed'
+            ELSE 'Completed'
+          END AS "completionStatus",
+          "organization_general".name AS "name",
+          "organization_general".alias AS "alias",
+          "organization_general".email AS "adminEmail",
+          COUNT(DISTINCT "user".id) AS "userCount",
+          "organization_general".logo AS "logo",
+          MAX(GREATEST(COALESCE("organization_financial".updated_on, '1970-01-01'), COALESCE("report".updated_on, '1970-01-01'), COALESCE("partner".updated_on, '1970-01-01'), COALESCE("investor".updated_on, '1970-01-01'))) AS "updatedOn"
+      FROM
+          "organization" "organization"
+          LEFT JOIN "organization_general" "organization_general" ON "organization".organization_general_id = "organization_general".id
+          LEFT JOIN "user" "user" ON "user".organization_id = "organization".id
+            AND "user".deleted_on IS NULL
+            AND "user".ROLE = 'employee'
+            AND "user".status != 'pending'
+          LEFT JOIN "organization_financial" "organization_financial" ON "organization".id = "organization_financial"."organizationId"
+          LEFT JOIN "organization_report" "organization_report" ON "organization".organization_report_id = "organization_report".id
+          LEFT JOIN "report" "report" ON "organization_report".id = "report"."organizationReportId"
+          LEFT JOIN "partner" "partner" ON "organization_report".id = "partner"."organizationReportId"
+          LEFT JOIN "investor" "investor" ON "organization_report".id = "investor"."organizationReportId"
+      WHERE
+        "organization".status != 'pending'
+      GROUP BY
+        "organization".id,
+        "organization_general".id`);
+
+    // Insert metadata for the original view
+    await queryRunner.query(
+      `INSERT INTO "typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
+      [
+        'public',
+        'VIEW',
+        'OrganizationView',
+        'SELECT\n      "organization".id AS "id",\n      "organization".status AS "status",\n      "organization".created_on AS "createdOn",\n    \tCASE \n        WHEN COUNT(DISTINCT CASE WHEN "organization_financial".status != \'Completed\' OR "organization_financial".status IS NULL THEN 1 END) > 0\n          OR COUNT(DISTINCT CASE WHEN "report".status != \'Completed\' OR "report".status IS NULL THEN 1 END) > 0\n          OR COUNT(DISTINCT CASE WHEN "partner".status != \'Completed\' OR "partner".status IS NULL THEN 1 END) > 0\n          OR COUNT(DISTINCT CASE WHEN "investor".status != \'Completed\' OR "investor".status IS NULL THEN 1 END) > 0\n        THEN \'Not Completed\'\n        ELSE \'Completed\'\n    \tEND AS "completionStatus",\n      "organization_general".name AS "name",\n      "organization_general".alias AS "alias",\n      "organization_general".email AS "adminEmail",\n      COUNT(DISTINCT "user".id) AS "userCount",\n      "organization_general".logo AS "logo",\n      MAX(GREATEST(COALESCE("organization_financial".updated_on, \'1970-01-01\'), COALESCE("report".updated_on, \'1970-01-01\'), COALESCE("partner".updated_on, \'1970-01-01\'), COALESCE("investor".updated_on, \'1970-01-01\'))) AS "updatedOn"\n  FROM\n      "organization" "organization"\n      LEFT JOIN "organization_general" "organization_general" ON "organization".organization_general_id = "organization_general".id\n      LEFT JOIN "user" "user" ON "user".organization_id = "organization".id\n        AND "user".deleted_on IS NULL\n        AND "user".ROLE = \'employee\'\n        AND "user".status != \'pending\'\n      LEFT JOIN "organization_financial" "organization_financial" ON "organization".id = "organization_financial"."organizationId"\n      LEFT JOIN "organization_report" "organization_report" ON "organization".organization_report_id = "organization_report".id\n      LEFT JOIN "report" "report" ON "organization_report".id = "report"."organizationReportId"\n      LEFT JOIN "partner" "partner" ON "organization_report".id = "partner"."organizationReportId"\n      LEFT JOIN "investor" "investor" ON "organization_report".id = "investor"."organizationReportId"\n  WHERE\n    "organization".status != \'pending\'\n  GROUP BY\n    "organization".id,\n    "organization_general".id',
+      ],
+    );
+  }
+}

backend/src/modules/organization/entities/organization-view.entity.ts

@@ -9,19 +9,23 @@ import { OrganizationStatus } from '../enums/organization-status.enum';
       "organization".status AS "status",
       "organization".created_on AS "createdOn",
     	CASE 
-        WHEN COUNT(DISTINCT CASE WHEN "organization_financial".status != 'Completed' OR "organization_financial".status IS NULL THEN 1 END) > 0
-          OR COUNT(DISTINCT CASE WHEN "report".status != 'Completed' OR "report".status IS NULL THEN 1 END) > 0
-          OR COUNT(DISTINCT CASE WHEN "partner".status != 'Completed' OR "partner".status IS NULL THEN 1 END) > 0
-          OR COUNT(DISTINCT CASE WHEN "investor".status != 'Completed' OR "investor".status IS NULL THEN 1 END) > 0
+        WHEN COUNT(DISTINCT CASE WHEN "organization_financial".status != 'Completed' AND "organization_financial".status IS NOT NULL THEN 1 END) > 0
+          OR COUNT(DISTINCT CASE WHEN "report".status != 'Completed' AND "report".status IS NOT NULL THEN 1 END) > 0
+          OR COUNT(DISTINCT CASE WHEN "partner".status != 'Completed' AND "partner".status IS NOT NULL THEN 1 END) > 0
+          OR COUNT(DISTINCT CASE WHEN "investor".status != 'Completed' AND "investor".status IS NOT NULL THEN 1 END) > 0
         THEN 'Not Completed'
         ELSE 'Completed'
     	END AS "completionStatus",
       "organization_general".name AS "name",
       "organization_general".alias AS "alias",
       "organization_general".email AS "adminEmail",
-      COUNT("user".id) AS "userCount",
+      COUNT(DISTINCT "user".id) AS "userCount",
       "organization_general".logo AS "logo",
-      MAX(GREATEST(COALESCE("organization_financial".updated_on, '1970-01-01'), COALESCE("report".updated_on, '1970-01-01'), COALESCE("partner".updated_on, '1970-01-01'), COALESCE("investor".updated_on, '1970-01-01'))) AS "updatedOn"
+      CASE
+        WHEN MAX(GREATEST(COALESCE("organization_financial".updated_on, '1970-01-01'), COALESCE("report".updated_on, '1970-01-01'), COALESCE("partner".updated_on, '1970-01-01'), COALESCE("investor".updated_on, '1970-01-01'))) = '1970-01-01'
+        THEN NULL
+        ELSE MAX(GREATEST(COALESCE("organization_financial".updated_on, '1970-01-01'), COALESCE("report".updated_on, '1970-01-01'), COALESCE("partner".updated_on, '1970-01-01'), COALESCE("investor".updated_on, '1970-01-01')))::text
+      END AS "updatedOn"
   FROM
       "organization" "organization"
       LEFT JOIN "organization_general" "organization_general" ON "organization".organization_general_id = "organization_general".id
@@ -52,7 +56,7 @@ export class OrganizationView {
   createdOn: Date;
 
   @ViewColumn()
-  updatedOn: Date;
+  updatedOn: Date | null;
 
   @ViewColumn()
   name: string;

backend/src/modules/organization/services/organization.service.ts

@@ -1379,11 +1379,12 @@ export class OrganizationService {
     } catch (error) {
       // since we have errors lets rollback the changes we made
       await queryRunner.rollbackTransaction();
+      console.log(error);
 
       Sentry.captureException(error);
 
       this.logger.error({
-        error: { error },
+        error: JSON.stringify(error),
         ...ORGANIZATION_ERRORS.DELETE.ONG,
       });
       const err = error?.response;
@@ -1631,7 +1632,7 @@ export class OrganizationService {
       },
     });
 
-    return data.updatedOn;
+    return data?.updatedOn;
   }
 
   private flattenOrganization(

backend/src/modules/statistics/interfaces/organization-statistics.interface.ts

@@ -9,7 +9,7 @@ export interface IAllOrganizationsStatistics {
 
 export interface IOrganizationStatistics {
   organizationCreatedOn: Date;
-  organizationSyncedOn: Date;
+  organizationSyncedOn: Date | null;
   numberOfInstalledApps: number;
   numberOfUsers: number;
   hubStatistics: IGeneralONGHubStatistics;

backend/src/modules/statistics/services/statistics.service.ts

@@ -322,6 +322,7 @@ export class StatisticsService {
         numberOfErroredReportsInvestorsPartners,
       };
     } catch (error) {
+      console.log(error);
       this.logger.error({
         error: { error },
         ...STATISTICS_ERRORS.ORGANIZATION_STATISTICS,

frontend/src/pages/dashboard/Dashboard.tsx

@@ -72,7 +72,9 @@ const Dashboard = () => {
               <ExetendedStatisticsCard
                 stat={AdminEmployeeDashboardExtendedStatisticsMapping.activity({
                   organizationCreatedOn: new Date(statistics.organizationCreatedOn),
-                  organizationSyncedOn: new Date(statistics.organizationSyncedOn),
+                  organizationSyncedOn: statistics.organizationSyncedOn
+                    ? new Date(statistics.organizationSyncedOn)
+                    : null,
                 })}
               />
             </div>

frontend/src/pages/dashboard/constants/DashboardStatistics.constants.ts

@@ -119,14 +119,17 @@ export const AdminEmployeeDashboardExtendedStatisticsMapping = {
     icon: UserGroupIcon,
     info: [{ title: value, subtitle: 'statistics.active_users' }],
   }),
-  activity: (values: { organizationCreatedOn: Date; organizationSyncedOn: Date }) => ({
+  activity: (values: { organizationCreatedOn: Date; organizationSyncedOn: Date | null }) => ({
     icon: ClockIcon,
     info: [
       {
         subtitle: formatDate(values.organizationCreatedOn),
         title: 'activity_title',
       },
-      { subtitle: formatDate(values.organizationSyncedOn), title: 'last_updated_on' },
+      {
+        subtitle: values.organizationSyncedOn ? formatDate(values.organizationSyncedOn) : '-',
+        title: 'last_updated_on',
+      },
     ],
   }),
 };
@@ -181,14 +184,17 @@ export const SuperAdminOverviewExtendedStatisticsMapping = {
     icon: UserGroupIcon,
     info: [{ title: value, subtitle: 'statistics.active_users' }],
   }),
-  activity: (values: { organizationCreatedOn: Date; organizationSyncedOn: Date }) => ({
+  activity: (values: { organizationCreatedOn: Date; organizationSyncedOn: Date | null }) => ({
     icon: ClockIcon,
     info: [
       {
         subtitle: formatDate(values.organizationCreatedOn),
         title: 'activity_title',
       },
-      { subtitle: formatDate(values.organizationSyncedOn), title: 'last_updated_on' },
+      {
+        subtitle: values.organizationSyncedOn ? formatDate(values.organizationSyncedOn) : '-',
+        title: 'last_updated_on',
+      },
     ],
   }),
 };

frontend/src/pages/organization/components/Overview/OrganizationOverview.tsx

@@ -65,7 +65,9 @@ const OrganizationOverview = () => {
               <ExetendedStatisticsCard
                 stat={SuperAdminOverviewExtendedStatisticsMapping.activity({
                   organizationCreatedOn: new Date(data.organizationCreatedOn),
-                  organizationSyncedOn: new Date(data.organizationSyncedOn),
+                  organizationSyncedOn: data.organizationSyncedOn
+                    ? new Date(data.organizationSyncedOn)
+                    : null,
                 })}
               />
             </div>

frontend/src/pages/organization/interfaces/OrganizationStatistics.interface.ts

@@ -9,7 +9,7 @@ export interface IAllOrganizationsStatistics {
 
 export interface IOrganizationStatistics {
   organizationCreatedOn: Date;
-  organizationSyncedOn: Date;
+  organizationSyncedOn: Date | null;
   numberOfInstalledApps: number;
   numberOfUsers: number;
   hubStatistics: IGeneralONGHubStatistics;

frontend/src/pages/organization/table-headers/OrganizationsTable.headers.tsx

@@ -65,7 +65,8 @@ export const OrganizationsTableHeaders: TableColumn<IOrganizationView>[] = [
     name: <DataTableNameHeader text={translations.updated_on} />,
     sortable: true,
     minWidth: '12rem',
-    selector: (row: IOrganizationView) => formatDate(row?.updatedOn as string),
+    selector: (row: IOrganizationView) =>
+      row?.updatedOn ? formatDate(row?.updatedOn as string) : '-',
   },
   {
     id: 'completionStatus',