StrafesNET/maps-service
5
Fork 0
Code Issues15 Pull Requests Packages Projects Releases Wiki Activity

kinda done

Browse Source
This commit is contained in:
Quaternions 2025-04-09 15:36:45 -07:00
parent ca750669db
commit 0324a57e5c
Signed by: Quaternions
GPG Key ID: D0DF5964F79AC131
5 changed files with 33 additions and 28 deletions

2
pkg/datastore/datastore.go

@ -49,7 +49,7 @@ type Mapfixes interface {
IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.MapfixStatus, values OptionalMap) (model.Mapfix, error) IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.MapfixStatus, values OptionalMap) (model.Mapfix, error)
Delete(ctx context.Context, id int64) error Delete(ctx context.Context, id int64) error
List(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) ([]model.Mapfix, error) List(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) ([]model.Mapfix, error)
ListWithTotal(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) (int64, []model.Mapfix, error) ListWithTotal(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) (uint64, []model.Mapfix, error)
} }
type Operations interface { type Operations interface {

9
pkg/datastore/filter.go

@ -10,12 +10,17 @@ func Optional() OptionalMap {
return OptionalMap{filter: map[string]interface{}{}} return OptionalMap{filter: map[string]interface{}{}}
} }
func (q OptionalMap) Add(column string, value interface{}) OptionalMap { func (q OptionalMap) Add2(column string, value interface{}) OptionalMap {
q.filter[column] = value q.filter[column] = value
return q return q
} }
func (q OptionalMap) AddInt(column string, value uint64) OptionalMap { func (q OptionalMap) AddPostgresInt32(column string, value uint32) OptionalMap {
q.filter[column] = value
return q
}
func (q OptionalMap) AddPostgresInt64(column string, value uint64) OptionalMap {
q.filter[column] = value q.filter[column] = value
return q return q
} }

4
pkg/datastore/gormstore/mapfixes.go

@ -131,7 +131,7 @@ func (env *Mapfixes) List(ctx context.Context, filters datastore.OptionalMap, pa
return maps, nil return maps, nil
} }
func (env *Mapfixes) ListWithTotal(ctx context.Context, filters datastore.OptionalMap, page model.Page, sort datastore.ListSort) (int64, []model.Mapfix, error) { func (env *Mapfixes) ListWithTotal(ctx context.Context, filters datastore.OptionalMap, page model.Page, sort datastore.ListSort) (uint64, []model.Mapfix, error) {
// grab page items // grab page items
maps, err := env.List(ctx, filters, page, sort) maps, err := env.List(ctx, filters, page, sort)
if err != nil{ if err != nil{
@ -144,5 +144,5 @@ func (env *Mapfixes) ListWithTotal(ctx context.Context, filters datastore.Option
return 0, nil, err return 0, nil, err
} }
return total, maps, nil return uint64(total), maps, nil
} }

8
pkg/service/audit_events.go

@ -72,8 +72,8 @@ func (svc *Service) CreateMapfixAuditComment(ctx context.Context, req api.Create
func (svc *Service) ListMapfixAuditEvents(ctx context.Context, params api.ListMapfixAuditEventsParams) ([]api.AuditEvent, error) { func (svc *Service) ListMapfixAuditEvents(ctx context.Context, params api.ListMapfixAuditEventsParams) ([]api.AuditEvent, error) {
filter := datastore.Optional() filter := datastore.Optional()
filter.AddInt("resource_type", uint64(model.ResourceMapfix)) filter.AddPostgresInt32("resource_type", uint32(model.ResourceMapfix))
filter.AddInt("resource_id", params.MapfixID) filter.AddPostgresInt64("resource_id", params.MapfixID)
items, err := svc.DB.AuditEvents().List(ctx, filter, model.Page{ items, err := svc.DB.AuditEvents().List(ctx, filter, model.Page{
Number: params.Page, Number: params.Page,
@ -167,8 +167,8 @@ func (svc *Service) CreateSubmissionAuditComment(ctx context.Context, req api.Cr
func (svc *Service) ListSubmissionAuditEvents(ctx context.Context, params api.ListSubmissionAuditEventsParams) ([]api.AuditEvent, error) { func (svc *Service) ListSubmissionAuditEvents(ctx context.Context, params api.ListSubmissionAuditEventsParams) ([]api.AuditEvent, error) {
filter := datastore.Optional() filter := datastore.Optional()
filter.AddInt("resource_type", uint64(model.ResourceSubmission)) filter.AddPostgresInt32("resource_type", uint32(model.ResourceSubmission))
filter.AddInt("resource_id", params.SubmissionID) filter.AddPostgresInt64("resource_id", params.SubmissionID)
items, err := svc.DB.AuditEvents().List(ctx, filter, model.Page{ items, err := svc.DB.AuditEvents().List(ctx, filter, model.Page{
Number: params.Page, Number: params.Page,

38
pkg/service/mapfixes.go

@ -148,12 +148,12 @@ func (svc *Service) GetMapfix(ctx context.Context, params api.GetMapfixParams) (
GameID: uint32(mapfix.GameID), GameID: uint32(mapfix.GameID),
CreatedAt: mapfix.CreatedAt.Unix(), CreatedAt: mapfix.CreatedAt.Unix(),
UpdatedAt: mapfix.UpdatedAt.Unix(), UpdatedAt: mapfix.UpdatedAt.Unix(),
Submitter: int64(mapfix.Submitter), Submitter: mapfix.Submitter,
AssetID: int64(mapfix.AssetID), AssetID: mapfix.AssetID,
AssetVersion: int64(mapfix.AssetVersion), AssetVersion: mapfix.AssetVersion,
Completed: mapfix.Completed, Completed: mapfix.Completed,
TargetAssetID: int64(mapfix.TargetAssetID), TargetAssetID: mapfix.TargetAssetID,
StatusID: int32(mapfix.StatusID), StatusID: uint32(mapfix.StatusID),
StatusMessage: mapfix.StatusMessage, StatusMessage: mapfix.StatusMessage,
}, nil }, nil
} }
@ -167,28 +167,28 @@ func (svc *Service) ListMapfixes(ctx context.Context, params api.ListMapfixesPar
filter := datastore.Optional() filter := datastore.Optional()
if params.DisplayName.IsSet(){ if params.DisplayName.IsSet(){
filter.Add("display_name", params.DisplayName.Value) filter.Add2("display_name", params.DisplayName.Value)
} }
if params.Creator.IsSet(){ if params.Creator.IsSet(){
filter.Add("creator", params.Creator.Value) filter.Add2("creator", params.Creator.Value)
} }
if params.GameID.IsSet(){ if params.GameID.IsSet(){
filter.Add("game_id", params.GameID.Value) filter.AddPostgresInt32("game_id", params.GameID.Value)
} }
if params.Submitter.IsSet(){ if params.Submitter.IsSet(){
filter.Add("submitter", params.Submitter.Value) filter.AddPostgresInt64("submitter", params.Submitter.Value)
} }
if params.AssetID.IsSet(){ if params.AssetID.IsSet(){
filter.Add("asset_id", params.AssetID.Value) filter.AddPostgresInt64("asset_id", params.AssetID.Value)
} }
if params.TargetAssetID.IsSet(){ if params.TargetAssetID.IsSet(){
filter.Add("target_asset_id", params.TargetAssetID.Value) filter.AddPostgresInt64("target_asset_id", params.TargetAssetID.Value)
} }
if params.StatusID.IsSet(){ if params.StatusID.IsSet(){
filter.Add("status_id", params.StatusID.Value) filter.AddPostgresInt32("status_id", params.StatusID.Value)
} }
sort := datastore.ListSort(params.Sort.Or(int32(datastore.ListSortDisabled))) sort := datastore.ListSort(params.Sort.Or(uint32(datastore.ListSortDisabled)))
total, items, err := svc.DB.Mapfixes().ListWithTotal(ctx, filter, model.Page{ total, items, err := svc.DB.Mapfixes().ListWithTotal(ctx, filter, model.Page{
Number: params.Page, Number: params.Page,
@ -205,15 +205,15 @@ func (svc *Service) ListMapfixes(ctx context.Context, params api.ListMapfixesPar
ID: item.ID, ID: item.ID,
DisplayName: item.DisplayName, DisplayName: item.DisplayName,
Creator: item.Creator, Creator: item.Creator,
GameID: int32(item.GameID), GameID: item.GameID,
CreatedAt: item.CreatedAt.Unix(), CreatedAt: item.CreatedAt.Unix(),
UpdatedAt: item.UpdatedAt.Unix(), UpdatedAt: item.UpdatedAt.Unix(),
Submitter: int64(item.Submitter), Submitter: item.Submitter,
AssetID: int64(item.AssetID), AssetID: item.AssetID,
AssetVersion: int64(item.AssetVersion), AssetVersion: item.AssetVersion,
Completed: item.Completed, Completed: item.Completed,
TargetAssetID: int64(item.TargetAssetID), TargetAssetID: item.TargetAssetID,
StatusID: int32(item.StatusID), StatusID: uint32(item.StatusID),
}) })
} }