From a37386bb3616f4920c9b341c4d2dff66eaea1995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=20Jurmanovi=C4=87?= Date: Sat, 15 May 2021 22:23:44 +0200 Subject: [PATCH] added wallet controller --- pkg/api/routes.go | 6 ++++- pkg/controllers/wallets.go | 44 +++++++++++++++++++++++++++++++ pkg/migrate/migrate.go | 3 +++ pkg/migrate/migrations/wallets.go | 40 ++++++++++++++++++++++++++++ pkg/models/wallets.go | 16 +++++++++++ pkg/services/wallets.go | 40 ++++++++++++++++++++++++++++ 6 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 pkg/controllers/wallets.go create mode 100644 pkg/migrate/migrations/wallets.go create mode 100644 pkg/models/wallets.go create mode 100644 pkg/services/wallets.go diff --git a/pkg/api/routes.go b/pkg/api/routes.go index fdb3d90..65d3810 100644 --- a/pkg/api/routes.go +++ b/pkg/api/routes.go @@ -2,6 +2,7 @@ package api import ( "wallet-api/pkg/controllers" + "wallet-api/pkg/middleware" "wallet-api/pkg/services" "wallet-api/pkg/utl/configs" @@ -12,14 +13,17 @@ import ( func Routes(s *gin.Engine, db *pg.DB) { ver := s.Group(configs.Prefix) - api := ver.Group("api") + api := ver.Group("api", middleware.Auth) register := ver.Group("register") login := ver.Group("login") + wallet := ver.Group("wallet", middleware.Auth) apiService := services.ApiService{Db: db} usersService := services.UsersService{Db: db} + walletService := services.WalletService{Db: db} controllers.NewApiController(&apiService, api) controllers.NewRegisterController(&usersService, register) controllers.NewLoginController(&usersService, login) + controllers.NewWalletsController(&walletService, wallet) } diff --git a/pkg/controllers/wallets.go b/pkg/controllers/wallets.go new file mode 100644 index 0000000..8af66f5 --- /dev/null +++ b/pkg/controllers/wallets.go @@ -0,0 +1,44 @@ +package controllers + +import ( + "wallet-api/pkg/models" + "wallet-api/pkg/services" + + "github.com/gin-gonic/gin" +) + +type WalletsController struct { + WalletService *services.WalletService +} + +func NewWalletsController(as *services.WalletService, s *gin.RouterGroup) *WalletsController { + wc := new(WalletsController) + wc.WalletService = as + + s.POST("", wc.New) + s.GET("", wc.Get) + + return wc +} + +func (wc *WalletsController) New(c *gin.Context) { + body := new(models.AuthModel) + + get := c.MustGet("auth") + body.Id = get.(*models.AuthModel).Id + + wm := wc.WalletService.New(body) + c.JSON(200, wm) +} + +func (wc *WalletsController) Get(c *gin.Context) { + body := new(models.AuthModel) + + embed, _ := c.GetQuery("embed") + auth := c.MustGet("auth") + body.Id = auth.(*models.AuthModel).Id + + wm := wc.WalletService.Get(body, embed) + + c.JSON(200, wm) +} diff --git a/pkg/migrate/migrate.go b/pkg/migrate/migrate.go index 1252628..0322ef4 100644 --- a/pkg/migrate/migrate.go +++ b/pkg/migrate/migrate.go @@ -9,7 +9,10 @@ import ( func Start(conn *pg.DB) { apiMigration := migrations.ApiMigration{Db: conn} usersMigration := migrations.UsersMigration{Db: conn} + walletsMigration := migrations.WalletsMigration{Db: conn} apiMigration.Create() usersMigration.Create() + walletsMigration.Create() + walletsMigration.PopulateTypes() } diff --git a/pkg/migrate/migrations/wallets.go b/pkg/migrate/migrations/wallets.go new file mode 100644 index 0000000..3b27abd --- /dev/null +++ b/pkg/migrate/migrations/wallets.go @@ -0,0 +1,40 @@ +package migrations + +import ( + "fmt" + "log" + "wallet-api/pkg/models" + + "github.com/go-pg/pg/v10" + "github.com/go-pg/pg/v10/orm" +) + +type WalletsMigration struct { + Db *pg.DB +} + +func (am *WalletsMigration) Create() { + models := []interface{}{ + (*models.WalletTypeModel)(nil), + (*models.WalletModel)(nil), + } + + for _, model := range models { + err := am.Db.Model(model).CreateTable(&orm.CreateTableOptions{ + IfNotExists: false, + FKConstraints: true, + }) + if err != nil { + log.Printf("Error Creating Table: %s", err) + } else { + fmt.Println("Table created successfully") + } + } +} + +func (am *WalletsMigration) PopulateTypes() { + walletTypeModel := new(models.WalletTypeModel) + walletTypeModel.Init() + walletTypeModel.Name = "Test" + am.Db.Model(walletTypeModel).Insert() +} diff --git a/pkg/models/wallets.go b/pkg/models/wallets.go new file mode 100644 index 0000000..03221ea --- /dev/null +++ b/pkg/models/wallets.go @@ -0,0 +1,16 @@ +package models + +type WalletModel struct { + tableName struct{} `pg:"wallets,alias:wallets"` + CommonModel + WalletTypeID string `json:"walletTypeId" pg:"wallet_type_id"` + WalletType *WalletTypeModel `json:"walletType" pg:"rel:has-one,fk:wallet_type_id"` + UserID string `json:"userId" pg:"user_id"` + User *UserReturnInfoModel `json:"user" pg:"rel:has-one,fk:user_id"` +} + +type WalletTypeModel struct { + tableName struct{} `pg:"walletTypes,alias:walletTypes"` + CommonModel + Name string `json:"name"` +} diff --git a/pkg/services/wallets.go b/pkg/services/wallets.go new file mode 100644 index 0000000..868811e --- /dev/null +++ b/pkg/services/wallets.go @@ -0,0 +1,40 @@ +package services + +import ( + "wallet-api/pkg/models" + "wallet-api/pkg/utl/common" + + "github.com/go-pg/pg/v10" +) + +type WalletService struct { + Db *pg.DB +} + +func (as *WalletService) New(am *models.AuthModel) *models.WalletModel { + walletType := as.GetType() + + walletModel := new(models.WalletModel) + walletModel.Init() + walletModel.UserID = am.Id + walletModel.WalletTypeID = walletType.Id + as.Db.Model(walletModel).Insert() + return walletModel +} + +func (as *WalletService) Get(am *models.AuthModel, embed string) *models.WalletModel { + wm := new(models.WalletModel) + + query := as.Db.Model(wm).Where("? = ?", pg.Ident("user_id"), am.Id) + common.GenerateEmbed(query, embed).Select() + + return wm +} + +func (as *WalletService) GetType() *models.WalletTypeModel { + wt := new(models.WalletTypeModel) + + as.Db.Model(wt).Select() + + return wt +}