Merge pull request #1005 from checkmarble/feat/cases-inbox-exclude-assigned-filter

feat(case-manager): Add exclude assigned filter

Author: siiick

dto/case_dto.go

@@ -103,13 +103,14 @@ type CreateCaseCommentBody struct {
 }
 
 type CaseFilters struct {
-	EndDate        time.Time     `form:"end_date"`
-	InboxIds       []string      `form:"inbox_id[]"`
-	StartDate      time.Time     `form:"start_date"`
-	Statuses       []string      `form:"status[]"`
-	Name           string        `form:"name"`
-	IncludeSnoozed bool          `form:"include_snoozed"`
-	AssigneeId     models.UserId `form:"assignee_id"`
+	EndDate         time.Time     `form:"end_date"`
+	InboxIds        []string      `form:"inbox_id[]"`
+	StartDate       time.Time     `form:"start_date"`
+	Statuses        []string      `form:"status[]"`
+	Name            string        `form:"name"`
+	IncludeSnoozed  bool          `form:"include_snoozed"`
+	ExcludeAssigned bool          `form:"exclude_assigned"`
+	AssigneeId      models.UserId `form:"assignee_id"`
 }
 
 type ReviewCaseDecisionsBody struct {

models/case.go

@@ -113,14 +113,15 @@ type CreateCaseCommentAttributes struct {
 }
 
 type CaseFilters struct {
-	OrganizationId string
-	Name           string
-	StartDate      time.Time
-	EndDate        time.Time
-	Statuses       []CaseStatus
-	InboxIds       []string
-	IncludeSnoozed bool
-	AssigneeId     UserId
+	OrganizationId  string
+	Name            string
+	StartDate       time.Time
+	EndDate         time.Time
+	Statuses        []CaseStatus
+	InboxIds        []string
+	IncludeSnoozed  bool
+	ExcludeAssigned bool
+	AssigneeId      UserId
 }
 
 type CaseListPage struct {

repositories/case_repository.go

@@ -334,6 +334,9 @@ func applyCaseFilters(query squirrel.SelectBuilder, filters models.CaseFilters)
 			squirrel.LtOrEq{"snoozed_until": time.Now()},
 		})
 	}
+	if filters.ExcludeAssigned {
+		query = query.Where(squirrel.Eq{"assigned_to": nil})
+	}
 	if filters.AssigneeId != "" {
 		query = query.Where(squirrel.Eq{"assigned_to": filters.AssigneeId})
 	}

usecases/case_usecase.go

@@ -147,13 +147,14 @@ func (usecase *CaseUseCase) ListCases(
 			}
 
 			repoFilters := models.CaseFilters{
-				StartDate:      filters.StartDate,
-				EndDate:        filters.EndDate,
-				Statuses:       statuses,
-				OrganizationId: organizationId,
-				Name:           filters.Name,
-				IncludeSnoozed: filters.IncludeSnoozed,
-				AssigneeId:     filters.AssigneeId,
+				StartDate:       filters.StartDate,
+				EndDate:         filters.EndDate,
+				Statuses:        statuses,
+				OrganizationId:  organizationId,
+				Name:            filters.Name,
+				IncludeSnoozed:  filters.IncludeSnoozed,
+				ExcludeAssigned: filters.ExcludeAssigned,
+				AssigneeId:      filters.AssigneeId,
 			}
 			if len(filters.InboxIds) > 0 {
 				repoFilters.InboxIds = filters.InboxIds