Merge branch 'master' into prod-deploy

2024-01-26 09:17:56 +07:00 · 2024-01-26 09:17:56 +07:00 · 542b30edc4
commit 542b30edc4
parent 3b57982de3 edab086626
16 changed files with 87 additions and 40 deletions
--- a/Medifirst2000/pom.xml
+++ b/Medifirst2000/pom.xml
@ -74,6 +74,7 @@
 		<javamelody.version>1.42.0</javamelody.version>

 		<project.lombok.version>1.18.28</project.lombok.version>
+		<ulisesbocchio.jasypt.version>1.7</ulisesbocchio.jasypt.version>

 		<!-- konfigurasi application server for custom server -->
 		<appserver.port.http>10000</appserver.port.http>
@ -99,20 +100,34 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${org.slf4j.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${joda-time.version}</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.poi</groupId>
+		    <artifactId>poi</artifactId>
+		    <version>${poi.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.ulisesbocchio</groupId>
+			<artifactId>jasypt-spring-boot-starter</artifactId>
+			<version>${ulisesbocchio.jasypt.version}</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>${org.slf4j.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
 			<version>${org.slf4j.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
@ -120,25 +135,12 @@
 			<scope>runtime</scope>
 		</dependency>

-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>${joda-time.version}</version>
-		</dependency>
-		
-		<dependency>
-		    <groupId>org.apache.poi</groupId>
-		    <artifactId>poi</artifactId>
-		    <version>${poi.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 	<organization>
 		<name>Jasa Medika</name>
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
@ -293,7 +293,9 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "inner join ppp.pelayananPasien pp " + "inner join pp.pasienDaftar apd "
 			+ "inner join apd.pasienDaftar pd " + "where apd.ruanganId = ru.id " + "and pd.pasienId = vp.pasienId "
 			+ "and ppp.ObjectPegawaiId in (:listIdSpog) " + "and pp.produkId in (:listProdukEntriId) "
-			+ "and ru.departemenId = 16 " + "order by vp.pasienId, " + "vp.paketId, " + "apd.tglKeluar desc")
+			+ "and ru.departemenId in (:listRanapId) " + "order by vp.pasienId, " + "vp.paketId, "
+			+ "apd.tglKeluar desc")
 	Set<Map<String, Object>> findPasienPaketDiRanapByDokter(@Param("listIdSpog") List<Integer> listIdSpog,
-			@Param("listProdukEntriId") List<Integer> listProdukEntriId);
+			@Param("listProdukEntriId") List<Integer> listProdukEntriId,
+			@Param("listRanapId") List<Integer> listRanapId);
 }
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
@ -1620,7 +1620,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao
 				.findByConcateProdukKelas(allConcatProdukNonkelas);
 		Set<Map<String, Object>> ibuPaketDiRanapByDokter = pelayananPasienDao.findPasienPaketDiRanapByDokter(drKsmObgyn,
-				allProdukEntriId);
+				allProdukEntriId, Arrays.asList(GRUP_RAWAT_INAP));
 		Set<Integer> setIdIbu = ibuPaketDiRanapByDokter.stream()
 				.map(pasien -> Integer.parseInt(pasien.get("pasienId").toString())).collect(Collectors.toSet());
 		List<Map<String, Object>> ibuAnak = pasienDao.findIdByIdOfIbu(setIdIbu);
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/util/JasyptConfig.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/util/JasyptConfig.java
@ -0,0 +1,38 @@
+package com.jasamedika.medifirst2000.util;
+
+import com.ulisesbocchio.jasyptspringboot.annotation.EncryptablePropertySource;
+import com.ulisesbocchio.jasyptspringboot.annotation.EncryptablePropertySources;
+import org.jasypt.encryption.StringEncryptor;
+import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
+import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 23/01/2024
+ */
+@Configuration
+@EncryptablePropertySources({@EncryptablePropertySource("classpath:jdbc.bridging.properties"),
+        @EncryptablePropertySource("classpath:jdbc.cssd.properties"),
+        @EncryptablePropertySource("classpath:jdbc.development.properties"),
+        @EncryptablePropertySource("classpath:jdbc.ip3rs.properties"),
+        @EncryptablePropertySource("classpath:jdbc.it.properties"),
+        @EncryptablePropertySource("classpath:jdbc.k3kl.properties"),
+        @EncryptablePropertySource("classpath:jdbc.laundry.properties"),
+        @EncryptablePropertySource("classpath:jdbc.localhost.properties"),
+        @EncryptablePropertySource("classpath:jdbc.mirroring.properties"),
+        @EncryptablePropertySource("classpath:jdbc.pelayanan.properties"),
+        @EncryptablePropertySource("classpath:jdbc.sdm.properties"),
+        @EncryptablePropertySource("classpath:jdbc.web.properties")})
+public class JasyptConfig {
+    @Bean
+    public StringEncryptor jasyptStringEncryptor() {
+        String password = System.getProperty("jasypt.encryptor.password");
+        PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
+        SimpleStringPBEConfig config = new SimpleStringPBEConfig();
+        config.setPassword(password);
+        return encryptor;
+    }
+}
--- a/jasamedika-config/pom.xml
+++ b/jasamedika-config/pom.xml
@ -109,6 +109,11 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>com.github.ulisesbocchio</groupId>
+				<artifactId>jasypt-maven-plugin</artifactId>
+				<version>3.0.0</version>
+			</plugin>
 		</plugins>
 	</build>
 	<description>Module Medifirst2000 untuk Configuration</description>
--- a/jasamedika-config/src/main/resources/jdbc.bridging.properties
+++ b/jasamedika-config/src/main/resources/jdbc.bridging.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 25

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.cssd.properties
+++ b/jasamedika-config/src/main/resources/jdbc.cssd.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 5

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.development.properties
+++ b/jasamedika-config/src/main/resources/jdbc.development.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 5

 # DB Development
 jdbc.url = jdbc:postgresql://192.168.12.3:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = postgres
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = 192.168.12.3
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.ip3rs.properties
+++ b/jasamedika-config/src/main/resources/jdbc.ip3rs.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 5

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.it.properties
+++ b/jasamedika-config/src/main/resources/jdbc.it.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 5

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.k3kl.properties
+++ b/jasamedika-config/src/main/resources/jdbc.k3kl.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 5

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.laundry.properties
+++ b/jasamedika-config/src/main/resources/jdbc.laundry.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 5

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.mirroring.properties
+++ b/jasamedika-config/src/main/resources/jdbc.mirroring.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 50

 # DB Mirroring
 jdbc.url = jdbc:postgresql://ds.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_jasper
+jdbc.password = ekAdeCmnJ3
 jdbc.serverName = ds.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.pelayanan.properties
+++ b/jasamedika-config/src/main/resources/jdbc.pelayanan.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 25

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.sdm.properties
+++ b/jasamedika-config/src/main/resources/jdbc.sdm.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 60

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432
--- a/jasamedika-config/src/main/resources/jdbc.web.properties
+++ b/jasamedika-config/src/main/resources/jdbc.web.properties
@ -9,8 +9,8 @@ hikari.config.maximum.pool.size = 25

 # DB Production
 jdbc.url = jdbc:postgresql://psql1.rsabhk.lan:5432/rsab_hk_production
-jdbc.username = postgres
-jdbc.password = root
+jdbc.username = smart_user
+jdbc.password = 1miwhir3yr
 jdbc.serverName = psql1.rsabhk.lan
 jdbc.databaseName = rsab_hk_production
 jdbc.portNumber = 5432