diff --git a/README.md b/README.md index 53950e3..d8ff7e7 100644 --- 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 index 8f9e50f..df5938d 100644 --- 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 index 79a14b4..d313f6d 100644 --- 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 index 1a63f0a..fb6c0ca 100755 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ nc.ird.malariaplantdb malariaplantdb - 0.9.2 + 0.9.3 war malariaplantdb 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 index 644d766..b919cd9 100644 --- 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 index 7500e8e..d7b138c 100644 --- 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 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()))