Change response for relay compatible one

Signed-off-by: Bryan Frimin <bryan@getprobo.com>

pkg/probo/risk_service.go

@@ -124,27 +124,58 @@ func (s RiskService) CreateMeasureMapping(
 	ctx context.Context,
 	riskID gid.GID,
 	measureID gid.GID,
-) error {
+) (*coredata.Risk, *coredata.Measure, error) {
+	measure := &coredata.Measure{}
+	risk := &coredata.Risk{}
+
+	err := s.svc.pg.WithConn(
+		ctx,
+		func(conn pg.Conn) error {
+			if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil {
+				return fmt.Errorf("cannot load risk: %w", err)
+			}
+
+			if err := measure.LoadByID(ctx, conn, s.svc.scope, measureID); err != nil {
+				return fmt.Errorf("cannot load measure: %w", err)
+			}
+
 			riskMeasure := &coredata.RiskMeasure{
-		RiskID:    riskID,
+				RiskID:    risk.ID,
-		MeasureID: measureID,
+				MeasureID: measure.ID,
 				TenantID:  s.svc.scope.GetTenantID(),
 				CreatedAt: time.Now(),
 			}
 
-	return s.svc.pg.WithConn(
-		ctx,
-		func(conn pg.Conn) error {
 			return riskMeasure.Insert(ctx, conn, s.svc.scope)
 		},
 	)
+
+	if err != nil {
+		return nil, nil, fmt.Errorf("cannot create risk measure mapping: %w", err)
+	}
+
+	return risk, measure, nil
 }
 
 func (s RiskService) DeleteMeasureMapping(
 	ctx context.Context,
 	riskID gid.GID,
 	measureID gid.GID,
-) error {
+) (*coredata.Risk, *coredata.Measure, error) {
+	risk := &coredata.Risk{}
+	measure := &coredata.Measure{}
+
+	err := s.svc.pg.WithConn(
+		ctx,
+		func(conn pg.Conn) error {
+			if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil {
+				return fmt.Errorf("cannot load risk: %w", err)
+			}
+
+			if err := measure.LoadByID(ctx, conn, s.svc.scope, measureID); err != nil {
+				return fmt.Errorf("cannot load measure: %w", err)
+			}
+
 			riskMeasure := &coredata.RiskMeasure{
 				RiskID:    riskID,
 				MeasureID: measureID,
@@ -152,12 +183,15 @@ func (s RiskService) DeleteMeasureMapping(
 				CreatedAt: time.Now(),
 			}
 
-	return s.svc.pg.WithConn(
-		ctx,
-		func(conn pg.Conn) error {
 			return riskMeasure.Delete(ctx, conn, s.svc.scope)
 		},
 	)
+
+	if err != nil {
+		return nil, nil, fmt.Errorf("cannot delete risk measure mapping: %w", err)
+	}
+
+	return risk, measure, nil
 }
 
 func (s RiskService) Create(
@@ -198,6 +232,13 @@ func (s RiskService) Create(
 	err := s.svc.pg.WithConn(
 		ctx,
 		func(conn pg.Conn) error {
+			if req.OwnerID != nil {
+				people := coredata.People{}
+				if err := people.LoadByID(ctx, conn, s.svc.scope, *req.OwnerID); err != nil {
+					return fmt.Errorf("cannot load owner: %w", err)
+				}
+			}
+
 			return risk.Insert(ctx, conn, s.svc.scope)
 		},
 	)

pkg/server/api/console/v1/schema.graphql

@@ -1496,11 +1496,13 @@ type DeleteRiskPayload {
 }
 
 type CreateRiskMeasureMappingPayload {
-  success: Boolean!
+  riskEdge: RiskEdge!
+  measureEdge: MeasureEdge!
 }
 
 type DeleteRiskMeasureMappingPayload {
-  success: Boolean!
+  deletedMeasureId: ID!
+  deletedRiskId: ID!
 }
 
 type CreateRiskPolicyMappingPayload {

pkg/server/api/console/v1/schema/schema.go

@@ -151,7 +151,8 @@ type ComplexityRoot struct {
 	}
 
 	CreateRiskMeasureMappingPayload struct {
-		Success func(childComplexity int) int
+		MeasureEdge func(childComplexity int) int
+		RiskEdge    func(childComplexity int) int
 	}
 
 	CreateRiskPayload struct {
@@ -207,7 +208,8 @@ type ComplexityRoot struct {
 	}
 
 	DeleteRiskMeasureMappingPayload struct {
-		Success func(childComplexity int) int
+		DeletedMeasureID func(childComplexity int) int
+		DeletedRiskID    func(childComplexity int) int
 	}
 
 	DeleteRiskPayload struct {
@@ -1156,12 +1158,19 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin
 
 		return e.complexity.CreatePolicyPayload.PolicyVersionEdge(childComplexity), true
 
-	case "CreateRiskMeasureMappingPayload.success":
+	case "CreateRiskMeasureMappingPayload.measureEdge":
-		if e.complexity.CreateRiskMeasureMappingPayload.Success == nil {
+		if e.complexity.CreateRiskMeasureMappingPayload.MeasureEdge == nil {
 			break
 		}
 
-		return e.complexity.CreateRiskMeasureMappingPayload.Success(childComplexity), true
+		return e.complexity.CreateRiskMeasureMappingPayload.MeasureEdge(childComplexity), true
+
+	case "CreateRiskMeasureMappingPayload.riskEdge":
+		if e.complexity.CreateRiskMeasureMappingPayload.RiskEdge == nil {
+			break
+		}
+
+		return e.complexity.CreateRiskMeasureMappingPayload.RiskEdge(childComplexity), true
 
 	case "CreateRiskPayload.riskEdge":
 		if e.complexity.CreateRiskPayload.RiskEdge == nil {
@@ -1254,12 +1263,19 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin
 
 		return e.complexity.DeletePolicyPayload.DeletedPolicyID(childComplexity), true
 
-	case "DeleteRiskMeasureMappingPayload.success":
+	case "DeleteRiskMeasureMappingPayload.deletedMeasureId":
-		if e.complexity.DeleteRiskMeasureMappingPayload.Success == nil {
+		if e.complexity.DeleteRiskMeasureMappingPayload.DeletedMeasureID == nil {
 			break
 		}
 
-		return e.complexity.DeleteRiskMeasureMappingPayload.Success(childComplexity), true
+		return e.complexity.DeleteRiskMeasureMappingPayload.DeletedMeasureID(childComplexity), true
+
+	case "DeleteRiskMeasureMappingPayload.deletedRiskId":
+		if e.complexity.DeleteRiskMeasureMappingPayload.DeletedRiskID == nil {
+			break
+		}
+
+		return e.complexity.DeleteRiskMeasureMappingPayload.DeletedRiskID(childComplexity), true
 
 	case "DeleteRiskPayload.deletedRiskId":
 		if e.complexity.DeleteRiskPayload.DeletedRiskID == nil {
@@ -5467,11 +5483,13 @@ type DeleteRiskPayload {
 }
 
 type CreateRiskMeasureMappingPayload {
-  success: Boolean!
+  riskEdge: RiskEdge!
+  measureEdge: MeasureEdge!
 }
 
 type DeleteRiskMeasureMappingPayload {
-  success: Boolean!
+  deletedMeasureId: ID!
+  deletedRiskId: ID!
 }
 
 type CreateRiskPolicyMappingPayload {
@@ -11276,8 +11294,8 @@ func (ec *executionContext) fieldContext_CreatePolicyPayload_policyVersionEdge(_
 	return fc, nil
 }
 
-func (ec *executionContext) _CreateRiskMeasureMappingPayload_success(ctx context.Context, field graphql.CollectedField, obj *types.CreateRiskMeasureMappingPayload) (ret graphql.Marshaler) {
+func (ec *executionContext) _CreateRiskMeasureMappingPayload_riskEdge(ctx context.Context, field graphql.CollectedField, obj *types.CreateRiskMeasureMappingPayload) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_CreateRiskMeasureMappingPayload_success(ctx, field)
+	fc, err := ec.fieldContext_CreateRiskMeasureMappingPayload_riskEdge(ctx, field)
 	if err != nil {
 		return graphql.Null
 	}
@@ -11290,7 +11308,7 @@ func (ec *executionContext) _CreateRiskMeasureMappingPayload_success(ctx context
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
 		ctx = rctx // use context from middleware stack in children
-		return obj.Success, nil
+		return obj.RiskEdge, nil
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -11302,19 +11320,75 @@ func (ec *executionContext) _CreateRiskMeasureMappingPayload_success(ctx context
 		}
 		return graphql.Null
 	}
-	res := resTmp.(bool)
+	res := resTmp.(*types.RiskEdge)
 	fc.Result = res
-	return ec.marshalNBoolean2bool(ctx, field.Selections, res)
+	return ec.marshalNRiskEdge2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐRiskEdge(ctx, field.Selections, res)
 }
 
-func (ec *executionContext) fieldContext_CreateRiskMeasureMappingPayload_success(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+func (ec *executionContext) fieldContext_CreateRiskMeasureMappingPayload_riskEdge(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
 	fc = &graphql.FieldContext{
 		Object:     "CreateRiskMeasureMappingPayload",
 		Field:      field,
 		IsMethod:   false,
 		IsResolver: false,
 		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
-			return nil, errors.New("field of type Boolean does not have child fields")
+			switch field.Name {
+			case "cursor":
+				return ec.fieldContext_RiskEdge_cursor(ctx, field)
+			case "node":
+				return ec.fieldContext_RiskEdge_node(ctx, field)
+			}
+			return nil, fmt.Errorf("no field named %q was found under type RiskEdge", field.Name)
+		},
+	}
+	return fc, nil
+}
+
+func (ec *executionContext) _CreateRiskMeasureMappingPayload_measureEdge(ctx context.Context, field graphql.CollectedField, obj *types.CreateRiskMeasureMappingPayload) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_CreateRiskMeasureMappingPayload_measureEdge(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
+		ctx = rctx // use context from middleware stack in children
+		return obj.MeasureEdge, nil
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		if !graphql.HasFieldError(ctx, fc) {
+			ec.Errorf(ctx, "must not be null")
+		}
+		return graphql.Null
+	}
+	res := resTmp.(*types.MeasureEdge)
+	fc.Result = res
+	return ec.marshalNMeasureEdge2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐMeasureEdge(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_CreateRiskMeasureMappingPayload_measureEdge(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "CreateRiskMeasureMappingPayload",
+		Field:      field,
+		IsMethod:   false,
+		IsResolver: false,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			switch field.Name {
+			case "cursor":
+				return ec.fieldContext_MeasureEdge_cursor(ctx, field)
+			case "node":
+				return ec.fieldContext_MeasureEdge_node(ctx, field)
+			}
+			return nil, fmt.Errorf("no field named %q was found under type MeasureEdge", field.Name)
 		},
 	}
 	return fc, nil
@@ -11916,8 +11990,8 @@ func (ec *executionContext) fieldContext_DeletePolicyPayload_deletedPolicyId(_ c
 	return fc, nil
 }
 
-func (ec *executionContext) _DeleteRiskMeasureMappingPayload_success(ctx context.Context, field graphql.CollectedField, obj *types.DeleteRiskMeasureMappingPayload) (ret graphql.Marshaler) {
+func (ec *executionContext) _DeleteRiskMeasureMappingPayload_deletedMeasureId(ctx context.Context, field graphql.CollectedField, obj *types.DeleteRiskMeasureMappingPayload) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_DeleteRiskMeasureMappingPayload_success(ctx, field)
+	fc, err := ec.fieldContext_DeleteRiskMeasureMappingPayload_deletedMeasureId(ctx, field)
 	if err != nil {
 		return graphql.Null
 	}
@@ -11930,7 +12004,7 @@ func (ec *executionContext) _DeleteRiskMeasureMappingPayload_success(ctx context
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
 		ctx = rctx // use context from middleware stack in children
-		return obj.Success, nil
+		return obj.DeletedMeasureID, nil
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -11942,19 +12016,63 @@ func (ec *executionContext) _DeleteRiskMeasureMappingPayload_success(ctx context
 		}
 		return graphql.Null
 	}
-	res := resTmp.(bool)
+	res := resTmp.(gid.GID)
 	fc.Result = res
-	return ec.marshalNBoolean2bool(ctx, field.Selections, res)
+	return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res)
 }
 
-func (ec *executionContext) fieldContext_DeleteRiskMeasureMappingPayload_success(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+func (ec *executionContext) fieldContext_DeleteRiskMeasureMappingPayload_deletedMeasureId(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
 	fc = &graphql.FieldContext{
 		Object:     "DeleteRiskMeasureMappingPayload",
 		Field:      field,
 		IsMethod:   false,
 		IsResolver: false,
 		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
-			return nil, errors.New("field of type Boolean does not have child fields")
+			return nil, errors.New("field of type ID does not have child fields")
+		},
+	}
+	return fc, nil
+}
+
+func (ec *executionContext) _DeleteRiskMeasureMappingPayload_deletedRiskId(ctx context.Context, field graphql.CollectedField, obj *types.DeleteRiskMeasureMappingPayload) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_DeleteRiskMeasureMappingPayload_deletedRiskId(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
+		ctx = rctx // use context from middleware stack in children
+		return obj.DeletedRiskID, nil
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		if !graphql.HasFieldError(ctx, fc) {
+			ec.Errorf(ctx, "must not be null")
+		}
+		return graphql.Null
+	}
+	res := resTmp.(gid.GID)
+	fc.Result = res
+	return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_DeleteRiskMeasureMappingPayload_deletedRiskId(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "DeleteRiskMeasureMappingPayload",
+		Field:      field,
+		IsMethod:   false,
+		IsResolver: false,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			return nil, errors.New("field of type ID does not have child fields")
 		},
 	}
 	return fc, nil
@@ -16507,8 +16625,10 @@ func (ec *executionContext) fieldContext_Mutation_createRiskMeasureMapping(ctx c
 		IsResolver: true,
 		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
 			switch field.Name {
-			case "success":
+			case "riskEdge":
-				return ec.fieldContext_CreateRiskMeasureMappingPayload_success(ctx, field)
+				return ec.fieldContext_CreateRiskMeasureMappingPayload_riskEdge(ctx, field)
+			case "measureEdge":
+				return ec.fieldContext_CreateRiskMeasureMappingPayload_measureEdge(ctx, field)
 			}
 			return nil, fmt.Errorf("no field named %q was found under type CreateRiskMeasureMappingPayload", field.Name)
 		},
@@ -16566,8 +16686,10 @@ func (ec *executionContext) fieldContext_Mutation_deleteRiskMeasureMapping(ctx c
 		IsResolver: true,
 		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
 			switch field.Name {
-			case "success":
+			case "deletedMeasureId":
-				return ec.fieldContext_DeleteRiskMeasureMappingPayload_success(ctx, field)
+				return ec.fieldContext_DeleteRiskMeasureMappingPayload_deletedMeasureId(ctx, field)
+			case "deletedRiskId":
+				return ec.fieldContext_DeleteRiskMeasureMappingPayload_deletedRiskId(ctx, field)
 			}
 			return nil, fmt.Errorf("no field named %q was found under type DeleteRiskMeasureMappingPayload", field.Name)
 		},
@@ -33993,8 +34115,13 @@ func (ec *executionContext) _CreateRiskMeasureMappingPayload(ctx context.Context
 		switch field.Name {
 		case "__typename":
 			out.Values[i] = graphql.MarshalString("CreateRiskMeasureMappingPayload")
-		case "success":
+		case "riskEdge":
-			out.Values[i] = ec._CreateRiskMeasureMappingPayload_success(ctx, field, obj)
+			out.Values[i] = ec._CreateRiskMeasureMappingPayload_riskEdge(ctx, field, obj)
+			if out.Values[i] == graphql.Null {
+				out.Invalids++
+			}
+		case "measureEdge":
+			out.Values[i] = ec._CreateRiskMeasureMappingPayload_measureEdge(ctx, field, obj)
 			if out.Values[i] == graphql.Null {
 				out.Invalids++
 			}
@@ -34539,8 +34666,13 @@ func (ec *executionContext) _DeleteRiskMeasureMappingPayload(ctx context.Context
 		switch field.Name {
 		case "__typename":
 			out.Values[i] = graphql.MarshalString("DeleteRiskMeasureMappingPayload")
-		case "success":
+		case "deletedMeasureId":
-			out.Values[i] = ec._DeleteRiskMeasureMappingPayload_success(ctx, field, obj)
+			out.Values[i] = ec._DeleteRiskMeasureMappingPayload_deletedMeasureId(ctx, field, obj)
+			if out.Values[i] == graphql.Null {
+				out.Invalids++
+			}
+		case "deletedRiskId":
+			out.Values[i] = ec._DeleteRiskMeasureMappingPayload_deletedRiskId(ctx, field, obj)
 			if out.Values[i] == graphql.Null {
 				out.Invalids++
 			}

pkg/server/api/console/v1/types/types.go

@@ -200,7 +200,8 @@ type CreateRiskMeasureMappingInput struct {
 }
 
 type CreateRiskMeasureMappingPayload struct {
-	Success bool `json:"success"`
+	RiskEdge    *RiskEdge    `json:"riskEdge"`
+	MeasureEdge *MeasureEdge `json:"measureEdge"`
 }
 
 type CreateRiskPayload struct {
@@ -342,7 +343,8 @@ type DeleteRiskMeasureMappingInput struct {
 }
 
 type DeleteRiskMeasureMappingPayload struct {
-	Success bool `json:"success"`
+	DeletedMeasureID gid.GID `json:"deletedMeasureId"`
+	DeletedRiskID    gid.GID `json:"deletedRiskId"`
 }
 
 type DeleteRiskPayload struct {

pkg/server/api/console/v1/v1_resolver.go

@@ -919,13 +919,14 @@ func (r *mutationResolver) DeleteRisk(ctx context.Context, input types.DeleteRis
 func (r *mutationResolver) CreateRiskMeasureMapping(ctx context.Context, input types.CreateRiskMeasureMappingInput) (*types.CreateRiskMeasureMappingPayload, error) {
 	svc := GetTenantService(ctx, r.proboSvc, input.RiskID.TenantID())
 
-	err := svc.Risks.CreateMeasureMapping(ctx, input.RiskID, input.MeasureID)
+	risk, measure, err := svc.Risks.CreateMeasureMapping(ctx, input.RiskID, input.MeasureID)
 	if err != nil {
 		panic(fmt.Errorf("cannot create risk measure mapping: %w", err))
 	}
 
 	return &types.CreateRiskMeasureMappingPayload{
-		Success: true,
+		RiskEdge:    types.NewRiskEdge(risk, coredata.RiskOrderFieldCreatedAt),
+		MeasureEdge: types.NewMeasureEdge(measure, coredata.MeasureOrderFieldCreatedAt),
 	}, nil
 }
 
@@ -933,13 +934,14 @@ func (r *mutationResolver) CreateRiskMeasureMapping(ctx context.Context, input t
 func (r *mutationResolver) DeleteRiskMeasureMapping(ctx context.Context, input types.DeleteRiskMeasureMappingInput) (*types.DeleteRiskMeasureMappingPayload, error) {
 	svc := GetTenantService(ctx, r.proboSvc, input.RiskID.TenantID())
 
-	err := svc.Risks.DeleteMeasureMapping(ctx, input.RiskID, input.MeasureID)
+	risk, measure, err := svc.Risks.DeleteMeasureMapping(ctx, input.RiskID, input.MeasureID)
 	if err != nil {
 		panic(fmt.Errorf("cannot delete risk measure mapping: %w", err))
 	}
 
 	return &types.DeleteRiskMeasureMappingPayload{
-		Success: true,
+		DeletedRiskID:    risk.ID,
+		DeletedMeasureID: measure.ID,
 	}, nil
 }