Fix some new importation bugs and set a new version to deploy it

acheype · Feb 25, 2018 · bb6e6df · bb6e6df
1 parent 01917de
commit bb6e6df
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -75,15 +75,23 @@ Then you will need to connect you at the web application by a different port : h
 
 ## From development to production
 
-   mvn -Pprod clean package
-   cp target/malariaplantdb-1.0.war docker/test/malariaplantdb-web/malariaplantdb.war
-   cd docker/test
-   docker-compose build
-
-   mkdir /data
-   mkdir /data/postgres -R
-   mkdir /data/es-data
-   sudo chown 999:999 /data/es-data/
+    mvn -Pprod clean package
+    cp target/malariaplantdb-1.0.war docker/test/malariaplantdb-web/malariaplantdb.war
+    cd docker/test
+    docker-compose build
+    docker tag acheype/malariaplantdb-web:latest acheype/malariaplantdb-web:0.9.2
+    docker push acheype/malariaplantdb-web:latest
+    docker push acheype/malariaplantdb-web:0.9.2
+
+    git pull
+    cd /docker/prod
+    docker-compose down
+    docker-compose up
+
+    mkdir /data
+    mkdir /data/postgres -R
+    mkdir /data/es-data
+    sudo chown 999:999 /data/es-data/
      
 [JHipster]: https://jhipster.gitub.io/
 [Node.js]: https://nodejs.org/

diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     springboot-app:
         container_name: malariaplantdb-web
-        image: acheype/malariaplantdb-web:0.9.2
+        image: acheype/malariaplantdb-web:0.9.3
         ports:
             - "80:80"
         links:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "malariaplantdb",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Database of medicinal plants against malaria",
   "private": true,
   "dependencies": {

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>nc.ird.malariaplantdb</groupId>
     <artifactId>malariaplantdb</artifactId>
-    <version>0.9.2</version>
+    <version>0.9.3</version>
     <packaging>war</packaging>
     <name>malariaplantdb</name>
 

diff --git a/src/main/java/nc/ird/malariaplantdb/service/xls/fillers/XlsEntityRefFiller.java b/src/main/java/nc/ird/malariaplantdb/service/xls/fillers/XlsEntityRefFiller.java
@@ -42,7 +42,12 @@ public Object findEntityRef(PropVals propValsSearched) throws IllegalAccessExcep
             PropVals refPropVals = new PropVals();
 
             for (String refProp : getXlsRefEntityProperties()){
-                Object value = PropertyUtils.getProperty(curRefEntity, refProp);
+                Object value;
+                try {
+                   value = PropertyUtils.getNestedProperty(curRefEntity, refProp);
+                } catch (NestedNullException e){
+                    value = null;
+                }
                 refPropVals.put(refProp, value);
             }
 

diff --git a/src/main/java/nc/ird/malariaplantdb/web/rest/ImportResource.java b/src/main/java/nc/ird/malariaplantdb/web/rest/ImportResource.java
@@ -139,7 +139,7 @@ private void checkPublicationWithSeveralEthno(ExcelETL etl){
         List<Ethnology> ethnoList = etl.getEntitiesMap().getList(Ethnology.class);
         for (Ethnology ethnology : ethnoList) {
 
-            if (ethnoList.stream().filter(e -> ethnology.getPublication() != null &&
+            if (ethnoList.stream().filter(e -> e.getPublication() != null && ethnology.getPublication() != null &&
                                         e.getPublication().getTitle().equals(ethnology.getPublication().getTitle()) &&
                                         e.getRemedy() != null &&
                                         e.getRemedy().equals(ethnology.getRemedy()))