From 654e7b1801ddea3a12db099ea39249faa66eb1ea Mon Sep 17 00:00:00 2001
From: Mika Bomm <mika.bomm@outlook.com>
Date: Thu, 5 Sep 2024 23:20:10 +0200
Subject: [PATCH] update .env logic to use dotenv for java instead of using
 intellij's internal environent manager

---
 .env.example                                  |  6 +++-
 .run/start server.run.xml                     |  4 ---
 server/build.gradle                           |  6 ++++
 .../docusphere/config/DataSourceConfig.java   | 28 ++++++++++++++++
 .../mixel/docusphere/config/DotenvConfig.java | 33 +++++++++++++++++++
 server/src/main/resources/application.yml     | 11 +++++--
 6 files changed, 80 insertions(+), 8 deletions(-)
 create mode 100644 server/src/main/java/com/mixel/docusphere/config/DataSourceConfig.java
 create mode 100644 server/src/main/java/com/mixel/docusphere/config/DotenvConfig.java

diff --git a/.env.example b/.env.example
index c1ce405..fc7fb06 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,7 @@
 # Database section
 DB_USER=
-DB_PASSWORD=
\ No newline at end of file
+DB_PASSWORD=
+
+# Minio S3 section
+MINIO_ACCESS_KEY=
+MINIO_SECRET_KEY=
\ No newline at end of file
diff --git a/.run/start server.run.xml b/.run/start server.run.xml
index 7704047..2139df8 100644
--- a/.run/start server.run.xml	
+++ b/.run/start server.run.xml	
@@ -2,10 +2,6 @@
   <configuration default="false" name="start server" type="Application" factoryName="Application">
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <envs>
-      <env name="DB_USER" value="postgres" />
-      <env name="DB_PASSWORD" value="postgres" />
-    </envs>
     <option name="MAIN_CLASS_NAME" value="com.mixel.docusphere.DocuSphereApplication" />
     <module name="DocuSphere.server.main" />
     <method v="2">
diff --git a/server/build.gradle b/server/build.gradle
index 7566262..0aaf227 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -24,6 +24,12 @@ dependencies {
     implementation 'org.springframework.security:spring-security-crypto:6.3.3'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
 
+    // Dotenv manager
+    implementation 'io.github.cdimascio:java-dotenv:5.2.2'
+
+    // Minio S3 Storage
+    implementation 'io.minio:minio:8.5.12'
+
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
diff --git a/server/src/main/java/com/mixel/docusphere/config/DataSourceConfig.java b/server/src/main/java/com/mixel/docusphere/config/DataSourceConfig.java
new file mode 100644
index 0000000..3dd37a0
--- /dev/null
+++ b/server/src/main/java/com/mixel/docusphere/config/DataSourceConfig.java
@@ -0,0 +1,28 @@
+package com.mixel.docusphere.config;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import javax.sql.DataSource;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+
+@Configuration
+public class DataSourceConfig {
+
+    @Bean
+    @Primary
+    public DataSource dataSource() {
+        // Load environment variables from .env file
+        Dotenv dotenv = Dotenv.configure().load();
+
+        // Build the DataSource using Dotenv values
+        DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create()
+                .driverClassName("org.postgresql.Driver")
+                .url(dotenv.get("DB_URL"))
+                .username(dotenv.get("DB_USER"))
+                .password(dotenv.get("DB_PASSWORD"));
+
+        return dataSourceBuilder.build();
+    }
+}
diff --git a/server/src/main/java/com/mixel/docusphere/config/DotenvConfig.java b/server/src/main/java/com/mixel/docusphere/config/DotenvConfig.java
new file mode 100644
index 0000000..7323f16
--- /dev/null
+++ b/server/src/main/java/com/mixel/docusphere/config/DotenvConfig.java
@@ -0,0 +1,33 @@
+package com.mixel.docusphere.config;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import jakarta.annotation.PostConstruct;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class DotenvConfig {
+
+    private final Dotenv dotenv;
+
+    public DotenvConfig() {
+        this.dotenv = Dotenv.configure()
+                .directory("../") // Adjust path as needed
+                .filename(".env")
+                .ignoreIfMissing()
+                .load();
+    }
+
+    @PostConstruct
+    public void init() {
+        dotenv.entries().forEach(entry ->
+                System.setProperty(entry.getKey(), entry.getValue())
+        );
+        System.out.println("Dotenv variables loaded");
+    }
+
+    @Bean
+    public Dotenv dotenv() {
+        return dotenv;
+    }
+}
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index a589f8c..79ff3c3 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -4,13 +4,11 @@ spring:
 
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://localhost:5432/docusphere
-    username: ${DB_USER}
-    password: ${DB_PASSWORD}
 
   jpa:
     hibernate:
       ddl-auto: create-drop # update # Use update later on but use create-drop for testing first
+      dialect: org.hibernate.dialect.PostgreSQLDialect
     show-sql: true
     properties:
       hibernate:
@@ -20,3 +18,10 @@ logging:
   level:
     org.hibernate.SQL: debug
     org.hibernate.type.descriptor.sql.BasicBinder: trace
+    org.springframework.core.env: debug
+
+minio:
+  endpoint: "http://localhost:9000"  # Your MinIO endpoint URL
+  access-key: ${MINIO_ACCESS_KEY}   # Environment variable for the access key
+  secret-key: ${MINIO_SECRET_KEY}   # Environment variable for the secret key
+  bucket-name: docusphere           # The bucket name you want to use