Customer Order

internal/entity/auth.go

@@ -85,6 +85,7 @@ func (UserDB) TableName() string {
 
 func (u *UserDB) ToUserAuthenticate(signedToken string, license PartnerLicense) *AuthenticateUser {
 	return &AuthenticateUser{
+		ID:             u.ID,
 		Token:          signedToken,
 		Name:           u.Name,
 		RoleID:         role.Role(u.RoleID),
@@ -96,6 +97,7 @@ func (u *UserDB) ToUserAuthenticate(signedToken string, license PartnerLicense)
 		SiteName:       u.SiteName,
 		ResetPassword:  u.ResetPassword,
 		PartnerLicense: license,
+		UserType:       u.UserType,
 	}
 }
 

internal/entity/discovery.go

@@ -37,3 +37,6 @@ type MustVisit struct {
 	Region      string  `json:"region"`
 	Regency     string  `json:"regency"`
 }
+
+type DiscoveryGetByIDResp struct {
+}

internal/entity/midtrans.go

@@ -7,6 +7,7 @@ type MidtransResponse struct {
 
 type MidtransRequest struct {
 	PaymentReferenceID string
+	PaymentMethod      string
 	TotalAmount        int64
 	OrderItems         []OrderItem
 }

internal/entity/order.go

@@ -17,6 +17,9 @@ type Order struct {
 	PaymentType string      `gorm:"type:varchar;column:payment_type"`
 	UpdatedBy   int64       `gorm:"type:int;column:updated_by"`
 	OrderItems  []OrderItem `gorm:"foreignKey:OrderID;constraint:OnDelete:CASCADE;"`
+	Payment     Payment     `gorm:"foreignKey:OrderID;constraint:OnDelete:CASCADE;"`
+	User        User        `gorm:"foreignKey:CreatedBy;constraint:OnDelete:CASCADE;"`
+	Source      string      `gorm:"type:varchar;column:source"`
 }
 
 type OrderDB struct {
@@ -69,6 +72,7 @@ func (OrderItem) TableName() string {
 }
 
 type OrderRequest struct {
+	Source        string
 	CreatedBy     int64
 	PartnerID     int64              `json:"partner_id" validate:"required"`
 	PaymentMethod string             `json:"payment_method" validate:"required"`
@@ -120,6 +124,7 @@ type OrderSearch struct {
 	PartnerID   *int64
 	SiteID      *int64
 	IsAdmin     bool
+	CreatedBy   int64
 	PaymentType string
 	Status      string
 	Limit       int
@@ -127,6 +132,7 @@ type OrderSearch struct {
 	StartDate   string
 	EndDate     string
 	Period      string
+	IsCustomer  bool
 }
 
 type HistoryOrderList []*HistoryOrderDB

internal/entity/product.go

@@ -60,18 +60,21 @@ func (ProductDB) TableName() string {
 
 func (e *ProductDB) ToProduct() *Product {
 	return &Product{
-		ID:          e.ID,
-		Name:        e.Name,
-		Type:        e.Type,
-		Price:       e.Price,
-		Status:      e.Status,
-		Description: e.Description,
-		PartnerID:   e.PartnerID,
-		CreatedAt:   e.CreatedAt,
-		UpdatedAt:   e.UpdatedAt,
-		DeletedAt:   e.DeletedAt,
-		CreatedBy:   e.CreatedBy,
-		UpdatedBy:   e.UpdatedBy,
+		ID:              e.ID,
+		Name:            e.Name,
+		Type:            e.Type,
+		Price:           e.Price,
+		Status:          e.Status,
+		Description:     e.Description,
+		PartnerID:       e.PartnerID,
+		CreatedAt:       e.CreatedAt,
+		UpdatedAt:       e.UpdatedAt,
+		DeletedAt:       e.DeletedAt,
+		CreatedBy:       e.CreatedBy,
+		UpdatedBy:       e.UpdatedBy,
+		SiteID:          e.SiteID,
+		IsSeasonTicket:  e.IsSeasonTicket,
+		IsWeekendTicket: e.IsWeekendTicket,
 	}
 }
 

internal/entity/sites.go

@@ -28,6 +28,7 @@ type Site struct {
 	Latitude         *float64   `json:"latitude"`
 	Longitude        *float64   `json:"longitude"`
 	Region           string     `json:"region"`
+	Regency          string     `json:"regency"`
 	Distance         float64    `json:"distance"`
 }
 
@@ -78,6 +79,10 @@ func (e *SiteDB) ToSite() *Site {
 		DeletedAt:        e.DeletedAt,
 		CreatedBy:        e.CreatedBy,
 		UpdatedBy:        e.UpdatedBy,
+		Regency:          e.Regency,
+		Region:           e.Region,
+		Latitude:         e.Latitude,
+		Longitude:        e.Longitude,
 		Products:         e.Products,
 	}
 }

internal/entity/user.go

@@ -16,6 +16,7 @@ type User struct {
 	Password      string
 	Status        userstatus.UserStatus
 	NIK           string
+	UserType      string
 	CreatedAt     time.Time
 	UpdatedAt     time.Time
 	RoleID        role.Role
@@ -29,6 +30,7 @@ type User struct {
 }
 
 type AuthenticateUser struct {
+	ID             int64
 	Token          string
 	Name           string
 	RoleID         role.Role
@@ -40,6 +42,7 @@ type AuthenticateUser struct {
 	SiteName       string
 	ResetPassword  bool
 	PartnerLicense PartnerLicense
+	UserType       string
 }
 
 type UserRoleDB struct {
@@ -78,6 +81,7 @@ func (u *User) ToUserDB(createdBy int64) (*UserDB, error) {
 		SiteID:      u.SiteID,
 		PhoneNumber: u.PhoneNumber,
 		NIK:         u.NIK,
+		UserType:    u.UserType,
 	}, nil
 }