Fix swagger deps

This commit is contained in:
Florian Hoss 2023-07-04 23:18:05 +02:00
parent 28f068c890
commit f63210272d
28 changed files with 307 additions and 310 deletions

View file

@ -4,7 +4,6 @@ import (
"fmt"
"time"
"gitlab.unjx.de/flohoss/cafe-plaetschwiesle/internal/types"
"gorm.io/gorm"
)
@ -21,10 +20,10 @@ type (
}
OrderItem struct {
ID uint64 `gorm:"primaryKey" json:"id" validate:"optional"`
ItemType types.ItemType `json:"item_type" validate:"required"`
Description string `json:"description" validate:"required"`
Price float32 `json:"price" validate:"required"`
ID uint64 `gorm:"primaryKey" json:"id" validate:"optional"`
ItemType ItemType `json:"item_type" validate:"required"`
Description string `json:"description" validate:"required"`
Price float32 `json:"price" validate:"required"`
}
GetOrderOptions struct {
@ -55,7 +54,7 @@ func (c *Controller) doesOrderItemExist(id string) (OrderItem, error) {
var orderItem OrderItem
result := c.orm.Limit(1).Find(&orderItem, id)
if result.RowsAffected == 0 {
return orderItem, fmt.Errorf(types.CannotFind.String())
return orderItem, fmt.Errorf(CannotFind.String())
}
return orderItem, nil
}
@ -64,7 +63,7 @@ func (c *Controller) doesOrderExist(id string) (Order, error) {
var order Order
result := c.orm.Limit(1).Find(&order, id)
if result.RowsAffected == 0 {
return order, fmt.Errorf(types.CannotFind.String())
return order, fmt.Errorf(CannotFind.String())
}
return order, nil
}
@ -96,11 +95,11 @@ func (c *Controller) getAllOrdersForTable(options GetOrderOptions) []Order {
func (c *Controller) createOrder(order *Order) error {
err := c.orm.Create(order).Error
if err != nil {
return fmt.Errorf(types.CannotCreate.String())
return fmt.Errorf(CannotCreate.String())
}
c.orm.Model(&Order{}).Joins("OrderItem").First(order)
c.publishMessage(StatusMessage{
Type: types.Create,
Type: Create,
Payload: []Order{*order},
})
return nil
@ -109,11 +108,11 @@ func (c *Controller) createOrder(order *Order) error {
func (c *Controller) updateOrder(old *Order, new *Order) error {
err := c.orm.First(old).Updates(new).Error
if err != nil {
return fmt.Errorf(types.CannotUpdate.String())
return fmt.Errorf(CannotUpdate.String())
}
if new.IsServed {
c.publishMessage(StatusMessage{
Type: types.Delete,
Type: Delete,
Payload: []Order{*new},
})
}
@ -124,14 +123,14 @@ func (c *Controller) deleteOrder(tableId string, orderItemId string) error {
var order Order
err := c.orm.Where("table_id = ? AND order_item_id = ?", tableId, orderItemId).Last(&order).Error
if err != nil {
return fmt.Errorf(types.CannotFind.String())
return fmt.Errorf(CannotFind.String())
}
err = c.orm.Delete(&order).Error
if err != nil {
return fmt.Errorf(types.CannotDelete.String())
return fmt.Errorf(CannotDelete.String())
}
c.publishMessage(StatusMessage{
Type: types.Delete,
Type: Delete,
Payload: []Order{order},
})
return nil
@ -139,14 +138,14 @@ func (c *Controller) deleteOrder(tableId string, orderItemId string) error {
func (c *Controller) getOrderItemsForType(itemType string) []OrderItem {
var orderItems []OrderItem
c.orm.Order("description").Where("item_type = ?", types.ParseItemType(itemType)).Find(&orderItems)
c.orm.Order("description").Where("item_type = ?", ParseItemType(itemType)).Find(&orderItems)
return orderItems
}
func (c *Controller) createOrderItem(oderItem *OrderItem) error {
err := c.orm.Create(oderItem).Error
if err != nil {
return fmt.Errorf(types.CannotCreate.String())
return fmt.Errorf(CannotCreate.String())
}
return nil
}
@ -154,7 +153,7 @@ func (c *Controller) createOrderItem(oderItem *OrderItem) error {
func (c *Controller) updateOrderItem(old *OrderItem, new *OrderItem) error {
err := c.orm.First(old).Updates(new).Error
if err != nil {
return fmt.Errorf(types.CannotUpdate.String())
return fmt.Errorf(CannotUpdate.String())
}
return nil
}
@ -162,7 +161,7 @@ func (c *Controller) updateOrderItem(old *OrderItem, new *OrderItem) error {
func (c *Controller) deleteOrderItem(oderItem *OrderItem) error {
err := c.orm.Delete(oderItem).Error
if err != nil {
return fmt.Errorf(types.CannotDelete.String())
return fmt.Errorf(CannotDelete.String())
}
return nil
}