forked from StrafesNET/maps-service
submissions: accept CheckList in internal changes requested
This commit is contained in:
@@ -122,7 +122,7 @@ func (svc *Service) ActionMapfixSubmitted(ctx context.Context, params internal.A
|
||||
// (Internal endpoint) Role Validator changes status from Submitting -> RequestChanges.
|
||||
//
|
||||
// POST /mapfixes/{MapfixID}/status/validator-request-changes
|
||||
func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params internal.ActionMapfixRequestChangesParams) error {
|
||||
func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, check_list internal.CheckList, params internal.ActionMapfixRequestChangesParams) error {
|
||||
// transaction
|
||||
target_status := model.MapfixStatusChangesRequested
|
||||
smap := datastore.Optional()
|
||||
@@ -133,8 +133,18 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params inter
|
||||
}
|
||||
|
||||
{
|
||||
event_data := model.AuditEventDataError{
|
||||
Error: params.ErrorMessage,
|
||||
check_list2 := make([]model.Check, len(check_list))
|
||||
for i, check := range check_list {
|
||||
check_list2[i] = model.Check{
|
||||
Name: check.Name,
|
||||
Summary: check.Summary,
|
||||
Passed: check.Passed,
|
||||
Details: check.Details,
|
||||
}
|
||||
}
|
||||
|
||||
event_data := model.AuditEventDataCheckReport{
|
||||
CheckList: check_list2,
|
||||
}
|
||||
|
||||
EventData, err := json.Marshal(event_data)
|
||||
|
||||
@@ -122,7 +122,7 @@ func (svc *Service) ActionSubmissionSubmitted(ctx context.Context, params intern
|
||||
// (Internal endpoint) Role Validator changes status from Submitting -> RequestChanges.
|
||||
//
|
||||
// POST /submissions/{SubmissionID}/status/validator-request-changes
|
||||
func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params internal.ActionSubmissionRequestChangesParams) error {
|
||||
func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, check_list internal.CheckList, params internal.ActionSubmissionRequestChangesParams) error {
|
||||
// transaction
|
||||
target_status := model.SubmissionStatusChangesRequested
|
||||
smap := datastore.Optional()
|
||||
@@ -134,8 +134,18 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params i
|
||||
|
||||
//push an error audit event
|
||||
{
|
||||
event_data := model.AuditEventDataError{
|
||||
Error: params.ErrorMessage,
|
||||
check_list2 := make([]model.Check, len(check_list))
|
||||
for i, check := range check_list {
|
||||
check_list2[i] = model.Check{
|
||||
Name: check.Name,
|
||||
Summary: check.Summary,
|
||||
Passed: check.Passed,
|
||||
Details: check.Details,
|
||||
}
|
||||
}
|
||||
|
||||
event_data := model.AuditEventDataCheckReport{
|
||||
CheckList: check_list2,
|
||||
}
|
||||
|
||||
EventData, err := json.Marshal(event_data)
|
||||
|
||||
Reference in New Issue
Block a user