improvements for periods and indicator report

EyeSeeTea · Nov 13, 2024 · f27173f · f27173f
1 parent 80060ef
commit f27173f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 44 deletions.
diff --git a/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx b/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
@@ -1,15 +1,14 @@
 import React from "react";
-import { Id } from "../../../domain/entities/Ref";
 import { StepProps } from "../../../pages/project-wizard/ProjectWizard";
 import { Filter } from "../data-elements/DataElementsFilters";
-import DataElementsStep from "../data-elements/DataElementsStep";
+import DataElementsStep, { DataElementsStepProps } from "../data-elements/DataElementsStep";
 
 const initialFilters: Filter = { peopleOrBenefit: "people" };
 
 const UniqueIndicatorsStep: React.FC<StepProps> = props => {
     const { project } = props;
-    const getSelection = React.useCallback(
-        (sectorId: Id, dataElementIds: Id[]) => {
+    const getSelection = React.useCallback<DataElementsStepProps["onSelect"]>(
+        (sectorId, dataElementIds) => {
             return project.updateUniqueBeneficiariesSelection(sectorId, dataElementIds);
         },
         [project]

diff --git a/src/data/repositories/IndicatorReportD2Repository.ts b/src/data/repositories/IndicatorReportD2Repository.ts
@@ -48,10 +48,8 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
     ) {
         const currentDate = new Date().toISOString();
         return reports.map((report): D2Response => {
-            const existingRecord = existingReports?.find(
-                item =>
-                    item.startDate === report.period.startDateMonth &&
-                    item.endDate === report.period.endDateMonth
+            const existingRecord = existingReports?.find(item =>
+                report.period.equalMonths(item.startDate, item.endDate)
             );
 
             return {
@@ -86,10 +84,8 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
         const groupedPeriods = UniqueBeneficiariesPeriod.uniquePeriodsByDates(periods);
 
         return responses.map(response => {
-            const currentPeriod = groupedPeriods.find(
-                period =>
-                    period.startDateMonth === response.startDate &&
-                    period.endDateMonth === response.endDate
+            const currentPeriod = groupedPeriods.find(period =>
+                period.equalMonths(response.startDate, response.endDate)
             );
             if (!currentPeriod)
                 throw Error(`Period ${response.startDate}-${response.endDate} not found`);

diff --git a/src/domain/entities/IndicatorCalculation.ts b/src/domain/entities/IndicatorCalculation.ts
@@ -115,12 +115,6 @@ export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
     }
 
     static calculateTotalValue(editable: Maybe<number>, returning: Maybe<number>): number {
-        if (!editable) {
-            return returning || 0;
-        } else if (!returning) {
-            return editable;
-        } else {
-            return editable + returning;
-        }
+        return (editable ?? 0) + (returning ?? 0);
     }
 }
diff --git a/src/domain/entities/UniqueBeneficiariesPeriod.ts b/src/domain/entities/UniqueBeneficiariesPeriod.ts
@@ -156,4 +156,8 @@ export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriods
             .uniqBy(period => period.id)
             .value();
     }
+
+    public equalMonths(startDateMonth: number, endDateMonth: number): boolean {
+        return this.startDateMonth === startDateMonth && this.endDateMonth === endDateMonth;
+    }
 }
diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -59,8 +59,7 @@ export class GetProjectsByCountryUseCase {
         return uniquePeriods.map((period): IndicatorReport => {
             const existingData = existingReports.find(
                 report =>
-                    report.period.startDateMonth === period.startDateMonth &&
-                    report.period.endDateMonth === period.endDateMonth &&
+                    report.period.equalMonths(period.startDateMonth, period.endDateMonth) &&
                     report.countryId === countryId
             );
 
@@ -90,19 +89,15 @@ export class GetProjectsByCountryUseCase {
                     return undefined;
 
                 const isCustomPeriod = period.type === "CUSTOM";
-                const periodExist = settingsProject?.periods.find(
-                    item =>
-                        item.startDateMonth === period.startDateMonth &&
-                        item.endDateMonth === period.endDateMonth
+                const periodExist = settingsProject?.periods.find(item =>
+                    period.equalMonths(item.startDateMonth, item.endDateMonth)
                 );
 
                 const notIndicatorsAvailable = isCustomPeriod && !periodExist;
 
                 const indicatorsCalculation = settingsProject?.indicatorsValidation
-                    .find(
-                        item =>
-                            item.period.startDateMonth === period.startDateMonth &&
-                            item.period.endDateMonth === period.endDateMonth
+                    .find(item =>
+                        period.equalMonths(item.period.startDateMonth, item.period.endDateMonth)
                     )
                     ?.indicatorsCalculation.map((indicator): ProjectIndicatorRow => {
                         return {

diff --git a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
@@ -14,25 +14,19 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
 
         if (this.isAnnualOrSemiAnnual(options.period)) {
             throw new Error(i18n.t("Period is equal to the predefined annual/semi-annual period"));
-        }
-
-        if (!isValid) {
+        } else if (!isValid) {
             throw new Error(errorMessage);
-        }
-
-        if (isPeriodProtected) {
+        } else if (isPeriodProtected) {
             throw new Error(i18n.t("Cannot save a protected period"));
+        } else {
+            return this.saveSettings(settings, periodExist, options);
         }
-
-        return this.saveSettings(settings, periodExist, options);
     }
 
     private isAnnualOrSemiAnnual(period: UniqueBeneficiariesPeriod): boolean {
         const defaultPeriods = UniqueBeneficiariesPeriod.defaultPeriods();
-        return defaultPeriods.some(
-            defaultPeriod =>
-                defaultPeriod.startDateMonth === period.startDateMonth &&
-                defaultPeriod.endDateMonth === period.endDateMonth
+        return defaultPeriods.some(defaultPeriod =>
+            defaultPeriod.equalMonths(period.startDateMonth, period.endDateMonth)
         );
     }
 

diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -169,9 +169,8 @@ export const CountryIndicatorReport = React.memo(() => {
 
 CountryIndicatorReport.displayName = "CountryIndicatorReport";
 
-function getAllPeriods(settings: IndicatorReport[]): UniqueBeneficiariesPeriod[] {
-    const allPeriods = settings.flatMap(setting => setting.period);
-    return allPeriods;
+function getAllPeriods(indicatorsReports: IndicatorReport[]): UniqueBeneficiariesPeriod[] {
+    return indicatorsReports.flatMap(setting => setting.period);
 }
 
 function mapItemsToDropdown(periods: UniqueBeneficiariesPeriod[]) {