parent
ccf1ff6866
commit
ca750669db
pkg/service
@ -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.Add("resource_type", model.ResourceMapfix)
|
filter.AddInt("resource_type", uint64(model.ResourceMapfix))
|
||||||
filter.Add("resource_id", params.MapfixID)
|
filter.AddInt("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,
|
||||||
@ -93,10 +93,10 @@ func (svc *Service) ListMapfixAuditEvents(ctx context.Context, params api.ListMa
|
|||||||
resp = append(resp, api.AuditEvent{
|
resp = append(resp, api.AuditEvent{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
Date: item.CreatedAt.Unix(),
|
Date: item.CreatedAt.Unix(),
|
||||||
User: int64(item.User),
|
User: item.User,
|
||||||
ResourceType: int32(item.ResourceType),
|
ResourceType: uint32(item.ResourceType),
|
||||||
ResourceID: item.ResourceID,
|
ResourceID: item.ResourceID,
|
||||||
EventType: int32(item.EventType),
|
EventType: uint32(item.EventType),
|
||||||
EventData: EventData,
|
EventData: EventData,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -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.Add("resource_type", model.ResourceSubmission)
|
filter.AddInt("resource_type", uint64(model.ResourceSubmission))
|
||||||
filter.Add("resource_id", params.SubmissionID)
|
filter.AddInt("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,
|
||||||
@ -188,10 +188,10 @@ func (svc *Service) ListSubmissionAuditEvents(ctx context.Context, params api.Li
|
|||||||
resp = append(resp, api.AuditEvent{
|
resp = append(resp, api.AuditEvent{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
Date: item.CreatedAt.Unix(),
|
Date: item.CreatedAt.Unix(),
|
||||||
User: int64(item.User),
|
User: item.User,
|
||||||
ResourceType: int32(item.ResourceType),
|
ResourceType: uint32(item.ResourceType),
|
||||||
ResourceID: item.ResourceID,
|
ResourceID: item.ResourceID,
|
||||||
EventType: int32(item.EventType),
|
EventType: uint32(item.EventType),
|
||||||
EventData: EventData,
|
EventData: EventData,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ func (svc *Service) CreateMapfix(ctx context.Context, request *api.MapfixTrigger
|
|||||||
filter.Add("status_id", CreationPhaseMapfixStatuses)
|
filter.Add("status_id", CreationPhaseMapfixStatuses)
|
||||||
creation_mapfixes, err := svc.DB.Mapfixes().List(ctx, filter, model.Page{
|
creation_mapfixes, err := svc.DB.Mapfixes().List(ctx, filter, model.Page{
|
||||||
Number: 1,
|
Number: 1,
|
||||||
Size: int32(CreationPhaseMapfixesLimit),
|
Size: uint32(CreationPhaseMapfixesLimit),
|
||||||
},datastore.ListSortDisabled)
|
},datastore.ListSortDisabled)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -137,7 +137,7 @@ func (svc *Service) CreateMapfix(ctx context.Context, request *api.MapfixTrigger
|
|||||||
//
|
//
|
||||||
// GET /mapfixes/{MapfixID}
|
// GET /mapfixes/{MapfixID}
|
||||||
func (svc *Service) GetMapfix(ctx context.Context, params api.GetMapfixParams) (*api.Mapfix, error) {
|
func (svc *Service) GetMapfix(ctx context.Context, params api.GetMapfixParams) (*api.Mapfix, error) {
|
||||||
mapfix, err := svc.DB.Mapfixes().Get(ctx, params.MapfixID)
|
mapfix, err := svc.DB.Mapfixes().Get(ctx, int64(params.MapfixID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -145,7 +145,7 @@ func (svc *Service) GetMapfix(ctx context.Context, params api.GetMapfixParams) (
|
|||||||
ID: mapfix.ID,
|
ID: mapfix.ID,
|
||||||
DisplayName: mapfix.DisplayName,
|
DisplayName: mapfix.DisplayName,
|
||||||
Creator: mapfix.Creator,
|
Creator: mapfix.Creator,
|
||||||
GameID: int32(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: int64(mapfix.Submitter),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user