AMP-30885: Configure Internal projects for Ecowas

devgateway · Nov 4, 2024 · fc5694e · fc5694e
1 parent 8ccade7
commit fc5694e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/dataimporter/DataImporter.java b/amp/WEB-INF/src/org/digijava/module/aim/action/dataimporter/DataImporter.java
@@ -253,8 +253,7 @@ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServlet
 
 
                     // Clean up
-                    importedFilesRecord.setImportedProjects(importedProjects);
-                    ImportedFileUtil.updateFileStatus(importedFilesRecord, ImportStatus.SUCCESS);
+                    ImportedFileUtil.updateFileStatus(importedFilesRecord, ImportStatus.SUCCESS, importedProjects);
                     Files.delete(tempFile.toPath());
                     logger.info("Cache map size: " + ConstantsMap.size());
                     ConstantsMap.clear();

diff --git a/...WEB-INF/src/org/digijava/module/aim/action/dataimporter/dbentity/ImportedFilesRecord.java b/...WEB-INF/src/org/digijava/module/aim/action/dataimporter/dbentity/ImportedFilesRecord.java
@@ -17,6 +17,9 @@ public Set<ImportedProject> getImportedProjects() {
 
     public void setImportedProjects(Set<ImportedProject> importedProjects) {
         this.importedProjects = importedProjects;
+        for (ImportedProject project : importedProjects) {
+            project.setImportedFilesRecord(this);
+        }
     }
 
     public Long getId() {

diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/dataimporter/dbentity/ImportedProject.hbm.xml b/amp/WEB-INF/src/org/digijava/module/aim/action/dataimporter/dbentity/ImportedProject.hbm.xml
@@ -10,7 +10,7 @@
                 <param name="sequence">IMPORTED_PROJECT_SEQ</param>
             </generator>
         </id>
-        <many-to-one name="importedFilesRecord" column="imported_file_record_id" class="org.digijava.module.aim.action.dataimporter.dbentity.ImportedFilesRecord" not-null="true"/>
+        <many-to-one name="importedFilesRecord" column="imported_file_record_id" class="org.digijava.module.aim.action.dataimporter.dbentity.ImportedFilesRecord"/>
 
         <property name="importResponse" column="import_response" type="java.lang.String" length="10000" />
         <property name="newProject" column="new_project" type="java.lang.Boolean" />

diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/dataimporter/util/ImportedFileUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/action/dataimporter/util/ImportedFileUtil.java
@@ -3,6 +3,7 @@
 import org.digijava.kernel.persistence.PersistenceManager;
 import org.digijava.module.aim.action.dataimporter.dbentity.ImportStatus;
 import org.digijava.module.aim.action.dataimporter.dbentity.ImportedFilesRecord;
+import org.digijava.module.aim.action.dataimporter.dbentity.ImportedProject;
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.slf4j.Logger;
@@ -14,6 +15,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
+import java.util.Set;
 
 public class ImportedFileUtil {
     private static final Logger logger = LoggerFactory.getLogger(ImportedFileUtil.class);
@@ -47,9 +49,11 @@ public static ImportedFilesRecord saveFile(File file, String filename) throws IO
         return importedFilesRecord;
     }
 
-    public static void updateFileStatus(ImportedFilesRecord importedFilesRecord, ImportStatus status) {
+    public static void updateFileStatus(ImportedFilesRecord importedFilesRecord, ImportStatus status, Set<ImportedProject> importedProjects) {
         logger.info("Updating file status to " + status);
         Session session = PersistenceManager.getRequestDBSession();
+        session.save(importedFilesRecord);
+        importedFilesRecord.setImportedProjects(importedProjects);
         importedFilesRecord.setImportStatus(status);
         session.saveOrUpdate(importedFilesRecord);
         session.flush();