Merge pull request #12 from ARUNK2121/finalization

Finalization

makefile

@@ -41,6 +41,7 @@ mock: ##make mock files using mockgen
 	mockgen -source=pkg/repository/interface/user.go -destination=pkg/mock/mockrepo/user_mock.go -package=mockrepo
 	mockgen -source=pkg/usecase/interface/user.go -destination=pkg/mock/mockusecase/user_mock.go -package=mockusecase
 	mockgen -source=pkg/repository/interface/inventory.go -destination=pkg/mock/mockrepo/inventory_mock.go -package=mockrepo
+	mockgen -source=pkg/repository/interface/order.go -destination=pkg/mock/mockrepo/order_mock.go -package=mockrepo
 
 swag: ## Generate swagger docs
 		swag init -g pkg/api/handler/admin.go -o ./cmd/api/docs

pkg/api/handler/order.go

@@ -119,14 +119,14 @@ func (i *OrderHandler) CancelOrder(c *gin.Context) {
 // @Router			/admin/orders/edit/status [put]
 func (i *OrderHandler) EditOrderStatus(c *gin.Context) {
 
-	status := c.Query("status")
-	id, err := strconv.Atoi(c.Query("id"))
+	var status models.EditOrderStatus
+	err := c.BindJSON(&status)
 	if err != nil {
-		errorRes := response.ClientResponse(http.StatusBadRequest, "coonversion to integer not possible", nil, err.Error())
+		errorRes := response.ClientResponse(http.StatusBadRequest, "conversion to integer not possible", nil, err.Error())
 		c.JSON(http.StatusBadRequest, errorRes)
 		return
 	}
-	if err := i.orderUseCase.EditOrderStatus(status, id); err != nil {
+	if err := i.orderUseCase.EditOrderStatus(status.Status, status.OrderID); err != nil {
 		errorRes := response.ClientResponse(http.StatusBadRequest, "fields provided are in wrong format", nil, err.Error())
 		c.JSON(http.StatusBadRequest, errorRes)
 		return
@@ -185,3 +185,22 @@ func (i *OrderHandler) ReturnOrder(c *gin.Context) {
 	c.JSON(http.StatusOK, successRes)
 
 }
+
+func (i *OrderHandler) MakePaymentStatusAsPaid(c *gin.Context) {
+
+	id, err := strconv.Atoi(c.Query("id"))
+	if err != nil {
+		errorRes := response.ClientResponse(http.StatusBadRequest, "conversion to integer not possible", nil, err.Error())
+		c.JSON(http.StatusBadRequest, errorRes)
+		return
+	}
+	if err := i.orderUseCase.MakePaymentStatusAsPaid(id); err != nil {
+		errorRes := response.ClientResponse(http.StatusBadRequest, "fields provided are in wrong format", nil, err.Error())
+		c.JSON(http.StatusBadRequest, errorRes)
+		return
+	}
+
+	successRes := response.ClientResponse(http.StatusOK, "successfully updated as paid", nil, nil)
+	c.JSON(http.StatusOK, successRes)
+
+}

pkg/domain/order.go

@@ -40,9 +40,9 @@ type AdminOrdersResponse struct {
 }
 
 type OrderDetails struct {
-	Id            int     `json:"order_id"`
+	Id            int     `json:"id" gorm:"id"`
 	Username      string  `json:"name"`
 	Address       string  `json:"address"`
-	Paymentmethod string  `json:"payment_method"`
+	Paymentmethod string  `json:"payment_method" gorm:"payment_method"`
 	Total         float64 `json:"total"`
 }

pkg/repository/interface/order.go

@@ -17,11 +17,12 @@ type OrderRepository interface {
 	CheckOrder(orderID string, userID int) error
 	GetOrderDetail(orderID string) (domain.Order, error)
 
-	CheckIfTheOrderIsAlreadyReturned(id int) (string, error)
+	CheckOrderStatusByID(id int) (string, error)
 	ReturnOrder(id int) error
 	FindAmountFromOrderID(id int) (float64, error)
 	CreditToUserWallet(amount float64, walletID int) error
 	FindUserIdFromOrderID(id int) (int, error)
 	FindWalletIdFromUserID(userId int) (int, error)
 	CreateNewWallet(userID int) (int, error)
+	MakePaymentStatusAsPaid(id int) error
 }

pkg/repository/order.go

@@ -100,7 +100,7 @@ func (i *orderRepository) EditOrderStatus(status string, id int) error {
 func (or *orderRepository) AdminOrders(status string) ([]domain.OrderDetails, error) {
 
 	var orders []domain.OrderDetails
-	if err := or.DB.Raw("SELECT orders.id AS order_id, users.name AS username, CONCAT(addresses.house_name, ' ', addresses.street, ' ', addresses.city) AS address, payment_methods.payment_name AS payment_method, orders.final_price As total FROM orders JOIN users ON users.id = orders.user_id JOIN payment_methods ON payment_methods.id = orders.payment_method_id JOIN addresses ON orders.address_id = addresses.id WHERE order_status = $1", status).Scan(&orders).Error; err != nil {
+	if err := or.DB.Raw("SELECT orders.id AS order_id, users.name AS username, CONCAT(addresses.house_name, ' ', addresses.street, ' ', addresses.city, ' ', addresses.state, ' ',) AS address, payment_methods.payment_name AS payment_method, orders.final_price As total FROM orders JOIN users ON users.id = orders.user_id JOIN payment_methods ON payment_methods.id = orders.payment_method_id JOIN addresses ON orders.address_id = addresses.id WHERE order_status = $1", status).Scan(&orders).Error; err != nil {
 		return []domain.OrderDetails{}, err
 	}
 
@@ -153,7 +153,7 @@ func (i *orderRepository) ReturnOrder(id int) error {
 
 }
 
-func (o *orderRepository) CheckIfTheOrderIsAlreadyReturned(id int) (string, error) {
+func (o *orderRepository) CheckOrderStatusByID(id int) (string, error) {
 
 	var status string
 	err := o.DB.Raw("select order_status from orders where id = ?", id).Scan(&status).Error
@@ -218,15 +218,25 @@ func (o *orderRepository) FindWalletIdFromUserID(userId int) (int, error) {
 
 func (o *orderRepository) CreateNewWallet(userID int) (int, error) {
 
-	var wallet_id int
+	var walletID int
 	err := o.DB.Exec("Insert into wallets(user_id,amount) values($1,$2)", userID, 0).Error
 	if err != nil {
 		return 0, err
 	}
 
-	if err := o.DB.Raw("select id from wallets where user_id=$1", userID).Scan(&wallet_id).Error; err != nil {
+	if err := o.DB.Raw("select id from wallets where user_id=$1", userID).Scan(&walletID).Error; err != nil {
 		return 0, err
 	}
 
-	return wallet_id, nil
+	return walletID, nil
+}
+
+func (o *orderRepository) MakePaymentStatusAsPaid(id int) error {
+
+	err := o.DB.Exec("UPDATE orders SET payment_status = 'PAID' WHERE id = $1", id).Error
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

pkg/routes/adminRoutes.go

@@ -52,6 +52,7 @@ func AdminRoutes(engine *gin.RouterGroup, adminHandler *handler.AdminHandler, in
 		orders := engine.Group("/orders")
 		{
 			orders.PUT("/status", orderHandler.EditOrderStatus)
+			orders.PUT("/payment-status", orderHandler.MakePaymentStatusAsPaid)
 			orders.GET("", orderHandler.AdminOrders)
 		}
 

pkg/usecase/interface/order.go

@@ -11,4 +11,5 @@ type OrderUseCase interface {
 	EditOrderStatus(status string, id int) error
 	AdminOrders() (domain.AdminOrdersResponse, error)
 	ReturnOrder(id int) error
+	MakePaymentStatusAsPaid(id int) error
 }

pkg/usecase/order.go

@@ -72,7 +72,17 @@ func (i *orderUseCase) OrderItemsFromCart(userid int, addressid int, paymentid i
 
 func (i *orderUseCase) CancelOrder(id int) error {
 
-	err := i.orderRepository.CancelOrder(id)
+	//the order has to be less than status delivered (pending,shipped) to be canceled
+	status, err := i.orderRepository.CheckOrderStatusByID(id)
+	if err != nil {
+		return err
+	}
+
+	if status != "PENDING" {
+		return errors.New("order cannot be canceled if you accidently booked kindly return the product")
+	}
+
+	err = i.orderRepository.CancelOrder(id)
 	if err != nil {
 		return err
 	}
@@ -133,7 +143,7 @@ func (i *orderUseCase) ReturnOrder(id int) error {
 
 	//should check if the order is already returned peoples will misuse this security breach
 	// and will get  unlimited money into their wallet
-	status, err := i.orderRepository.CheckIfTheOrderIsAlreadyReturned(id)
+	status, err := i.orderRepository.CheckOrderStatusByID(id)
 	if err != nil {
 		return err
 	}
@@ -185,3 +195,13 @@ func (i *orderUseCase) ReturnOrder(id int) error {
 	return nil
 
 }
+
+func (i *orderUseCase) MakePaymentStatusAsPaid(id int) error {
+
+	err := i.orderRepository.MakePaymentStatusAsPaid(id)
+	if err != nil {
+		return err
+	}
+	return nil
+
+}

pkg/usecase/wishlist.go

@@ -18,18 +18,27 @@ func NewWishlistUseCase(repo interfaces.WishlistRepository, offer interfaces.Off
 	}
 }
 
-func (w *wishlistUseCase) AddToWishlist(user_id, inventory_id int) error {
+func (w *wishlistUseCase) AddToWishlist(userID, inventoryID int) error {
 
-	if err := w.repository.AddToWishlist(user_id, inventory_id); err != nil {
+	exists, err := w.repository.CheckIfTheItemIsPresentAtWishlist(userID, inventoryID)
+	if err != nil {
+		return err
+	}
+
+	if exists {
+		return errors.New("item already exists in wishlist")
+	}
+
+	if err := w.repository.AddToWishlist(userID, inventoryID); err != nil {
 		return errors.New("could not add to wishlist")
 	}
 
 	return nil
 }
 
-func (w *wishlistUseCase) RemoveFromWishlist(inventory_id int) error {
+func (w *wishlistUseCase) RemoveFromWishlist(inventoryID int) error {
 
-	if err := w.repository.RemoveFromWishlist(inventory_id); err != nil {
+	if err := w.repository.RemoveFromWishlist(inventoryID); err != nil {
 		return errors.New("could not remove from wishlist")
 	}
 

pkg/utils/models/orders.go

@@ -30,3 +30,8 @@ type OrderPaymentDetails struct {
 	OrderID    int     `json:"order_id"`
 	FinalPrice float64 `json:"final_price"`
 }
+
+type EditOrderStatus struct {
+	OrderID int    `json:"order_id"`
+	Status  string `json:"order_status"`
+}