Merge pull request #299 from EyeSeeTea/development

Release 1.6.18
EyeSeeTea · Aug 29, 2024 · 0988c82 · 0988c82
2 parents cd6ec3a + 4bba912
commit 0988c82
Show file tree

Hide file tree

Showing 29 changed files with 313 additions and 84 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-07-26T10:31:32.732Z\n"
-"PO-Revision-Date: 2024-07-26T10:31:32.732Z\n"
+"POT-Creation-Date: 2024-08-07T18:05:19.338Z\n"
+"PO-Revision-Date: 2024-08-07T18:05:19.338Z\n"
 
 msgid "Template {{id}} not loaded"
 msgstr ""
@@ -172,6 +172,9 @@ msgstr ""
 msgid "You can add up to 6 datasets to this submission with different BATCH IDS."
 msgstr ""
 
+msgid "Validated Uploads, Review to complete"
+msgstr ""
+
 msgid "Uploads with errors, or discarded"
 msgstr ""
 
@@ -359,9 +362,18 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
+msgid "Complete"
+msgstr ""
+
+msgid "Failed to set completed status"
+msgstr ""
+
 msgid "Deleting Files"
 msgstr ""
 
+msgid "Loading"
+msgstr ""
+
 msgid "This might take several minutes, do not refresh the page or press back."
 msgstr ""
 
@@ -608,9 +620,6 @@ msgstr ""
 msgid "Choose a Dataset"
 msgstr ""
 
-msgid "Loading"
-msgstr ""
-
 msgid "Choose file type"
 msgstr ""
 

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-07-26T10:31:32.732Z\n"
+"POT-Creation-Date: 2024-08-07T18:05:19.338Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,6 +173,9 @@ msgid ""
 "You can add up to 6 datasets to this submission with different BATCH IDS."
 msgstr ""
 
+msgid "Validated Uploads, Review to complete"
+msgstr ""
+
 msgid "Uploads with errors, or discarded"
 msgstr ""
 
@@ -361,9 +364,18 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
+msgid "Complete"
+msgstr ""
+
+msgid "Failed to set completed status"
+msgstr ""
+
 msgid "Deleting Files"
 msgstr ""
 
+msgid "Loading"
+msgstr ""
+
 msgid "This might take several minutes, do not refresh the page or press back."
 msgstr ""
 
@@ -610,9 +622,6 @@ msgstr ""
 msgid "Choose a Dataset"
 msgstr ""
 
-msgid "Loading"
-msgstr ""
-
 msgid "Choose file type"
 msgstr ""
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "glass",
     "description": "DHIS2 Glass App",
-    "version": "1.6.16",
+    "version": "1.6.18",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",

diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
@@ -91,6 +91,8 @@ import { GetMultipleDashboardUseCase } from "./domain/usecases/GetMultipleDashbo
 import { DownloadAllDataButtonData } from "./domain/usecases/DownloadAllDataButtonData";
 import { DownloadEmptyTemplateUseCase } from "./domain/usecases/DownloadEmptyTemplateUseCase";
 import { DownloadPopulatedTemplateUseCase } from "./domain/usecases/DownloadPopulatedTemplateUseCase";
+import { CountryDefaultRepository } from "./data/repositories/CountryDefaultRepository";
+import { GetAllCountriesUseCase } from "./domain/usecases/GetAllCountriesUseCase";
 
 export function getCompositionRoot(instance: Instance) {
     const api = getD2APiFromInstance(instance);
@@ -127,6 +129,7 @@ export function getCompositionRoot(instance: Instance) {
     const glassAtcRepository = new GlassATCDefaultRepository(dataStoreClient);
     const atcRepository = new GlassATCDefaultRepository(dataStoreClient);
     const eventVisualizationRepository = new EventVisualizationAnalyticsDefaultRepository(api);
+    const countryRepository = new CountryDefaultRepository(api);
 
     return {
         instance: getExecute({
@@ -243,6 +246,7 @@ export function getCompositionRoot(instance: Instance) {
         }),
         countries: getExecute({
             getInformation: new GetCountryInformationUseCase(countryInformationRepository),
+            getAll: new GetAllCountriesUseCase(countryRepository),
         }),
         glassDashboard: getExecute({
             getDashboard: new GetDashboardUseCase(glassModuleRepository),

diff --git a/src/data/repositories/CountryDefaultRepository.ts b/src/data/repositories/CountryDefaultRepository.ts
@@ -0,0 +1,44 @@
+import { D2Api, MetadataPick } from "@eyeseetea/d2-api/2.34";
+import { FutureData } from "../../domain/entities/Future";
+import { apiToFuture } from "../../utils/futures";
+import { CountryRepository } from "../../domain/repositories/CountryRepository";
+import { Country } from "../../domain/entities/Country";
+
+export class CountryDefaultRepository implements CountryRepository {
+    constructor(private api: D2Api) {}
+
+    public getAll(): FutureData<Country[]> {
+        return apiToFuture(
+            this.api.models.organisationUnits.get({
+                fields: organisationUnitsFields,
+                paging: false,
+                level: 3,
+            })
+        ).map(response => {
+            return this.buildOrgUnits(response.objects);
+        });
+    }
+
+    private buildOrgUnits(d2OrgUnits: D2OrgUnit[]): Country[] {
+        return d2OrgUnits.map(d2OrgUnit => ({
+            id: d2OrgUnit.id,
+            name: d2OrgUnit.name,
+            shortName: d2OrgUnit.shortName,
+            code: d2OrgUnit.code,
+        }));
+    }
+}
+
+const organisationUnitsFields = {
+    id: true,
+    name: true,
+    shortName: true,
+    code: true,
+    description: { id: true, name: true },
+    geometry: true,
+    organisationUnitGroups: { id: true, name: true },
+} as const;
+
+type D2OrgUnit = MetadataPick<{
+    organisationUnits: { fields: typeof organisationUnitsFields };
+}>["organisationUnits"][number];
diff --git a/src/data/repositories/InstanceDefaultRepository.ts b/src/data/repositories/InstanceDefaultRepository.ts
@@ -85,6 +85,7 @@ export class InstanceDefaultRepository implements InstanceRepository {
                     moduleId: module.id,
                     moduleName: module.name,
                     populateCurrentYearInHistory: module.populateCurrentYearInHistory ? true : false,
+                    startPeriod: module.startPeriod,
                     readAccess: readAccess,
                     captureAccess: writeAccess,
                     usergroups: [...module.userGroups.captureAccess, ...module.userGroups.readAccess],

diff --git a/src/domain/entities/Country.ts b/src/domain/entities/Country.ts
@@ -0,0 +1,6 @@
+export type Country = {
+    id: string;
+    name: string;
+    shortName: string;
+    code: string;
+};
diff --git a/src/domain/entities/GlassModule.ts b/src/domain/entities/GlassModule.ts
@@ -43,6 +43,7 @@ export interface GlassModule {
         programStageId: string;
     }[];
     populateCurrentYearInHistory?: boolean;
+    startPeriod?: number;
     customDataColumns?: CustomDataColumns;
     lineLists?: LineListDetails[];
     chunkSizes?: ChunkSizes;

diff --git a/src/domain/entities/User.ts b/src/domain/entities/User.ts
@@ -22,6 +22,7 @@ export interface ModuleAccess {
     captureAccess: boolean;
     usergroups: UserGroup[];
     populateCurrentYearInHistory: boolean;
+    startPeriod?: number;
 }
 
 export interface UserAccessInfo {

diff --git a/src/domain/repositories/CountryRepository.ts b/src/domain/repositories/CountryRepository.ts
@@ -0,0 +1,6 @@
+import { Country } from "../entities/Country";
+import { FutureData } from "../entities/Future";
+
+export interface CountryRepository {
+    getAll(): FutureData<Country[]>;
+}
diff --git a/src/domain/usecases/GetAllCountriesUseCase.ts b/src/domain/usecases/GetAllCountriesUseCase.ts
@@ -0,0 +1,12 @@
+import { UseCase } from "../../CompositionRoot";
+import { Country } from "../entities/Country";
+import { FutureData } from "../entities/Future";
+import { CountryRepository } from "../repositories/CountryRepository";
+
+export class GetAllCountriesUseCase implements UseCase {
+    constructor(private countryRepository: CountryRepository) {}
+
+    public execute(): FutureData<Country[]> {
+        return this.countryRepository.getAll();
+    }
+}
diff --git a/src/domain/usecases/data-entry/ImportPrimaryFileUseCase.tsx b/src/domain/usecases/data-entry/ImportPrimaryFileUseCase.tsx
@@ -21,7 +21,7 @@ import { InstanceDefaultRepository } from "../../../data/repositories/InstanceDe
 import { GlassATCDefaultRepository } from "../../../data/repositories/GlassATCDefaultRepository";
 import { AMCProductDataRepository } from "../../repositories/data-entry/AMCProductDataRepository";
 import { AMCSubstanceDataRepository } from "../../repositories/data-entry/AMCSubstanceDataRepository";
-import { OrgUnitAccess } from "../../entities/User";
+import { Country } from "../../entities/Country";
 
 export class ImportPrimaryFileUseCase {
     constructor(
@@ -55,7 +55,7 @@ export class ImportPrimaryFileUseCase {
         countryCode: string,
         dryRun: boolean,
         eventListId: string | undefined,
-        orgUnitsWithAccess: OrgUnitAccess[],
+        allCountries: Country[],
         calculatedEventListFileId?: string
     ): FutureData<ImportSummary> {
         switch (moduleName) {
@@ -113,7 +113,7 @@ export class ImportPrimaryFileUseCase {
                         module.programs !== undefined ? module.programs.at(0) : undefined,
                         module.name,
                         module.customDataColumns ? module.customDataColumns : [],
-                        orgUnitsWithAccess
+                        allCountries
                     );
                 });
             }
@@ -140,7 +140,7 @@ export class ImportPrimaryFileUseCase {
                     orgUnitName,
                     moduleName,
                     period,
-                    orgUnitsWithAccess,
+                    allCountries,
                     calculatedEventListFileId
                 );
             }

diff --git a/src/domain/usecases/data-entry/amc/CustomValidationsAMCProductData.ts b/src/domain/usecases/data-entry/amc/CustomValidationsAMCProductData.ts
@@ -6,7 +6,7 @@ import { D2TrackerTrackedEntity } from "@eyeseetea/d2-api/api/trackerTrackedEnti
 import { GlassATCDefaultRepository } from "../../../../data/repositories/GlassATCDefaultRepository";
 import { GlassAtcVersionData, LAST_ATC_CODE_LEVEL, getAtcCodeByLevel } from "../../../entities/GlassAtcVersionData";
 import { AMCProductDataRepository } from "../../../repositories/data-entry/AMCProductDataRepository";
-import { OrgUnitAccess } from "../../../entities/User";
+import { Country } from "../../../entities/Country";
 
 const AMR_GLASS_AMC_TEA_ATC = "aK1JpD14imM";
 const AMR_GLASS_AMC_TEA_COMBINATION = "mG49egdYK3G";
@@ -34,7 +34,7 @@ export class CustomValidationsAMCProductData {
         orgUnitId: string,
         orgUnitName: string,
         period: string,
-        orgUnitsWithAccess: OrgUnitAccess[]
+        allCountries: Country[]
     ): FutureData<ValidationResult> {
         return this.atcRepository.getCurrentAtcVersion().flatMap(atcVersion => {
             return this.amcProductRepository
@@ -47,7 +47,7 @@ export class CustomValidationsAMCProductData {
                         orgUnitName,
                         period,
                         atcVersion,
-                        orgUnitsWithAccess
+                        allCountries
                     );
 
                     const dateErrors = this.checkSameEnrollmentDate(teis);
@@ -115,7 +115,7 @@ export class CustomValidationsAMCProductData {
         countryName: string,
         period: string,
         atcVersion: GlassAtcVersionData,
-        orgUnitsWithAccess: OrgUnitAccess[]
+        allCountries: Country[]
     ): ConsistencyError[] {
         const errors = _(
             teis.map(tei => {
@@ -256,9 +256,7 @@ export class CustomValidationsAMCProductData {
                     }
                 }
 
-                const productManufacturerCountry = orgUnitsWithAccess.find(
-                    orgUnit => orgUnit.orgUnitId === manufacturerCountryId
-                );
+                const productManufacturerCountry = allCountries.find(country => country.id === manufacturerCountryId);
 
                 if (manufacturerCountryId && !productManufacturerCountry) {
                     curErrors.push({

diff --git a/src/domain/usecases/data-entry/amc/ImportAMCProductLevelData.ts b/src/domain/usecases/data-entry/amc/ImportAMCProductLevelData.ts
@@ -25,8 +25,8 @@ import { CODE_PRODUCT_NOT_HAVE_ATC, COMB_CODE_PRODUCT_NOT_HAVE_ATC } from "../..
 import { AMCSubstanceDataRepository } from "../../../repositories/data-entry/AMCSubstanceDataRepository";
 import { downloadIdsAndDeleteTrackedEntities } from "../utils/downloadIdsAndDeleteTrackedEntities";
 import { getStringFromFile } from "../utils/fileToString";
-import { OrgUnitAccess } from "../../../entities/User";
 import { getTEAValueFromOrganisationUnitCountryEntry } from "../utils/getTEAValueFromOrganisationUnitCountryEntry";
+import { Country } from "../../../entities/Country";
 
 export const AMC_PRODUCT_REGISTER_PROGRAM_ID = "G6ChA5zMW9n";
 export const AMC_RAW_PRODUCT_CONSUMPTION_STAGE_ID = "GmElQHKXLIE";
@@ -57,7 +57,7 @@ export class ImportAMCProductLevelData {
         orgUnitName: string,
         moduleName: string,
         period: string,
-        orgUnitsWithAccess: OrgUnitAccess[],
+        allCountries: Country[],
         calculatedEventListFileId?: string
     ): FutureData<ImportSummary> {
         return this.excelRepository.loadTemplate(file, AMC_PRODUCT_REGISTER_PROGRAM_ID).flatMap(_templateId => {
@@ -82,15 +82,15 @@ export class ImportAMCProductLevelData {
                             orgUnitId,
                             orgUnitName,
                             period,
-                            orgUnitsWithAccess
+                            allCountries
                         ).flatMap(entities => {
                             return this.validateTEIsAndEvents(
                                 entities,
                                 orgUnitId,
                                 orgUnitName,
                                 period,
                                 AMC_PRODUCT_REGISTER_PROGRAM_ID,
-                                orgUnitsWithAccess
+                                allCountries
                             ).flatMap(validationResults => {
                                 if (validationResults.blockingErrors.length > 0) {
                                     const errorSummary: ImportSummary = {
@@ -169,7 +169,7 @@ export class ImportAMCProductLevelData {
         orgUnitId: Id,
         orgUnitName: string,
         period: string,
-        orgUnitsWithAccess: OrgUnitAccess[]
+        allCountries: Country[]
     ): FutureData<D2TrackerTrackedEntity[]> {
         return this.trackerRepository
             .getProgramMetadata(AMC_PRODUCT_REGISTER_PROGRAM_ID, AMC_RAW_PRODUCT_CONSUMPTION_STAGE_ID)
@@ -201,7 +201,7 @@ export class ImportAMCProductLevelData {
                             } else if (attr.valueType === "ORGANISATION_UNIT") {
                                 currentAttrVal = currentAttribute
                                     ? getTEAValueFromOrganisationUnitCountryEntry(
-                                          orgUnitsWithAccess,
+                                          allCountries,
                                           currentAttribute.value,
                                           true
                                       )
@@ -300,7 +300,7 @@ export class ImportAMCProductLevelData {
         orgUnitName: string,
         period: string,
         programId: string,
-        orgUnitsWithAccess: OrgUnitAccess[]
+        allCountries: Country[]
     ): FutureData<ValidationResult> {
         //1. Before running validations, add ids to tei, enrollement and event so thier relationships can be processed.
         const teisWithId = teis?.map((tei, teiIndex) => {
@@ -332,7 +332,7 @@ export class ImportAMCProductLevelData {
                 orgUnitId,
                 orgUnitName,
                 period,
-                orgUnitsWithAccess
+                allCountries
             ),
         }).flatMap(({ programRuleValidationResults, customRuleValidationsResults }) => {
             //4. After processing, remove ids to tei, enrollement and events so that they can be imported