Remove tenant service pattern
Signed-off-by: Bryan Frimin <bryan@probo.com>
This commit is contained in:
@@ -106,11 +106,12 @@ func (r *evidenceConnectionResolver) TotalCount(ctx context.Context, obj *types.
|
||||
return 0, err
|
||||
}
|
||||
|
||||
prb := r.ProboService(ctx, obj.ParentID.TenantID())
|
||||
scope := coredata.NewScopeFromObjectID(obj.ParentID)
|
||||
prb := r.probo
|
||||
|
||||
switch obj.Resolver.(type) {
|
||||
case *measureResolver:
|
||||
count, err := prb.Evidences.CountForMeasureID(ctx, obj.ParentID)
|
||||
count, err := prb.Evidences.CountForMeasureID(ctx, scope, obj.ParentID)
|
||||
if err != nil {
|
||||
r.logger.ErrorCtx(ctx, "cannot count measure evidence", log.Error(err))
|
||||
return 0, gqlutils.Internal(ctx)
|
||||
@@ -118,7 +119,7 @@ func (r *evidenceConnectionResolver) TotalCount(ctx context.Context, obj *types.
|
||||
|
||||
return count, nil
|
||||
case *taskResolver:
|
||||
count, err := prb.Evidences.CountForTaskID(ctx, obj.ParentID)
|
||||
count, err := prb.Evidences.CountForTaskID(ctx, scope, obj.ParentID)
|
||||
if err != nil {
|
||||
r.logger.ErrorCtx(ctx, "cannot count task evidence", log.Error(err))
|
||||
return 0, gqlutils.Internal(ctx)
|
||||
@@ -138,9 +139,10 @@ func (r *mutationResolver) DeleteEvidence(ctx context.Context, input types.Delet
|
||||
return nil, err
|
||||
}
|
||||
|
||||
prb := r.ProboService(ctx, input.EvidenceID.TenantID())
|
||||
scope := coredata.NewScopeFromObjectID(input.EvidenceID)
|
||||
prb := r.probo
|
||||
|
||||
err := prb.Evidences.Delete(ctx, input.EvidenceID)
|
||||
err := prb.Evidences.Delete(ctx, scope, input.EvidenceID)
|
||||
if err != nil {
|
||||
r.logger.ErrorCtx(ctx, "cannot delete evidence", log.Error(err))
|
||||
return nil, gqlutils.Internal(ctx)
|
||||
@@ -157,10 +159,11 @@ func (r *mutationResolver) UploadMeasureEvidence(ctx context.Context, input type
|
||||
return nil, err
|
||||
}
|
||||
|
||||
prb := r.ProboService(ctx, input.MeasureID.TenantID())
|
||||
scope := coredata.NewScopeFromObjectID(input.MeasureID)
|
||||
prb := r.probo
|
||||
|
||||
evidence, err := prb.Evidences.UploadMeasureEvidence(
|
||||
ctx,
|
||||
ctx, scope,
|
||||
probo.UploadMeasureEvidenceRequest{
|
||||
MeasureID: input.MeasureID,
|
||||
File: probo.FileUpload{
|
||||
|
||||
Reference in New Issue
Block a user