Add callback and update user role
This commit is contained in:
@@ -25,6 +25,7 @@ type UserDB struct {
|
||||
RoleID int64 `gorm:"column:role_id" json:"role_id"`
|
||||
RoleName string `gorm:"column:role_name" json:"role_name"`
|
||||
PartnerID *int64 `gorm:"column:partner_id" json:"partner_id"`
|
||||
SiteID *int64 `gorm:"column:site_id" json:"site_id"`
|
||||
PartnerName string `gorm:"column:partner_name" json:"partner_name"`
|
||||
PartnerStatus string `gorm:"column:partner_status" json:"partner_status"`
|
||||
CreatedAt time.Time `gorm:"column:created_at" json:"created_at"`
|
||||
@@ -50,6 +51,7 @@ func (u *UserDB) ToUser() *User {
|
||||
RoleName: u.RoleName,
|
||||
PartnerID: u.PartnerID,
|
||||
PartnerName: u.PartnerName,
|
||||
SiteID: u.SiteID,
|
||||
}
|
||||
|
||||
return userEntity
|
||||
@@ -67,6 +69,7 @@ func (u *UserDB) ToUserRoleDB() *UserRoleDB {
|
||||
PartnerID: u.PartnerID,
|
||||
CreatedAt: u.CreatedAt,
|
||||
UpdatedAt: u.UpdatedAt,
|
||||
SiteID: u.SiteID,
|
||||
}
|
||||
|
||||
return userRole
|
||||
|
||||
@@ -8,6 +8,7 @@ type JWTAuthClaims struct {
|
||||
Email string `json:"email"`
|
||||
Role int `json:"role"`
|
||||
PartnerID int64 `json:"partner_id"`
|
||||
SiteID int64 `json:"site_id"`
|
||||
jwt.StandardClaims
|
||||
}
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ type OrderItem struct {
|
||||
UpdatedAt time.Time `gorm:"autoUpdateTime;column:updated_at"`
|
||||
CreatedBy int64 `gorm:"type:int;column:created_by"`
|
||||
UpdatedBy int64 `gorm:"type:int;column:updated_by"`
|
||||
Product *Product `gorm:"foreignKey:ItemID;references:ID"`
|
||||
}
|
||||
|
||||
func (OrderItem) TableName() string {
|
||||
@@ -75,3 +76,8 @@ func (o *Order) SetExecutePaymentStatus() {
|
||||
}
|
||||
o.Status = "PENDING"
|
||||
}
|
||||
|
||||
type CallbackRequest struct {
|
||||
TransactionStatus string `json:"transaction_status"`
|
||||
TransactionID string `json:"transaction_id"`
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
|
||||
type Payment struct {
|
||||
ID uuid.UUID `gorm:"type:uuid;default:uuid_generate_v4();primaryKey;column:id"`
|
||||
PartnerID string `gorm:"type:varchar;not null;column:partner_id"`
|
||||
OrderID string `gorm:"type:varchar;not null;column:order_id"`
|
||||
PartnerID int64 `gorm:"type:numeric;not null;column:partner_id"`
|
||||
OrderID int64 `gorm:"type:numeric;not null;column:order_id"`
|
||||
ReferenceID string `gorm:"type:varchar;not null;column:reference_id"`
|
||||
Channel string `gorm:"type:varchar;not null;column:channel"`
|
||||
PaymentType string `gorm:"type:varchar;not null;column:payment_type"`
|
||||
|
||||
@@ -37,6 +37,11 @@ type ProductSearch struct {
|
||||
Offset int
|
||||
}
|
||||
|
||||
type ProductPOS struct {
|
||||
PartnerID int64
|
||||
SiteID int64
|
||||
}
|
||||
|
||||
type ProductList []*ProductDB
|
||||
|
||||
type ProductDB struct {
|
||||
|
||||
@@ -21,6 +21,7 @@ type User struct {
|
||||
RoleID role.Role
|
||||
RoleName string
|
||||
PartnerID *int64
|
||||
SiteID *int64
|
||||
PartnerName string
|
||||
}
|
||||
|
||||
@@ -39,6 +40,7 @@ type UserRoleDB struct {
|
||||
UserID int64 `gorm:"column:user_id"`
|
||||
RoleID int64 `gorm:"column:role_id"`
|
||||
PartnerID *int64 `gorm:"column:partner_id"`
|
||||
SiteID *int64 `gorm:"column:site_id"`
|
||||
CreatedAt time.Time `gorm:"column:created_at"`
|
||||
UpdatedAt time.Time `gorm:"column:updated_at"`
|
||||
}
|
||||
@@ -66,6 +68,7 @@ func (u *User) ToUserDB(createdBy int64) (*UserDB, error) {
|
||||
PartnerID: u.PartnerID,
|
||||
Status: userstatus.Active,
|
||||
CreatedBy: createdBy,
|
||||
SiteID: u.SiteID,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user