Skip to content

Remove type from terminal #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AmirRajabii merged 4 commits into from
May 11, 2026
Merged

Remove type from terminal #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d812b1c
Add interceptors dependency to all related modules
fatemeh-i May 9, 2026
424ea71
Merge remote-tracking branch 'origin/dev' into dev
AmirRajabii May 10, 2026
ea18c05
Merge remote-tracking branch 'origin/dev' into dev
AmirRajabii May 11, 2026
e851758
remove type from terminal
AmirRajabii May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/TerminalCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion wallet/wallet-core/src/main/kotlin/co/nilin/opex/wallet/core/inout/TerminalCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion ...gres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dao/GatewayTerminalRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ interface GatewayTerminalRepository : ReactiveCrudRepository<GatewayTerminalMode
tl.owner,
t.identifier,
t.active,
t.type,
t.meta_data,
t.display_order,
tl.description
Expand Down
2 changes: 0 additions & 2 deletions ...er-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dao/TerminalRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ interface TerminalRepository : ReactiveCrudRepository<TerminalModel, Long> {
tl.owner,
t.identifier,
t.active,
t.type,
t.meta_data,
t.display_order,
tl.description
Expand All @@ -40,7 +39,6 @@ interface TerminalRepository : ReactiveCrudRepository<TerminalModel, Long> {
tl.owner,
t.identifier,
t.active,
t.type,
t.meta_data,
t.display_order,
tl.description
Expand Down
3 changes: 0 additions & 3 deletions ...ersister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dto/TerminalView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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?
Expand Down
2 changes: 0 additions & 2 deletions ...ister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/model/TerminalModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*
Expand All @@ -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,
)
6 changes: 3 additions & 3 deletions ...-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/util/Convertor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,23 +195,23 @@ fun TerminalCommand.toModel(): TerminalModel {
return TerminalModel(
null,
uuid,
identifier, active, type, metaData, displayOrder
identifier, active, metaData, displayOrder
)
}

fun TerminalView.toModel(): TerminalModel {
return TerminalModel(
id,
uuid,
identifier, active, type, metaData, displayOrder
identifier, active, metaData, displayOrder
)
}

fun TerminalView.toCommand(): TerminalCommand {
return TerminalCommand(
uuid,
owner,
identifier, active, type, metaData, description, displayOrder
identifier, active, metaData, description, displayOrder
)
}

Expand Down
2 changes: 2 additions & 0 deletions .../wallet-persister-postgres/src/main/resources/db/migration/V12__update_terminal_table.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE terminal
DROP COLUMN type;
Loading