From facb3fab087fc41206cde306529f87ba5496c37f Mon Sep 17 00:00:00 2001
From: saolberg <luis.bergamim@fit-tecnologia.org.br>
Date: Tue, 25 May 2021 23:26:28 -0300
Subject: [PATCH] postgres included

---
 docker-compose.yml                  | 19 ++++++++++---------
 pom.xml                             |  2 +-
 src/main/resources/application.yaml | 23 +++++++++++------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index cd25605..2453220 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,16 +6,17 @@ services:
     restart: on-failure
     ports:
       - "8080:8080"
-  hapi-fhir-mysql:
-    image: mysql:latest
-    container_name: hapi-fhir-mysql
+  db:
+    image: postgres:latest
+    container_name: postgres
     restart: always
     environment:
-      MYSQL_DATABASE: 'hapi'
-      MYSQL_USER: 'admin'
-      MYSQL_PASSWORD: 'admin'
-      MYSQL_ROOT_PASSWORD: 'admin'
+      POSTGRES_PASSWORD: 'admin'
+      POSTGRES_USER: 'admin'
+      POSTGRES_DB: 'fhir'
+    ports:
+      - 5000:5432
     volumes:
-      - hapi-fhir-mysql:/var/lib/mysql
+      - fhirData:/var/lib/postgresql/data
 volumes:
-  hapi-fhir-mysql:
\ No newline at end of file
+  fhirData:
diff --git a/pom.xml b/pom.xml
index 4471c2f..2cf540c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.9</version>
+            <version>42.2.20</version>
         </dependency>
 
         <!-- Needed for Email subscriptions -->
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index ea9bfa3..5a014ec 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,10 +1,9 @@
 spring:
   datasource:
-    url: 'jdbc:h2:file:./target/database/h2'
-    #url: jdbc:h2:mem:test_mem
-    username: sa
-    password: null
-    driverClassName: org.h2.Driver
+    url: 'jdbc:postgresql://db:5432/fhir'
+    username: admin
+    password: admin
+    driverClassName: org.postgresql.Driver
     max-active: 15
 
     # database connection pool size
@@ -14,7 +13,7 @@ spring:
     properties:
       hibernate.format_sql: false
       hibernate.show_sql: false
-#      hibernate.dialect: org.hibernate.dialect.h2dialect
+      hibernate.dialect: org.hibernate.dialect.PostgreSQL95Dialect
 #      hibernate.hbm2ddl.auto: update
 #      hibernate.jdbc.batch_size: 20
 #      hibernate.cache.use_query_cache: false
@@ -22,12 +21,12 @@ spring:
 #      hibernate.cache.use_structured_entries: false
 #      hibernate.cache.use_minimal_puts: false
 ###    These settings will enable fulltext search with lucene
-#      hibernate.search.enabled: true
-#      hibernate.search.backend.type: lucene
-#      hibernate.search.backend.analysis.configurer: ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer
-#      hibernate.search.backend.directory.type: local-filesystem
-#      hibernate.search.backend.directory.root: target/lucenefiles
-#      hibernate.search.backend.lucene_version: lucene_current
+      hibernate.search.enabled: true
+      hibernate.search.backend.type: lucene
+      hibernate.search.backend.analysis.configurer: ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer
+      hibernate.search.backend.directory.type: local-filesystem
+      hibernate.search.backend.directory.root: target/lucenefiles
+      hibernate.search.backend.lucene_version: lucene_current
   batch:
     job:
       enabled: false