Release 1.3.0

.github/workflows/main.yml

@@ -1,47 +1,12 @@
-name: Application testing
-on:
-    push:
-    workflow_dispatch:
-jobs:
-    unit-tests:
-        name: Unit tests
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v2
-
-            - name: Install apt libraries
-              run: sudo apt install gettext -y
-
-            - name: Setup Node
-              uses: actions/setup-node@v3
-              with:
-                  node-version: "18"
-
-            - name: Install yarn
-              run: npm install -g yarn
-
-            - name: Get yarn cache directory path
-              id: yarn-cache-dir-path
-              run: echo "::set-output name=dir::$(yarn cache dir)"
+name: "Shared Master Workflow"
 
-            - name: Cache yarn dependencies
-              uses: actions/cache@v2
-              id: yarn-cache
-              with:
-                  path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-yarn-
-
-            - name: Install dependencies
-              run: yarn install --frozen-lockfile --silent
-
-            - name: Install translations
-              run: yarn localize
-
-            - name: Run jest tests
-              run: yarn test
+on:
+  push:
+    branches: ["master", "development"]
+  pull_request:
+    branches: [ "master", "development" ]
+  workflow_dispatch:
 
-            - name: Build typescript
-              run: npx tsc
+jobs:
+  master-workflow:
+    uses: EyeSeeTea/github-workflows/.github/workflows/master.yml@master

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-11-04T15:12:23.322Z\n"
-"PO-Revision-Date: 2024-11-04T15:12:23.322Z\n"
+"POT-Creation-Date: 2025-08-05T05:01:40.620Z\n"
+"PO-Revision-Date: 2025-08-05T05:01:40.620Z\n"
 
 msgid "ID"
 msgstr ""
@@ -68,6 +68,15 @@ msgstr ""
 msgid "This analysis is not available for this module"
 msgstr ""
 
+msgid "Add Issue"
+msgstr ""
+
+msgid "Periods"
+msgstr ""
+
+msgid "Category Options"
+msgstr ""
+
 msgid "Open analysis"
 msgstr ""
 
@@ -136,9 +145,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-msgid "Periods"
-msgstr ""
-
 msgid "Step"
 msgstr ""
 
@@ -226,6 +232,15 @@ msgstr ""
 msgid "Validation Rule Group"
 msgstr ""
 
+msgid "Adding issues..."
+msgstr ""
+
+msgid "New Issue"
+msgstr ""
+
+msgid "No Issues Found"
+msgstr ""
+
 msgid "Run"
 msgstr ""
 

i18n/es.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-11-04T15:12:23.322Z\n"
+"POT-Creation-Date: 2025-08-05T05:01:40.620Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,6 +68,15 @@ msgstr ""
 msgid "This analysis is not available for this module"
 msgstr ""
 
+msgid "Add Issue"
+msgstr ""
+
+msgid "Periods"
+msgstr ""
+
+msgid "Category Options"
+msgstr ""
+
 msgid "Open analysis"
 msgstr ""
 
@@ -136,9 +145,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-msgid "Periods"
-msgstr ""
-
 msgid "Step"
 msgstr ""
 
@@ -226,6 +232,15 @@ msgstr ""
 msgid "Validation Rule Group"
 msgstr ""
 
+msgid "Adding issues..."
+msgstr ""
+
+msgid "New Issue"
+msgstr ""
+
+msgid "No Issues Found"
+msgstr ""
+
 msgid "Run"
 msgstr ""
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "data-quality",
     "description": "Data Quality",
-    "version": "1.2.3",
+    "version": "1.3.0",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -18,7 +18,7 @@
         "@dhis2/ui": "6.12.0",
         "@eyeseetea/d2-api": "1.14.0",
         "@eyeseetea/d2-logger": "1.2.0-beta.1",
-        "@eyeseetea/d2-ui-components": "2.9.0-beta.2",
+        "@eyeseetea/d2-ui-components": "2.10.1",
         "@eyeseetea/feedback-component": "0.0.3",
         "@material-ui/core": "4.12.4",
         "@material-ui/icons": "4.11.3",

src/CompositionRoot.ts

@@ -66,6 +66,7 @@ import { ExportIssuesUseCase } from "$/domain/usecases/ExportIssuesUseCase";
 import { IssueExportRepository } from "$/domain/repositories/IssueExportRepository";
 import { IssueSpreadSheetRepository } from "./data/repositories/IssueSpreadSheetRepository";
 import { IssueSpreadSheetTestRepository } from "./data/repositories/IssueSpreadSheetTestRepository";
+import { CreateIssueUseCase } from "$/domain/usecases/CreateIssueUseCase";
 
 export type CompositionRoot = ReturnType<typeof getCompositionRoot>;
 
@@ -159,6 +160,10 @@ function getCompositionRoot(repositories: Repositories, metadata: MetadataItem)
                 repositories.issueRepository,
                 repositories.issueExportRepository
             ),
+            create: new CreateIssueUseCase(
+                repositories.qualityAnalysisRepository,
+                repositories.issueRepository
+            ),
         },
         settings: { get: new GetSettingsUseCase(repositories.settingsRepository) },
         summary: {

src/data/repositories/IssueD2Repository.ts

@@ -205,7 +205,7 @@ export class IssueD2Repository implements IssueRepository {
                         },
                         {
                             id: this.metadata.dataElements.period.id,
-                            value: issue.period,
+                            value: issue.period || "",
                         },
                         {
                             id: this.metadata.dataElements.categoryOption.id,

src/data/repositories/QualityAnalysisD2Repository.ts

@@ -64,7 +64,7 @@ export class QualityAnalysisD2Repository implements QualityAnalysisRepository {
                 // is deprecated
                 // @ts-ignore
                 trackedEntities: options.filters.ids ? options.filters.ids.join(";") : undefined,
-                attribute: this.buildFilters(options.filters)?.join(",") || undefined,
+                filter: this.buildFilters(options.filters)?.join(",") || undefined,
                 // @ts-ignore
                 order: this.buildOrder(options.sorting) || undefined,
                 totalPages: true,

src/domain/entities/DismissedAnalysis.ts

@@ -8,7 +8,7 @@ export type DismissedAnalysisAttrs = {
 };
 
 export class DismissedAnalysis extends Struct<DismissedAnalysisAttrs>() {
-    mergeDuplicates(): QualityAnalysisIssue[] {
+    inheritDismissedDuplicates(): QualityAnalysisIssue[] {
         const dismissedIssues = this.existingIssues.filter(issue => issue.status?.code === "4");
         const issues = _(this.newIssues)
             .map(issue => {

src/domain/entities/QualityAnalysisIssue.ts

@@ -11,7 +11,7 @@ export interface QualityAnalysisIssueAttrs {
     id: Id;
     number: IssueNumber;
     azureUrl: string;
-    period: IssuePeriod;
+    period: Maybe<IssuePeriod>;
     country: Maybe<Country>;
     dataElement: Maybe<NamedRef>;
     categoryOption: Maybe<NamedRef>;

src/domain/usecases/CreateIssueUseCase.ts

@@ -0,0 +1,109 @@
+import { FutureData } from "$/data/api-futures";
+import { IssueRepository } from "$/domain/repositories/IssueRepository";
+import { UCIssue } from "$/domain/usecases/common/UCIssue";
+import { QualityAnalysisIssue } from "$/domain/entities/QualityAnalysisIssue";
+import { Id, Period } from "$/domain/entities/Ref";
+import { Future } from "$/domain/entities/generic/Future";
+import { UCAnalysis } from "$/domain/usecases/common/UCAnalysis";
+import { QualityAnalysisRepository } from "$/domain/repositories/QualityAnalysisRepository";
+import { QualityAnalysis } from "$/domain/entities/QualityAnalysis";
+import { Maybe } from "$/utils/ts-utils";
+
+export type IssueTemplate = {
+    categoryOptionComboId: Maybe<Id>;
+    countryId: Maybe<Id>;
+    dataElementId: Maybe<Id>;
+    description: string;
+    period: Maybe<Period>;
+};
+
+export class CreateIssueUseCase {
+    private issueUseCase: UCIssue;
+    private analysisUseCase: UCAnalysis;
+
+    constructor(
+        private analysisRepository: QualityAnalysisRepository,
+        private issueRepository: IssueRepository
+    ) {
+        this.issueUseCase = new UCIssue(this.issueRepository);
+        this.analysisUseCase = new UCAnalysis(this.analysisRepository);
+    }
+
+    execute(options: CreateIssueUseCaseOptions): FutureData<Maybe<QualityAnalysis>> {
+        const { qualityAnalysisId, sectionId, issues } = options;
+
+        if (issues.length <= 0) return Future.success(undefined);
+
+        return this.fetchAnalysisAndTotalIssues(qualityAnalysisId, sectionId).flatMap(
+            analysisAndTotalIssues => {
+                const issuesToCreate = this.buildIssues({
+                    issues,
+                    sectionId,
+                    ...analysisAndTotalIssues,
+                });
+                const analysisUpdate = this.analysisUseCase.updateAnalysis(
+                    analysisAndTotalIssues.analysis,
+                    sectionId,
+                    issues.length + analysisAndTotalIssues.totalIssues
+                );
+                return this.saveIssuesAndUpdateAnalysis(issuesToCreate, analysisUpdate);
+            }
+        );
+    }
+
+    private fetchAnalysisAndTotalIssues(
+        qualityAnalysisId: Id,
+        sectionId: Id
+    ): FutureData<AnalysisAndTotalIssues> {
+        return this.analysisUseCase
+            .getById(qualityAnalysisId)
+            .flatMap(analysis =>
+                this.issueUseCase
+                    .getTotalIssuesBySection(analysis, sectionId)
+                    .map(totalIssues => ({ analysis, totalIssues }))
+            );
+    }
+
+    private buildIssues(
+        params: Omit<CreateIssueUseCaseOptions, "qualityAnalysisId"> & AnalysisAndTotalIssues
+    ): QualityAnalysisIssue[] {
+        const { issues, sectionId, analysis, totalIssues } = params;
+
+        const sectionNumber = this.issueUseCase.getSectionNumber(analysis.sections, sectionId);
+        const prefix = `${analysis.sequential.value}-${sectionNumber}`;
+
+        return issues.map((issue, index) => {
+            const currentNumber = totalIssues + 1 + index;
+            const issueNumber = this.issueUseCase.generateIssueNumber(currentNumber, prefix);
+            return this.issueUseCase.buildDefaultIssue(
+                {
+                    categoryOptionComboId: issue.categoryOptionComboId,
+                    countryId: issue.countryId,
+                    dataElementId: issue.dataElementId,
+                    period: issue.period,
+                    description: issue.description,
+                    correlative: String(currentNumber),
+                    issueNumber: issueNumber,
+                },
+                sectionId
+            );
+        });
+    }
+
+    private saveIssuesAndUpdateAnalysis(
+        issues: QualityAnalysisIssue[],
+        analysis: QualityAnalysis
+    ): FutureData<QualityAnalysis> {
+        return this.issueUseCase
+            .save(issues, analysis.id)
+            .flatMap(() => this.analysisRepository.save([analysis]).map(() => analysis));
+    }
+}
+
+type CreateIssueUseCaseOptions = {
+    issues: IssueTemplate[];
+    qualityAnalysisId: Id;
+    sectionId: Id;
+};
+
+type AnalysisAndTotalIssues = { analysis: QualityAnalysis; totalIssues: number };

src/domain/usecases/GetModulesUseCase.ts

@@ -1,11 +1,12 @@
 import { FutureData } from "$/data/api-futures";
 import { Module } from "$/domain/entities/Module";
 import { ModuleRepository } from "$/domain/repositories/ModuleRepository";
+import { Id } from "$/domain/entities/Ref";
 
 export class GetModulesUseCase {
     constructor(private moduleRepository: ModuleRepository) {}
 
-    execute(): FutureData<Module[]> {
-        return this.moduleRepository.get();
+    execute(ids?: Id[]): FutureData<Module[]> {
+        return ids?.length ? this.moduleRepository.getByIds(ids) : this.moduleRepository.get();
     }
 }