Merge pull request #25 from devgateway/OCNANDI-33

OCNANDI-33 Weekly scheduld OCDS convertor no longer works
devgateway · Apr 2, 2024 · 1597e4a · 1597e4a
2 parents 60089ab + 1726b43
commit 1597e4a
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 19 deletions.
diff --git a/...nce-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/FlagsConstants.java b/...nce-mongodb/src/main/java/org/devgateway/ocds/persistence/mongo/flags/FlagsConstants.java
@@ -1,13 +1,13 @@
 package org.devgateway.ocds.persistence.mongo.flags;
 
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
+
 public final class FlagsConstants {
 
     public static final String I038_VALUE = "flags.i038.value";
@@ -28,7 +28,9 @@ public final class FlagsConstants {
 
     public static final List<String> FLAGS_LIST = Collections.unmodifiableList(
             Arrays.asList(new String[]{I038_VALUE, I007_VALUE, I019_VALUE, I182_VALUE, I045_VALUE,
-                    I077_VALUE, I180_VALUE, I002_VALUE, I085_VALUE, I171_VALUE, I184_VALUE, I016_VALUE, I083_VALUE}));
+                    I077_VALUE, I180_VALUE, I002_VALUE, I085_VALUE, I171_VALUE, I184_VALUE, I016_VALUE
+                    //,I083_VALUE this flag is not working properly and is disabled
+            }));
 
     public static final Map<String, String> FLAG_VALUES_BY_NAME = Collections.unmodifiableMap(
             FLAGS_LIST.stream().collect(toMap(value -> value.substring(6, 10), identity())));

diff --git a/...istence/src/main/java/org/devgateway/toolkit/persistence/dao/AbstractAuditableEntity.java b/...istence/src/main/java/org/devgateway/toolkit/persistence/dao/AbstractAuditableEntity.java
@@ -33,12 +33,14 @@ public abstract class AbstractAuditableEntity extends GenericPersistable
     private static final long serialVersionUID = 4031407178647451427L;
 
     @Audited
+    @org.springframework.data.annotation.Transient
     protected String createdBy;
 
     @Audited
     protected ZonedDateTime createdDate;
 
     @Audited
+    @org.springframework.data.annotation.Transient
     protected String lastModifiedBy;
 
     @Audited

diff --git a/ui/src/oce/api/Api.js b/ui/src/oce/api/Api.js
@@ -46,7 +46,7 @@ export const getTenders = async (params) => {
     return {
       id: `${datum._id}-${(tender || {})._id}`,
       department: datum.department.label,
-      fiscalYear: datum.fiscalYear.name,
+      fiscalYear: datum.fiscalYear.label,
       tender: tender !== undefined ? tender : undefined,
       project: project !== undefined ? project : undefined,
     };

diff --git a/ui/src/oce/makueni/procurementPlan/single/procurementPlan.jsx b/ui/src/oce/makueni/procurementPlan/single/procurementPlan.jsx
@@ -21,7 +21,7 @@ const ProcurementPlan = (props) => {
   const getFeedbackSubject = () => {
     let metadata;
     if (data !== undefined) {
-      metadata = ` - ${data.department.label} - ${data.fiscalYear.name}`;
+      metadata = ` - ${data.department.label} - ${data.fiscalYear.label}`;
     }
     return escape(t('procurementPlan:feedbackSubject') + metadata);
   };
@@ -66,7 +66,7 @@ const ProcurementPlan = (props) => {
               {isFeatureVisible('publicView.procurementPlan.department')
             && <Item label={t('procurementPlan:department')} value={data.department.label} col={8} />}
               {isFeatureVisible('publicView.procurementPlan.fiscalYear')
-            && <Item label={t('procurementPlan:fiscalYear')} value={data.fiscalYear.name} col={4} />}
+            && <Item label={t('procurementPlan:fiscalYear')} value={data.fiscalYear.label} col={4} />}
             </div>
 
             {

diff --git a/ui/src/oce/makueni/tenders/single/Award.jsx b/ui/src/oce/makueni/tenders/single/Award.jsx
@@ -18,7 +18,7 @@ const Award = (props) => {
     if (department !== undefined) {
       metadata = ` - ${tenderTitle
       } - ${department.label
-      } - ${fiscalYear.name}`;
+      } - ${fiscalYear.label}`;
     }
     return escape(t('award:subject') + metadata);
   };

diff --git a/ui/src/oce/makueni/tenders/single/Contract.jsx b/ui/src/oce/makueni/tenders/single/Contract.jsx
@@ -19,7 +19,7 @@ const Contract = (props) => {
     if (department !== undefined) {
       metadata = ` - ${tenderTitle
       } - ${department.label
-      } - ${fiscalYear.name}`;
+      } - ${fiscalYear.label}`;
     }
     return escape(t('contract:subject') + metadata);
   };

diff --git a/ui/src/oce/makueni/tenders/single/ImplReport.jsx b/ui/src/oce/makueni/tenders/single/ImplReport.jsx
@@ -22,7 +22,7 @@ const ImplReport = (props) => {
     if (department !== undefined) {
       metadata = ` - ${tenderTitle
       } - ${department.label
-      } - ${fiscalYear.name}`;
+      } - ${fiscalYear.label}`;
     }
     return escape(reportName + metadata);
   };
@@ -43,7 +43,7 @@ const ImplReport = (props) => {
                   && <Item label={t('report:awardee:label')} value={i.contract.awardee.label} col={3} />}
 
                   {isFeatureVisible(`${fmPrefix}.fiscalYear`)
-                  && <Item label={t('report:fiscalYear')} value={fiscalYear.name} col={3} />}
+                  && <Item label={t('report:fiscalYear')} value={fiscalYear.label} col={3} />}
 
                   {isFeatureVisible(`${fmPrefix}.approvedDate`)
                   && <Item label={t('report:approvedDate')} value={formatDate(i.approvedDate)} col={3} />}

diff --git a/ui/src/oce/makueni/tenders/single/Notification.jsx b/ui/src/oce/makueni/tenders/single/Notification.jsx
@@ -18,7 +18,7 @@ const Notification = (props) => {
     if (department !== undefined) {
       metadata = ` - ${tenderTitle
       } - ${department.label
-      } - ${fiscalYear.name}`;
+      } - ${fiscalYear.label}`;
     }
     return escape(t('notification:subject') + metadata);
   };

diff --git a/ui/src/oce/makueni/tenders/single/ProfessionalOpinion.jsx b/ui/src/oce/makueni/tenders/single/ProfessionalOpinion.jsx
@@ -19,7 +19,7 @@ const ProfessionalOpinion = (props) => {
     if (department !== undefined) {
       metadata = ` - ${tenderTitle
       } - ${department.label
-      } - ${fiscalYear.name}`;
+      } - ${fiscalYear.label}`;
     }
     return escape(t('professionalOpinion:label') + metadata);
   };

diff --git a/ui/src/oce/makueni/tenders/single/Project.jsx b/ui/src/oce/makueni/tenders/single/Project.jsx
@@ -30,7 +30,7 @@ const Project = (props) => {
     if (data !== undefined) {
       metadata = ` - ${data.projects.projectTitle
       } - ${data.department.label
-      } - ${data.fiscalYear.name}`;
+      } - ${data.fiscalYear.label}`;
     }
     return escape(t('project:feedbackSubject') + metadata);
   };

diff --git a/ui/src/oce/makueni/tenders/single/PurchaseReq.jsx b/ui/src/oce/makueni/tenders/single/PurchaseReq.jsx
@@ -20,7 +20,7 @@ const PurchaseReq = (props) => {
     if (data !== undefined) {
       metadata = ` - ${data.title
       } - ${department.label
-      } - ${fiscalYear.name}`;
+      } - ${fiscalYear.label}`;
     }
     return escape(t('purchaseReq:label') + metadata);
   };

diff --git a/ui/src/oce/makueni/tenders/single/Tender.jsx b/ui/src/oce/makueni/tenders/single/Tender.jsx
@@ -27,7 +27,7 @@ const Tender = (props) => {
 
       metadata = ` - ${tender.tenderTitle
       } - ${department.label
-      } - ${fiscalYear.name}`;
+      } - ${fiscalYear.label}`;
     }
     return escape(t('tender:label') + metadata);
   };

diff --git a/ui/src/oce/makueni/tenders/single/TenderQuotation.jsx b/ui/src/oce/makueni/tenders/single/TenderQuotation.jsx
@@ -19,7 +19,7 @@ const TenderQuotation = (props) => {
     if (department !== undefined) {
       metadata = ` - ${tenderTitle
       } - ${department.label
-      } - ${fiscalYear.name}`;
+      } - ${fiscalYear.label}`;
     }
     return escape(t('tenderQuotation:subject') + metadata);
   };

diff --git a/web/src/main/java/org/devgateway/ocds/web/spring/ReleaseFlaggingService.java b/web/src/main/java/org/devgateway/ocds/web/spring/ReleaseFlaggingService.java
@@ -182,8 +182,8 @@ protected void setProcessors() {
                 releaseFlagI184Processor,
                 releaseFlagI016Processor,
                 releaseFlagI045Processor,
-                releaseFlagI182Processor,
-                releaseFlagI083Processor
+                releaseFlagI182Processor
+                //releaseFlagI083Processor this flag is not working properly and is disabled
         ));
 //        processAndSaveFlagsForAllReleases(this::logMessage);
     }