From d812b1cc5f6bf2992c09abd564dea3c3e3368a5d Mon Sep 17 00:00:00 2001 From: fatemeh imanipour Date: Sat, 9 May 2026 16:17:00 +0330 Subject: [PATCH 1/2] Add interceptors dependency to all related modules --- accountant/accountant-app/pom.xml | 4 ++++ accountant/pom.xml | 5 +++++ auth-gateway/auth-gateway-app/pom.xml | 4 ++++ bc-gateway/bc-gateway-app/pom.xml | 8 ++++++++ device-management/device-management-app/pom.xml | 4 ++++ device-management/pom.xml | 5 +++++ docker-compose.yml | 4 ++-- matching-gateway/matching-gateway-app/pom.xml | 4 ++++ otp/otp-app/pom.xml | 4 ++++ profile/pom.xml | 5 +++++ profile/profile-app/pom.xml | 4 ++++ user-management/pom.xml | 5 +++++ 12 files changed, 54 insertions(+), 2 deletions(-) diff --git a/accountant/accountant-app/pom.xml b/accountant/accountant-app/pom.xml index 67649ff75..f56aee06a 100644 --- a/accountant/accountant-app/pom.xml +++ b/accountant/accountant-app/pom.xml @@ -51,6 +51,10 @@ co.nilin.opex.utility error-handler + + co.nilin.opex.utility + interceptors + org.springframework.cloud spring-cloud-starter-vault-config diff --git a/accountant/pom.xml b/accountant/pom.xml index 6eded39f6..edce57a88 100644 --- a/accountant/pom.xml +++ b/accountant/pom.xml @@ -82,6 +82,11 @@ error-handler ${error-hanlder.version} + + co.nilin.opex.utility + interceptors + ${interceptor.version} + org.springframework.cloud spring-cloud-dependencies diff --git a/auth-gateway/auth-gateway-app/pom.xml b/auth-gateway/auth-gateway-app/pom.xml index 0d31ffddd..0ff3a5ade 100644 --- a/auth-gateway/auth-gateway-app/pom.xml +++ b/auth-gateway/auth-gateway-app/pom.xml @@ -80,6 +80,10 @@ co.nilin.opex.utility error-handler + + co.nilin.opex.utility + interceptors + com.auth0 java-jwt diff --git a/bc-gateway/bc-gateway-app/pom.xml b/bc-gateway/bc-gateway-app/pom.xml index 2bdccb667..0046a178b 100644 --- a/bc-gateway/bc-gateway-app/pom.xml +++ b/bc-gateway/bc-gateway-app/pom.xml @@ -138,6 +138,14 @@ micrometer-registry-prometheus runtime + + co.nilin.opex.utility + interceptors + + + co.nilin.opex.utility + error-handler + diff --git a/device-management/device-management-app/pom.xml b/device-management/device-management-app/pom.xml index 82e41ff4e..ff9b70048 100644 --- a/device-management/device-management-app/pom.xml +++ b/device-management/device-management-app/pom.xml @@ -78,6 +78,10 @@ co.nilin.opex.utility error-handler + + co.nilin.opex.utility + interceptors + com.zaxxer HikariCP diff --git a/device-management/pom.xml b/device-management/pom.xml index d24596637..4800bfa7c 100644 --- a/device-management/pom.xml +++ b/device-management/pom.xml @@ -56,6 +56,11 @@ error-handler ${error-hanlder.version} + + co.nilin.opex.utility + interceptors + ${interceptor.version} + co.nilin.opex.device-management device-management-core diff --git a/docker-compose.yml b/docker-compose.yml index 63535e6e2..b9078536e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -546,8 +546,8 @@ services: - SMTP_USER=${SMTP_USER} - SMTP_PASS=${SMTP_PASS} - SMTP_FROM=${SMTP_FROM} - - SMTP_SOCKS_HOST=${SMTP_SOCKS_HOST} - - SMTP_SOCKS_PORT=${SMTP_SOCKS_PORT} + - SMTP_PROXY_HOST=${SMTP_PROXY_HOST} + - SMTP_PROXY_PORT=${SMTP_PROXY_PORT} - SMTP_PROXY_ENABLED=${SMTP_PROXY_ENABLED} - TOKEN_ISSUER_URL=${KC_ISSUER_URL} - OTP_CODE_RESPONSE_ENABLED=${OTP_CODE_RESPONSE_ENABLED} diff --git a/matching-gateway/matching-gateway-app/pom.xml b/matching-gateway/matching-gateway-app/pom.xml index 24e94ab58..86d029320 100644 --- a/matching-gateway/matching-gateway-app/pom.xml +++ b/matching-gateway/matching-gateway-app/pom.xml @@ -77,6 +77,10 @@ co.nilin.opex.utility error-handler + + co.nilin.opex.utility + interceptors + io.mockk mockk diff --git a/otp/otp-app/pom.xml b/otp/otp-app/pom.xml index 1d3d72124..49cb4f0c0 100644 --- a/otp/otp-app/pom.xml +++ b/otp/otp-app/pom.xml @@ -87,6 +87,10 @@ co.nilin.opex.utility error-handler + + co.nilin.opex.utility + interceptors + io.mockk mockk diff --git a/profile/pom.xml b/profile/pom.xml index 7ac615097..ffd3ab564 100644 --- a/profile/pom.xml +++ b/profile/pom.xml @@ -66,6 +66,11 @@ logging-handler ${logging-handler.version} + + co.nilin.opex.utility + error-handler + ${error-hanlder.version} + co.nilin.opex.utility interceptors diff --git a/profile/profile-app/pom.xml b/profile/profile-app/pom.xml index 685459a22..2b2412044 100644 --- a/profile/profile-app/pom.xml +++ b/profile/profile-app/pom.xml @@ -98,6 +98,10 @@ org.springframework.cloud spring-cloud-starter-vault-config + + co.nilin.opex.utility + error-handler + co.nilin.opex.utility interceptors diff --git a/user-management/pom.xml b/user-management/pom.xml index 0c0b0c5a4..fbb1146c0 100644 --- a/user-management/pom.xml +++ b/user-management/pom.xml @@ -49,6 +49,11 @@ error-handler ${error-hanlder.version} + + co.nilin.opex.utility + interceptors + ${interceptor.version} + co.nilin.opex.auth user-management-core From e85175816709981053f907a56d3762e066d2a5d3 Mon Sep 17 00:00:00 2001 From: Amir Rajabi Date: Mon, 11 May 2026 15:21:05 +0330 Subject: [PATCH 2/2] remove type from terminal --- .../kotlin/co/nilin/opex/api/core/inout/TerminalCommand.kt | 1 - .../co/nilin/opex/wallet/core/inout/TerminalCommand.kt | 1 - .../wallet/ports/postgres/dao/GatewayTerminalRepository.kt | 1 - .../opex/wallet/ports/postgres/dao/TerminalRepository.kt | 2 -- .../co/nilin/opex/wallet/ports/postgres/dto/TerminalView.kt | 3 --- .../nilin/opex/wallet/ports/postgres/model/TerminalModel.kt | 2 -- .../co/nilin/opex/wallet/ports/postgres/util/Convertor.kt | 6 +++--- .../resources/db/migration/V12__update_terminal_table.sql | 2 ++ 8 files changed, 5 insertions(+), 13 deletions(-) create mode 100644 wallet/wallet-ports/wallet-persister-postgres/src/main/resources/db/migration/V12__update_terminal_table.sql diff --git a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/TerminalCommand.kt b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/TerminalCommand.kt index cf8074378..a7c919deb 100644 --- a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/TerminalCommand.kt +++ b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/TerminalCommand.kt @@ -5,7 +5,6 @@ data class TerminalCommand( var owner: String?=null, var identifier: String, var active: Boolean? = true, - var type: TransferMethod, var metaData: String, var description : String?=null, var displayOrder: Int? = null, diff --git a/wallet/wallet-core/src/main/kotlin/co/nilin/opex/wallet/core/inout/TerminalCommand.kt b/wallet/wallet-core/src/main/kotlin/co/nilin/opex/wallet/core/inout/TerminalCommand.kt index 3d801a3f8..2a5e0b658 100644 --- a/wallet/wallet-core/src/main/kotlin/co/nilin/opex/wallet/core/inout/TerminalCommand.kt +++ b/wallet/wallet-core/src/main/kotlin/co/nilin/opex/wallet/core/inout/TerminalCommand.kt @@ -5,7 +5,6 @@ data class TerminalCommand( var owner: String? = null, var identifier: String, var active: Boolean? = true, - var type: TransferMethod, var metaData: String, var description : String? = null, var displayOrder: Int? = null, diff --git a/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dao/GatewayTerminalRepository.kt b/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dao/GatewayTerminalRepository.kt index 65e594ffc..50e16cf71 100644 --- a/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dao/GatewayTerminalRepository.kt +++ b/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dao/GatewayTerminalRepository.kt @@ -22,7 +22,6 @@ interface GatewayTerminalRepository : ReactiveCrudRepository { tl.owner, t.identifier, t.active, - t.type, t.meta_data, t.display_order, tl.description @@ -40,7 +39,6 @@ interface TerminalRepository : ReactiveCrudRepository { tl.owner, t.identifier, t.active, - t.type, t.meta_data, t.display_order, tl.description diff --git a/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dto/TerminalView.kt b/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dto/TerminalView.kt index ef9748c13..46d65c74e 100644 --- a/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dto/TerminalView.kt +++ b/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dto/TerminalView.kt @@ -1,14 +1,11 @@ package co.nilin.opex.wallet.ports.postgres.dto -import co.nilin.opex.wallet.core.inout.TransferMethod - data class TerminalView( var id: Long?, val uuid: String, val owner: String?, val identifier: String, val active: Boolean, - val type: TransferMethod, val metaData: String, val displayOrder: Int?, val description: String? diff --git a/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/model/TerminalModel.kt b/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/model/TerminalModel.kt index a5a756ed8..a2a769811 100644 --- a/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/model/TerminalModel.kt +++ b/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/model/TerminalModel.kt @@ -1,6 +1,5 @@ package co.nilin.opex.wallet.ports.postgres.model -import co.nilin.opex.wallet.core.inout.TransferMethod import org.springframework.data.annotation.Id import org.springframework.data.relational.core.mapping.Table import java.util.* @@ -12,7 +11,6 @@ data class TerminalModel( var uuid: String? = UUID.randomUUID().toString(), var identifier: String, var active: Boolean? = true, - var type: TransferMethod, var metaData: String, var displayOrder: Int? = null, ) \ No newline at end of file diff --git a/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/util/Convertor.kt b/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/util/Convertor.kt index 4e9a8bdd1..d7e1bf00a 100644 --- a/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/util/Convertor.kt +++ b/wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/util/Convertor.kt @@ -195,7 +195,7 @@ fun TerminalCommand.toModel(): TerminalModel { return TerminalModel( null, uuid, - identifier, active, type, metaData, displayOrder + identifier, active, metaData, displayOrder ) } @@ -203,7 +203,7 @@ fun TerminalView.toModel(): TerminalModel { return TerminalModel( id, uuid, - identifier, active, type, metaData, displayOrder + identifier, active, metaData, displayOrder ) } @@ -211,7 +211,7 @@ fun TerminalView.toCommand(): TerminalCommand { return TerminalCommand( uuid, owner, - identifier, active, type, metaData, description, displayOrder + identifier, active, metaData, description, displayOrder ) } diff --git a/wallet/wallet-ports/wallet-persister-postgres/src/main/resources/db/migration/V12__update_terminal_table.sql b/wallet/wallet-ports/wallet-persister-postgres/src/main/resources/db/migration/V12__update_terminal_table.sql new file mode 100644 index 000000000..57f5c0345 --- /dev/null +++ b/wallet/wallet-ports/wallet-persister-postgres/src/main/resources/db/migration/V12__update_terminal_table.sql @@ -0,0 +1,2 @@ +ALTER TABLE terminal + DROP COLUMN type; \ No newline at end of file