From 496394dac137a19eea366ce1a7f6249368da3256 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Tue, 21 Apr 2020 09:50:48 +0200
Subject: [PATCH 1/3] Add Compose run config for IDEA

---
 .../.idea/runConfigurations/Run_Compose.xml   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 backend/.idea/runConfigurations/Run_Compose.xml

diff --git a/backend/.idea/runConfigurations/Run_Compose.xml b/backend/.idea/runConfigurations/Run_Compose.xml
new file mode 100644
index 0000000..d69f9c6
--- /dev/null
+++ b/backend/.idea/runConfigurations/Run_Compose.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Compose" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="removeVolumesOnComposeDown" value="true" />
+        <option name="commandLineOptions" value="--build" />
+        <option name="services">
+          <list>
+            <option value="backend" />
+            <option value="db" />
+            <option value="frontend" />
+          </list>
+        </option>
+        <option name="sourceFilePath" value="../docker-compose.yml" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file

From 2c7418529b32663e9264e5ce6b6a3add215e70d7 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Tue, 21 Apr 2020 11:22:03 +0200
Subject: [PATCH 2/3] Add dev and prod profile, Add MariaDB connector Prod is
 default Add IDEA Run Configs for DEV (IDEA) and PROD (Docker-Compose)

---
 .../{GeotimeApplication.xml => GeotimeApplication__DEV_.xml} | 3 ++-
 .../{Run_Compose.xml => Run_Compose__PROD_.xml}              | 2 +-
 backend/build.gradle                                         | 1 +
 backend/src/main/resources/application-dev.properties        | 0
 backend/src/main/resources/application-prod.properties       | 5 +++++
 backend/src/main/resources/application.properties            | 3 ++-
 docker-compose.yml                                           | 4 +++-
 7 files changed, 14 insertions(+), 4 deletions(-)
 rename backend/.idea/runConfigurations/{GeotimeApplication.xml => GeotimeApplication__DEV_.xml} (63%)
 rename backend/.idea/runConfigurations/{Run_Compose.xml => Run_Compose__PROD_.xml} (81%)
 create mode 100644 backend/src/main/resources/application-dev.properties
 create mode 100644 backend/src/main/resources/application-prod.properties

diff --git a/backend/.idea/runConfigurations/GeotimeApplication.xml b/backend/.idea/runConfigurations/GeotimeApplication__DEV_.xml
similarity index 63%
rename from backend/.idea/runConfigurations/GeotimeApplication.xml
rename to backend/.idea/runConfigurations/GeotimeApplication__DEV_.xml
index 81f70ed..f75a135 100644
--- a/backend/.idea/runConfigurations/GeotimeApplication.xml
+++ b/backend/.idea/runConfigurations/GeotimeApplication__DEV_.xml
@@ -1,7 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="GeotimeApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+  <configuration default="false" name="GeotimeApplication [DEV]" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <module name="geotime.main" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="de.hft.geotime.GeotimeApplication" />
+    <option name="ACTIVE_PROFILES" value="dev" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/backend/.idea/runConfigurations/Run_Compose.xml b/backend/.idea/runConfigurations/Run_Compose__PROD_.xml
similarity index 81%
rename from backend/.idea/runConfigurations/Run_Compose.xml
rename to backend/.idea/runConfigurations/Run_Compose__PROD_.xml
index d69f9c6..818bcdd 100644
--- a/backend/.idea/runConfigurations/Run_Compose.xml
+++ b/backend/.idea/runConfigurations/Run_Compose__PROD_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Compose" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+  <configuration default="false" name="Run Compose [PROD]" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
     <deployment type="docker-compose.yml">
       <settings>
         <option name="removeVolumesOnComposeDown" value="true" />
diff --git a/backend/build.gradle b/backend/build.gradle
index ebf56f5..a7a1c3e 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -17,6 +17,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-rest'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.mariadb.jdbc:mariadb-java-client:1.5.7'
 	runtimeOnly 'com.h2database:h2'
 	testImplementation('org.springframework.boot:spring-boot-starter-test') {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
diff --git a/backend/src/main/resources/application-dev.properties b/backend/src/main/resources/application-dev.properties
new file mode 100644
index 0000000..e69de29
diff --git a/backend/src/main/resources/application-prod.properties b/backend/src/main/resources/application-prod.properties
new file mode 100644
index 0000000..63f56f2
--- /dev/null
+++ b/backend/src/main/resources/application-prod.properties
@@ -0,0 +1,5 @@
+spring.jpa.hibernate.ddl-auto=update
+spring.datasource.url=jdbc:mariadb://db:3306/geotime
+spring.datasource.username=root
+spring.datasource.password=supersecure
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
\ No newline at end of file
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index c3c4d51..817a520 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 server.port=80
-spring.data.rest.basePath=/api
\ No newline at end of file
+spring.data.rest.basePath=/api
+spring.profiles.active=prod
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e127b72..a4392b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,9 +21,11 @@ services:
 
   db:
     container_name: qbc_database
+    restart: always
     build: 
       context: ./sql
     volumes: 
       - "./sql/db-data:/var/lib/mysql"
     environment:
-      MYSQL_ROOT_PASSWORD: "ubc-timetracking"
+      MYSQL_DATABASE: geotime
+      MYSQL_ROOT_PASSWORD: supersecure
\ No newline at end of file

From 52b5065558147b073e7665ed2006bd5d9f36c177 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Wed, 22 Apr 2020 20:36:34 +0200
Subject: [PATCH 3/3] Add fail timeout for mariadb spring boot connection, Add
 spring actuator

---
 backend/build.gradle                              | 2 ++
 backend/src/main/resources/application.properties | 1 +
 2 files changed, 3 insertions(+)

diff --git a/backend/build.gradle b/backend/build.gradle
index a7a1c3e..52afab8 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -17,7 +17,9 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-rest'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	implementation 'org.mariadb.jdbc:mariadb-java-client:1.5.7'
+
 	runtimeOnly 'com.h2database:h2'
 	testImplementation('org.springframework.boot:spring-boot-starter-test') {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 817a520..a09a491 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,3 +1,4 @@
 server.port=80
 spring.data.rest.basePath=/api
+spring.datasource.hikari.initialization-fail-timeout=0
 spring.profiles.active=prod
\ No newline at end of file