add time format

swnori · Nov 26, 2022 · 2936da1 · 2936da1
1 parent ef70697
commit 2936da1
Show file tree

Hide file tree

Showing 23 changed files with 121 additions and 104 deletions.
diff --git a/database/db/coupon.go b/database/db/coupon.go
@@ -3,7 +3,6 @@ package db
 import (
 	"context"
 	"database/sql"
-	"fmt"
 	"time"
 
 	"mr.jackpot-backend/database/orm"
@@ -16,7 +15,7 @@ type CouponLayer interface {
 	GetCouponInfo(couponid int) (model.CouponInfo, error)
 	GetCouponListByID(userid int) ([]model.CouponInfo, error)
 
-	CreateCoupon(model.CouponInfo) (model.CouponInfo, error)
+	CreateCoupon(model.CouponInfo) (int, error)
 	GetIssuedCouponList() ([]model.CouponInfo, error)
 	DeleteCoupon(int) error
 	UseCoupon(userid, couponid int) error
@@ -60,7 +59,6 @@ func (db *CouponDB) GetCouponInfo(couponid int) (model.CouponInfo, error) {
 		ID:        int(coupon.CouponID),
 		Title:     coupon.Title.String,
 		Message:   coupon.Description.String,
-		CreatedAt: coupon.CreatedAt,
 		ExpiresAt: coupon.ExpiresAt,
 	}, err
 }
@@ -69,8 +67,6 @@ func (db *CouponDB) GetCouponListByID(userid int) ([]model.CouponInfo, error) {
 	ctx := context.Background()
 
 	couponList, err := db.q.GetCouponAvailable(ctx, int64(userid))
-	fmt.Println(userid)
-	fmt.Println(len(couponList))
 
 	CouponList := make([]model.CouponInfo, 0);
 	for _, coupon := range couponList {
@@ -91,7 +87,7 @@ func (db *CouponDB) GetCouponListByID(userid int) ([]model.CouponInfo, error) {
 	return CouponList, err
 }
 
-func (db *CouponDB) CreateCoupon(coupon model.CouponInfo) (model.CouponInfo, error) {
+func (db *CouponDB) CreateCoupon(coupon model.CouponInfo) (int, error) {
 	ctx := context.Background()
 
 	result, err := db.q.IssueCoupon(ctx, orm.IssueCouponParams{
@@ -105,29 +101,15 @@ func (db *CouponDB) CreateCoupon(coupon model.CouponInfo) (model.CouponInfo, err
 			String: coupon.Message,
 			Valid:  true,
 		},
-		CreatedAt: coupon.CreatedAt,
 		ExpiresAt: coupon.ExpiresAt,
 	})
 
 	if err != nil {
-		return model.CouponInfo{}, err
+		return 0, err
 	}
 
 	couponID, err := result.LastInsertId()
-	if err != nil {
-		return model.CouponInfo{}, err
-	}
-
-	couponIssued, err := db.q.GetCouponInfo(ctx, couponID)
-
-	return model.CouponInfo{
-		ID: int(couponID),
-		Amount: int(couponIssued.Amount),
-		Code: couponIssued.Code,
-		Title: couponIssued.Title.String,
-		Message: couponIssued.Description.String,
-		ExpiresAt: couponIssued.ExpiresAt,
-	}, err
+	return int(couponID), err
 }
 
 func (db *CouponDB) GetIssuedCouponList() ([]model.CouponInfo, error) {
@@ -146,7 +128,6 @@ func (db *CouponDB) GetIssuedCouponList() ([]model.CouponInfo, error) {
 			Code:      coupon.Code,
 			Title:     coupon.Title.String,
 			Message:   coupon.Description.String,
-			CreatedAt: coupon.CreatedAt,
 			ExpiresAt: coupon.ExpiresAt,
 		})
 	}

diff --git a/database/db/vui.go b/database/db/vui.go
@@ -2,7 +2,6 @@ package db
 
 import (
 	"context"
-	"fmt"
 
 	"mr.jackpot-backend/database/orm"
 	"mr.jackpot-backend/model"
@@ -93,7 +92,7 @@ func (db *VUIDB) ReadAllProOrderList() ([]model.ProOrderTable, error) {
 		}
 
 		proOrder.EntityType = ProOrder.Typename
-		fmt.Println(Id)
+
 		switch (proOrder.EntityType) {
 		case "dinner":
 			id, err := db.q.GetDinnerId(ctx, int32(proOrder.Id))
@@ -143,8 +142,6 @@ func (db *VUIDB) ReadAllProOrderList() ([]model.ProOrderTable, error) {
 			break
 		}
 
-		fmt.Println("found: ", proOrder.EntityId)
-
 		proOrderList = append(proOrderList, proOrder)
 	}
 

diff --git a/database/orm/coupon.sql.go b/database/orm/coupon.sql.go
diff --git a/database/orm/models.go b/database/orm/models.go
diff --git a/database/orm/vui.sql.go b/database/orm/vui.sql.go
diff --git a/database/sql/coupon.sql b/database/sql/coupon.sql
@@ -1,6 +1,6 @@
 -- name: IssueCoupon :execresult
-INSERT INTO coupon_issued (code, amount, title, description, created_at, expires_at)
-VALUES (?, ?, ?, ?, ?, ?);
+INSERT INTO coupon_issued (code, amount, title, description, expires_at)
+VALUES (?, ?, ?, ?, ?);
 
 -- name: GetCouponIssued :many
 SELECT *
@@ -27,7 +27,7 @@ WHERE coupon_id = (?)
 AND owner_id = (?);
 
 -- name: GetCouponAvailable :many
-SELECT issued.coupon_id, code, amount, title, description, created_at, expires_at
+SELECT issued.coupon_id, code, amount, title, description, expires_at
 FROM coupon_owned owned, coupon_issued issued
 WHERE owned.owner_id = (?)
 AND owned.coupon_id = issued.coupon_id

diff --git a/database/sql/schema.sql b/database/sql/schema.sql
@@ -49,7 +49,6 @@ CREATE TABLE coupon_issued (
     amount      int         NOT NULL DEFAULT 0,
     title       varchar(256),
     description varchar(256),
-    created_at  timestamp NOT NULL,
     expires_at  timestamp NOT NULL,
 
     PRIMARY KEY (coupon_id),

diff --git a/database/sql/vui.sql b/database/sql/vui.sql
@@ -50,7 +50,7 @@ AND pro_order_choice.seq_id = board_entity.target_id
 AND board_entity.entity_id = style.entity_id;
 
 -- name: GetCountId :one
-SELECT count_id
+SELECT count
 FROM pro_order_choice, entity_count
 WHERE pro_order_choice.seq_id = entity_count.target_id
 AND pro_order_choice.seq_id = (?);

diff --git a/main.go b/main.go
@@ -1,9 +1,7 @@
 package main
 
 import (
-	"fmt"
 	"log"
-	"time"
 
 	"mr.jackpot-backend/database/db"
 	"mr.jackpot-backend/rest"
@@ -27,8 +25,7 @@ func main() {
 	}
 
 
-	loc, _ := time.LoadLocation("Asia/Seoul")
-	fmt.Println(time.Now().In(loc))
+
 
 	log.Fatal(rest.RunAPI("0.0.0.0:8000"))
 }

diff --git a/model/coupon.go b/model/coupon.go
@@ -12,14 +12,14 @@ type CouponInfo struct {
 	Amount    int
 	Title     string
 	Message   string
-	CreatedAt time.Time
 	ExpiresAt time.Time
 }
 
 type CouponString struct {
+	ID        int
+	Code      string
 	Title     string
 	Amount    int
 	Message   string
-	CreatedAt string
 	ExpiresAt string
 }
diff --git a/model/format.go b/model/format.go
@@ -0,0 +1,8 @@
+package model
+
+
+
+
+var TimeDayFormat string = "2006.01.02"
+var TimeMinuteFormat string = "2006.01.02 15:04"
+var TimeSecondFormat string = "2006.01.02 15:04:05"
diff --git a/model/order.go b/model/order.go
@@ -4,10 +4,6 @@ type Order struct {
 	DinnerList []DinnerOrder `json:"dinnerList"`
 }
 
-type OrderResponse struct {
-	Order
-	AllOrderInfo 
-}
 
 type DinnerOrder struct {
 	DinnerId int         `json:"dinnerId"`

diff --git a/model/orderinfo.go b/model/orderinfo.go
@@ -73,3 +73,27 @@ type AllOrderInfo struct {
 	CouponPrice int    `json:"couponPrice"`
 	CouponName  string `json:"couponName"`
 }
+
+type OrderResponse struct {
+	Order
+	AllOrderInfoResponse
+}
+
+
+type AllOrderInfoResponse struct {
+	ID        int    `json:"orderId"`
+	OwnerID   int    `json:"-"`
+	StateID   int    `json:"stateId"`
+
+	Name      string `json:"reserveName"`
+	Phone     string `json:"contact"`
+	Address   string `json:"address"`
+	Message   string `json:"requestDetail"`
+
+	ReserveAt string `json:"reserveDate"`
+	CreatedAt string `json:"createTime"`
+
+	Price       int    `json:"price"`
+	CouponPrice int    `json:"couponPrice"`
+	CouponName  string `json:"couponName"`	
+}
diff --git a/rest/coupon/staff.go b/rest/coupon/staff.go
@@ -1,7 +1,6 @@
 package coupon
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -20,7 +19,6 @@ func (h *CouponHandler) GetIssuedCouponList(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, err.Error())
 		return
 	}
-	fmt.Println(len(couponlist))
 	c.JSON(http.StatusOK, couponlist)
 }
 

diff --git a/rest/order/customer.go b/rest/order/customer.go
@@ -24,7 +24,7 @@ func (h *OrderHandler) GetOrderInfo(c *gin.Context) {
 	}
 
 	c.JSON(http.StatusOK, gin.H{
-		"orderinfo": order.AllOrderInfo,
+		"orderinfo": order.AllOrderInfoResponse,
 		"order": order.Order,
 	})
 
@@ -43,7 +43,7 @@ func (h *OrderHandler) CreateOrder(c *gin.Context) {
 	request.Info.OwnerID = userid
 
 	if err := h.order.CreateOrder(userid, request.Info, request.Order); err != nil {
-		c.JSON(http.StatusInternalServerError, request)
+		c.JSON(http.StatusInternalServerError, err.Error())
 		return
 	}