Mhamdans17 commited on
Commit ·
36aac72
1
Parent(s): 88124cb
fix: wallet api trailing slash issue and cleanup
Browse files
go.mod
CHANGED
|
@@ -9,7 +9,6 @@ require (
|
|
| 9 |
github.com/joho/godotenv v1.5.1
|
| 10 |
golang.org/x/crypto v0.52.0
|
| 11 |
gorm.io/driver/postgres v1.6.0
|
| 12 |
-
gorm.io/driver/sqlite v1.6.0
|
| 13 |
gorm.io/gorm v1.31.1
|
| 14 |
)
|
| 15 |
|
|
@@ -38,7 +37,6 @@ require (
|
|
| 38 |
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
|
| 39 |
github.com/leodido/go-urn v1.4.0 // indirect
|
| 40 |
github.com/mattn/go-isatty v0.0.20 // indirect
|
| 41 |
-
github.com/mattn/go-sqlite3 v1.14.22 // indirect
|
| 42 |
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
| 43 |
github.com/modern-go/reflect2 v1.0.2 // indirect
|
| 44 |
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
|
|
|
| 9 |
github.com/joho/godotenv v1.5.1
|
| 10 |
golang.org/x/crypto v0.52.0
|
| 11 |
gorm.io/driver/postgres v1.6.0
|
|
|
|
| 12 |
gorm.io/gorm v1.31.1
|
| 13 |
)
|
| 14 |
|
|
|
|
| 37 |
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
|
| 38 |
github.com/leodido/go-urn v1.4.0 // indirect
|
| 39 |
github.com/mattn/go-isatty v0.0.20 // indirect
|
|
|
|
| 40 |
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
| 41 |
github.com/modern-go/reflect2 v1.0.2 // indirect
|
| 42 |
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
go.sum
CHANGED
|
@@ -62,8 +62,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
|
|
| 62 |
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
|
| 63 |
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
| 64 |
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
| 65 |
-
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
|
| 66 |
-
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
| 67 |
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
| 68 |
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
| 69 |
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
|
@@ -118,7 +116,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|
| 118 |
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
| 119 |
gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4=
|
| 120 |
gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo=
|
| 121 |
-
gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
|
| 122 |
-
gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
|
| 123 |
gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
|
| 124 |
gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
|
|
|
|
| 62 |
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
|
| 63 |
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
| 64 |
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
|
|
|
|
|
| 65 |
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
| 66 |
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
| 67 |
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
|
|
|
| 116 |
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
| 117 |
gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4=
|
| 118 |
gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo=
|
|
|
|
|
|
|
| 119 |
gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
|
| 120 |
gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
|
main.go
CHANGED
|
@@ -261,7 +261,7 @@ func main() {
|
|
| 261 |
{
|
| 262 |
wallet.Use(middleware.GetCurrentUser(), middleware.RequireTenantContext())
|
| 263 |
{
|
| 264 |
-
wallet.GET("
|
| 265 |
wallet.POST("/topup/manual", controllers.RequestTopupManual)
|
| 266 |
wallet.POST("/topup/qris", controllers.RequestTopupQris)
|
| 267 |
}
|
|
@@ -272,7 +272,7 @@ func main() {
|
|
| 272 |
{
|
| 273 |
adminTopups.Use(middleware.GetCurrentUser(), middleware.RequireSuperAdmin())
|
| 274 |
{
|
| 275 |
-
adminTopups.GET("
|
| 276 |
adminTopups.POST("/:id/approve", controllers.AdminApproveTopup)
|
| 277 |
adminTopups.POST("/:id/reject", controllers.AdminRejectTopup)
|
| 278 |
}
|
|
|
|
| 261 |
{
|
| 262 |
wallet.Use(middleware.GetCurrentUser(), middleware.RequireTenantContext())
|
| 263 |
{
|
| 264 |
+
wallet.GET("", controllers.GetWalletDetail)
|
| 265 |
wallet.POST("/topup/manual", controllers.RequestTopupManual)
|
| 266 |
wallet.POST("/topup/qris", controllers.RequestTopupQris)
|
| 267 |
}
|
|
|
|
| 272 |
{
|
| 273 |
adminTopups.Use(middleware.GetCurrentUser(), middleware.RequireSuperAdmin())
|
| 274 |
{
|
| 275 |
+
adminTopups.GET("", controllers.AdminGetPendingTopups)
|
| 276 |
adminTopups.POST("/:id/approve", controllers.AdminApproveTopup)
|
| 277 |
adminTopups.POST("/:id/reject", controllers.AdminRejectTopup)
|
| 278 |
}
|