Switched From httprouter to chi

I believe all functionality works properly
This commit is contained in:
Annika Merris 2024-02-07 19:15:25 -05:00
parent c1231d487a
commit d4b2d5fefb
9 changed files with 77 additions and 78 deletions

View file

@ -3,7 +3,7 @@ package Services
import (
"context"
"forgejo.merr.is/annika/isl-api/Types"
"forgejo.merr.is/annika/isl-api/Entities"
"forgejo.merr.is/annika/isl-api/sql/powerItem"
"github.com/jackc/pgtype"
)
@ -20,31 +20,31 @@ func NewPowerItemService(querier *powerItem.DBQuerier) *PowerItemService {
}
}
func (p *PowerItemService) GetAll() ([]Types.PowerItem, error) {
func (p *PowerItemService) GetAll() ([]Entities.PowerItem, error) {
rows, err := p.querier.GetAllItems(p.context)
if err != nil {
return []Types.PowerItem{}, err
return []Entities.PowerItem{}, err
}
var powerItems []Types.PowerItem
var powerItems []Entities.PowerItem
for _, sqlItem := range rows {
powerItems = append(powerItems, Types.FromGetAllItemsRow(sqlItem))
powerItems = append(powerItems, Entities.FromGetAllItemsRow(sqlItem))
}
return powerItems, nil
}
func (p *PowerItemService) GetAllByType(itemType int) ([]Types.PowerItem, error) {
func (p *PowerItemService) GetAllByType(itemType int) ([]Entities.PowerItem, error) {
rows, err := p.querier.GetAllByType(p.context, int32(itemType))
if err != nil {
return []Types.PowerItem{}, err
return []Entities.PowerItem{}, err
}
var powerItems []Types.PowerItem
var powerItems []Entities.PowerItem
for _, sqlItem := range rows {
powerItems = append(powerItems, Types.FromGetAllItemsByTypeRow(sqlItem))
powerItems = append(powerItems, Entities.FromGetAllItemsByTypeRow(sqlItem))
}
return powerItems, nil
}
func (p *PowerItemService) Add(newItem Types.PowerItem) (Types.PowerItem, error) {
func (p *PowerItemService) Add(newItem Entities.PowerItem) (Entities.PowerItem, error) {
sqlItem := powerItem.AddNewItemWithIDParams{
ID: newItem.ID,
ItemType: newItem.ItemType,
@ -59,14 +59,14 @@ func (p *PowerItemService) Add(newItem Types.PowerItem) (Types.PowerItem, error)
}
row, err := p.querier.AddNewItemWithID(p.context, powerItem.AddNewItemWithIDParams(sqlItem))
if err != nil {
return Types.PowerItem{}, err
return Entities.PowerItem{}, err
}
return Types.FromAddNewItemWithIDParams(row), nil
return Entities.FromAddNewItemWithIDParams(row), nil
}
func (p *PowerItemService) AddMultipile(newItems map[string]Types.PowerItem, itemType int32) ([]Types.PowerItem, []error) {
func (p *PowerItemService) AddMultipile(newItems map[string]Entities.PowerItem, itemType int32) ([]Entities.PowerItem, []error) {
var errors []error
var addedItems []Types.PowerItem
var addedItems []Entities.PowerItem
for key, value := range newItems {
id := pgtype.UUID{}
id.Set(key)
@ -87,7 +87,7 @@ func (p *PowerItemService) AddMultipile(newItems map[string]Types.PowerItem, ite
errors = append(errors, err)
continue
}
addedItems = append(addedItems, Types.FromAddNewItemWithIDParams(row))
addedItems = append(addedItems, Entities.FromAddNewItemWithIDParams(row))
}
return addedItems, errors
}