fix: merge conflicts

Author: anjaliagg9791

api/handler/v1beta1/grant.go

@@ -17,55 +17,34 @@ import (
 
 func (s *GRPCServer) ListGrants(ctx context.Context, req *guardianv1beta1.ListGrantsRequest) (*guardianv1beta1.ListGrantsResponse, error) {
 	filter := domain.ListGrantsFilter{
-<<<<<<< HEAD
-		Q:                      req.GetQ(),
-		Statuses:               req.GetStatuses(),
-		AccountIDs:             req.GetAccountIds(),
-		AccountTypes:           req.GetAccountTypes(),
-		GroupIDs:               req.GetGroupIds(),
-		GroupTypes:             req.GetGroupTypes(),
-		ResourceIDs:            req.GetResourceIds(),
-		Roles:                  req.GetRoles(),
-		ProviderTypes:          req.GetProviderTypes(),
-		ProviderURNs:           req.GetProviderUrns(),
-		ResourceTypes:          req.GetResourceTypes(),
-		ResourceURNs:           req.GetResourceUrns(),
-		CreatedBy:              req.GetCreatedBy(),
-		Owner:                  req.GetOwner(),
-		OrderBy:                req.GetOrderBy(),
-		Size:                   int(req.GetSize()),
-		Offset:                 int(req.GetOffset()),
-		IncludeApprovalDetails: req.WithApprovals,
-		SummaryGroupBys:        slicesUtil.GenericsStandardizeSliceNilAble(req.GetSummaryGroupBys()),
-		SummaryUniques:         slicesUtil.GenericsStandardizeSliceNilAble(req.GetSummaryUniques()),
-		ExpiringInDays:         int(req.GetExpiringInDays()),
-		FieldMasks:             slicesUtil.GenericsStandardizeSliceNilAble(req.GetFieldMasks()),
-		WithPendingAppeal:      req.GetWithPendingAppeal(),
-		RoleStartsWith:         req.GetRoleStartsWith(),
-		RoleEndsWith:           req.GetRoleEndsWith(),
-		RoleContains:           req.GetRoleContains(),
-		StartTime:              s.adapter.FromTimeProto(req.GetStartTime()),
-		EndTime:                s.adapter.FromTimeProto(req.GetEndTime()),
-=======
-		Q:             req.GetQ(),
-		Statuses:      req.GetStatuses(),
-		AccountIDs:    req.GetAccountIds(),
-		AccountTypes:  req.GetAccountTypes(),
-		GroupIDs:      req.GetGroupIds(),
-		GroupTypes:    req.GetGroupTypes(),
-		ResourceIDs:   req.GetResourceIds(),
-		Roles:         req.GetRoles(),
-		ProviderTypes: req.GetProviderTypes(),
-		ProviderURNs:  req.GetProviderUrns(),
-		ResourceTypes: req.GetResourceTypes(),
-		ResourceURNs:  req.GetResourceUrns(),
-		CreatedBy:     req.GetCreatedBy(),
-		Owner:         req.GetOwner(),
-		OrderBy:       req.GetOrderBy(),
-		Size:          int(req.GetSize()),
-		Offset:        int(req.GetOffset()),
-		WithApprovals: req.WithApprovals,
->>>>>>> 3aa27bcf (fix: lint issues)
+		Q:                 req.GetQ(),
+		Statuses:          req.GetStatuses(),
+		AccountIDs:        req.GetAccountIds(),
+		AccountTypes:      req.GetAccountTypes(),
+		GroupIDs:          req.GetGroupIds(),
+		GroupTypes:        req.GetGroupTypes(),
+		ResourceIDs:       req.GetResourceIds(),
+		Roles:             req.GetRoles(),
+		ProviderTypes:     req.GetProviderTypes(),
+		ProviderURNs:      req.GetProviderUrns(),
+		ResourceTypes:     req.GetResourceTypes(),
+		ResourceURNs:      req.GetResourceUrns(),
+		CreatedBy:         req.GetCreatedBy(),
+		Owner:             req.GetOwner(),
+		OrderBy:           req.GetOrderBy(),
+		Size:              int(req.GetSize()),
+		Offset:            int(req.GetOffset()),
+		WithApprovals:     req.WithApprovals,
+		SummaryGroupBys:   slicesUtil.GenericsStandardizeSliceNilAble(req.GetSummaryGroupBys()),
+		SummaryUniques:    slicesUtil.GenericsStandardizeSliceNilAble(req.GetSummaryUniques()),
+		ExpiringInDays:    int(req.GetExpiringInDays()),
+		FieldMasks:        slicesUtil.GenericsStandardizeSliceNilAble(req.GetFieldMasks()),
+		WithPendingAppeal: req.GetWithPendingAppeal(),
+		RoleStartsWith:    req.GetRoleStartsWith(),
+		RoleEndsWith:      req.GetRoleEndsWith(),
+		RoleContains:      req.GetRoleContains(),
+		StartTime:         s.adapter.FromTimeProto(req.GetStartTime()),
+		EndTime:           s.adapter.FromTimeProto(req.GetEndTime()),
 	}
 
 	grants, total, summary, err := s.listGrants(ctx, filter)