feat(tickets)!: remove ticketState, it reads open on every ticket

contract/battery.go

@@ -170,8 +170,6 @@ func Cases() []Case {
 			Notes: "All seeded tickets, last activity DESC; empty next_cursor, has_more false."},
 		{Name: "tickets/list_repeated_status_filter", Method: "GET", Path: "/api/v1/tickets?status_id=1&status_id=5", Auth: AuthReadTickets,
 			Notes: "Repeated query params build a repeated field: tickets 43 and 42 only."},
-		{Name: "tickets/list_state_filter", Method: "GET", Path: "/api/v1/tickets?ticket_state=resolved", Auth: AuthReadTickets,
-			Notes: "String filter: resolved only."},
 		{Name: "tickets/list_category_includes_subcategories", Method: "GET", Path: "/api/v1/tickets?category_id=1", Auth: AuthReadTickets,
 			Notes: "Category filter expands the subtree by default: parent 1 pulls in child category 5."},
 		{Name: "tickets/list_category_exclude_subcategories", Method: "GET", Path: "/api/v1/tickets?category_id=1&exclude_subcategories=true", Auth: AuthReadTickets,

contract/fake_datastore_test.go

@@ -405,7 +405,6 @@ func seedTickets() []*types.Ticket {
 			CategoryId:          5,
 			CategoryTitle:       "S1 Personnel",
 			CategoryAncestorIds: []uint32{1},
-			TicketState:         "open",
 			StatusId:            2,
 			StatusName:          "In Progress",
 			PriorityId:          2,
@@ -439,7 +438,6 @@ func seedTickets() []*types.Ticket {
 			CategoryId:          7,
 			CategoryTitle:       "S6 Technical Support",
 			CategoryAncestorIds: []uint32{},
-			TicketState:         "resolved",
 			StatusId:            5,
 			StatusName:          "Resolved",
 			PriorityId:          1,
@@ -465,7 +463,6 @@ func seedTickets() []*types.Ticket {
 			CategoryId:          1,
 			CategoryTitle:       "Recruiting",
 			CategoryAncestorIds: []uint32{},
-			TicketState:         "open",
 			StatusId:            1,
 			StatusName:          "New",
 			PriorityId:          3,
@@ -632,9 +629,6 @@ func matchTicket(t *types.Ticket, f *datastores.ListTicketsFilter) bool {
 			return false
 		}
 	}
-	if len(f.TicketStates) > 0 && !containsStr(f.TicketStates, t.TicketState) {
-		return false
-	}
 	if len(f.StatusIDs) > 0 && !containsU32(f.StatusIDs, t.StatusId) {
 		return false
 	}
@@ -662,15 +656,6 @@ func containsU32(haystack []uint32, needle uint32) bool {
 	return false
 }
 
-func containsStr(haystack []string, needle string) bool {
-	for _, v := range haystack {
-		if v == needle {
-			return true
-		}
-	}
-	return false
-}
-
 func (recordingDatastore) GetTicket(_ context.Context, _ datastores.TicketReferenceCache, ticketID uint32, _ string) (*types.Ticket, error) {
 	for _, t := range seedTickets() {
 		if t.TicketId == ticketID {

contract/goldens/tickets/get_by_id_happy.golden.json

@@ -76,7 +76,6 @@
       "ticketId": 42,
       "ticketLocked": false,
       "ticketRef": "MF1UI9HE",
-      "ticketState": "open",
       "title": "Enlistment — John.Doe",
       "totalMessageCount": 3
     },

contract/goldens/tickets/get_by_ref_happy.golden.json

@@ -76,7 +76,6 @@
       "ticketId": 42,
       "ticketLocked": false,
       "ticketRef": "MF1UI9HE",
-      "ticketState": "open",
       "title": "Enlistment — John.Doe",
       "totalMessageCount": 3
     },

contract/goldens/tickets/list_category_exclude_subcategories.golden.json

@@ -38,7 +38,6 @@
         "ticketId": 42,
         "ticketLocked": false,
         "ticketRef": "MF1UI9HE",
-        "ticketState": "open",
         "title": "Enlistment — John.Doe",
         "totalMessageCount": 3
       }

contract/goldens/tickets/list_category_includes_subcategories.golden.json

@@ -45,7 +45,6 @@
         "ticketId": 44,
         "ticketLocked": false,
         "ticketRef": "ZZTOP44Q",
-        "ticketState": "open",
         "title": "Transfer request: Bravo to Alpha",
         "totalMessageCount": 2
       },
@@ -83,7 +82,6 @@
         "ticketId": 42,
         "ticketLocked": false,
         "ticketRef": "MF1UI9HE",
-        "ticketState": "open",
         "title": "Enlistment — John.Doe",
         "totalMessageCount": 3
       }

contract/goldens/tickets/list_default.golden.json

@@ -45,7 +45,6 @@
         "ticketId": 44,
         "ticketLocked": false,
         "ticketRef": "ZZTOP44Q",
-        "ticketState": "open",
         "title": "Transfer request: Bravo to Alpha",
         "totalMessageCount": 2
       },
@@ -76,7 +75,6 @@
         "ticketId": 43,
         "ticketLocked": false,
         "ticketRef": "QQWW43RR",
-        "ticketState": "resolved",
         "title": "TeamSpeak <connection> issues & errors",
         "totalMessageCount": 1
       },
@@ -114,7 +112,6 @@
         "ticketId": 42,
         "ticketLocked": false,
         "ticketRef": "MF1UI9HE",
-        "ticketState": "open",
         "title": "Enlistment — John.Doe",
         "totalMessageCount": 3
       }

contract/goldens/tickets/list_page_two.golden.json

@@ -31,7 +31,6 @@
         "ticketId": 43,
         "ticketLocked": false,
         "ticketRef": "QQWW43RR",
-        "ticketState": "resolved",
         "title": "TeamSpeak <connection> issues & errors",
         "totalMessageCount": 1
       }

contract/goldens/tickets/list_per_page_camel.golden.json

@@ -45,7 +45,6 @@
         "ticketId": 44,
         "ticketLocked": false,
         "ticketRef": "ZZTOP44Q",
-        "ticketState": "open",
         "title": "Transfer request: Bravo to Alpha",
         "totalMessageCount": 2
       }

contract/goldens/tickets/list_per_page_snake.golden.json

@@ -45,7 +45,6 @@
         "ticketId": 44,
         "ticketLocked": false,
         "ticketRef": "ZZTOP44Q",
-        "ticketState": "open",
         "title": "Transfer request: Bravo to Alpha",
         "totalMessageCount": 2
       }

contract/goldens/tickets/list_repeated_status_filter.golden.json

@@ -31,7 +31,6 @@
         "ticketId": 43,
         "ticketLocked": false,
         "ticketRef": "QQWW43RR",
-        "ticketState": "resolved",
         "title": "TeamSpeak <connection> issues & errors",
         "totalMessageCount": 1
       },
@@ -69,7 +68,6 @@
         "ticketId": 42,
         "ticketLocked": false,
         "ticketRef": "MF1UI9HE",
-        "ticketState": "open",
         "title": "Enlistment — John.Doe",
         "totalMessageCount": 3
       }

contract/goldens/tickets/list_starter_filter.golden.json

@@ -45,7 +45,6 @@
         "ticketId": 44,
         "ticketLocked": false,
         "ticketRef": "ZZTOP44Q",
-        "ticketState": "open",
         "title": "Transfer request: Bravo to Alpha",
         "totalMessageCount": 2
       },
@@ -83,7 +82,6 @@
         "ticketId": 42,
         "ticketLocked": false,
         "ticketRef": "MF1UI9HE",
-        "ticketState": "open",
         "title": "Enlistment — John.Doe",
         "totalMessageCount": 3
       }

contract/goldens/tickets/list_unknown_param_ignored.golden.json

@@ -45,7 +45,6 @@
         "ticketId": 44,
         "ticketLocked": false,
         "ticketRef": "ZZTOP44Q",
-        "ticketState": "open",
         "title": "Transfer request: Bravo to Alpha",
         "totalMessageCount": 2
       },
@@ -76,7 +75,6 @@
         "ticketId": 43,
         "ticketLocked": false,
         "ticketRef": "QQWW43RR",
-        "ticketState": "resolved",
         "title": "TeamSpeak <connection> issues & errors",
         "totalMessageCount": 1
       },
@@ -114,7 +112,6 @@
         "ticketId": 42,
         "ticketLocked": false,
         "ticketRef": "MF1UI9HE",
-        "ticketState": "open",
         "title": "Enlistment — John.Doe",
         "totalMessageCount": 3
       }

datastores/tickets.go

@@ -20,7 +20,6 @@ import (
 type ListTicketsFilter struct {
 	CategoryIDs          []uint32
 	ExcludeSubcategories bool
-	TicketStates         []string
 	StatusIDs            []uint32
 	PrefixIDs            []uint32
 	AssignedUserIDs      []uint32
@@ -154,9 +153,6 @@ func (ds *Mysql) ListTickets(ctx context.Context, rc TicketReferenceCache, f *Li
 		}
 		q = q.Where("ticket_category_id IN ?", ids)
 	}
-	if len(f.TicketStates) > 0 {
-		q = q.Where("ticket_state IN ?", f.TicketStates)
-	}
 	if len(f.StatusIDs) > 0 {
 		q = q.Where("status_id IN ?", f.StatusIDs)
 	}
@@ -276,7 +272,6 @@ func generateTicketProto(t *xenforo.Ticket, rc TicketReferenceCache, forumBase s
 		Title:               t.Title,
 		CategoryId:          t.TicketCategoryID,
 		CategoryAncestorIds: ancestors,
-		TicketState:         t.TicketState,
 		StatusId:            t.StatusID,
 		StatusName:          rc.StatusName(t.StatusID),
 		PriorityId:          t.Priority,

datastores/tickets_harness_test.go

@@ -80,8 +80,8 @@ func TestListTickets_HydratesTicketShape(t *testing.T) {
 	if len(got.CategoryAncestorIds) != 0 {
 		t.Errorf("root category has no ancestors, got %v", got.CategoryAncestorIds)
 	}
-	if got.TicketState != "open" || got.DiscussionState != "visible" || got.TicketLocked {
-		t.Errorf("state = %q/%q locked=%v", got.TicketState, got.DiscussionState, got.TicketLocked)
+	if got.DiscussionState != "visible" || got.TicketLocked {
+		t.Errorf("state = %q locked=%v", got.DiscussionState, got.TicketLocked)
 	}
 	if got.StarterUserId != 400 || got.StarterUsername != "TicketGuy.G" {
 		t.Errorf("starter = %d %q", got.StarterUserId, got.StarterUsername)
@@ -188,7 +188,6 @@ func TestListTickets_Filters(t *testing.T) {
 	}{
 		{"status ids", datastores.ListTicketsFilter{StatusIDs: []uint32{3}}, []uint32{4, 7}},
 		{"repeated status ids", datastores.ListTicketsFilter{StatusIDs: []uint32{2, 3}}, []uint32{2, 4, 7, 6}},
-		{"ticket states", datastores.ListTicketsFilter{TicketStates: []string{"resolved"}}, []uint32{4, 7}},
 		{"prefix ids", datastores.ListTicketsFilter{PrefixIDs: []uint32{1}}, []uint32{2, 7}},
 		{"assigned user", datastores.ListTicketsFilter{AssignedUserIDs: []uint32{401}}, []uint32{9, 1, 2, 4, 7, 6}},
 		{"starter user", datastores.ListTicketsFilter{StarterUserIDs: []uint32{400}}, []uint32{1}},

openapi/openapi.yaml

@@ -678,13 +678,6 @@ paths:
           required: false
           schema:
             type: boolean
-        - name: ticketState
-          in: query
-          required: false
-          schema:
-            type: array
-            items:
-              type: string
         - name: statusId
           in: query
           required: false
@@ -1721,8 +1714,6 @@ components:
           items:
             type: integer
             minimum: 0
-        ticketState:
-          type: string
         statusId:
           type: integer
           minimum: 0
@@ -1807,7 +1798,6 @@ components:
         - categoryId
         - categoryTitle
         - categoryAncestorIds
-        - ticketState
         - statusId
         - statusName
         - priorityId

rest/fake_tickets_test.go

@@ -33,7 +33,6 @@ func seedTickets() []*types.Ticket {
 			CategoryId:          5,
 			CategoryTitle:       "S1 Personnel",
 			CategoryAncestorIds: []uint32{1},
-			TicketState:         "open",
 			StatusId:            2,
 			StatusName:          "In Progress",
 			PriorityId:          2,
@@ -67,7 +66,6 @@ func seedTickets() []*types.Ticket {
 			CategoryId:          7,
 			CategoryTitle:       "S6 Technical Support",
 			CategoryAncestorIds: []uint32{},
-			TicketState:         "resolved",
 			StatusId:            5,
 			StatusName:          "Resolved",
 			PriorityId:          1,
@@ -93,7 +91,6 @@ func seedTickets() []*types.Ticket {
 			CategoryId:          1,
 			CategoryTitle:       "Recruiting",
 			CategoryAncestorIds: []uint32{},
-			TicketState:         "open",
 			StatusId:            1,
 			StatusName:          "New",
 			PriorityId:          3,
@@ -264,9 +261,6 @@ func matchTicket(t *types.Ticket, f *datastores.ListTicketsFilter) bool {
 			return false
 		}
 	}
-	if len(f.TicketStates) > 0 && !containsStr(f.TicketStates, t.TicketState) {
-		return false
-	}
 	if len(f.StatusIDs) > 0 && !containsU32(f.StatusIDs, t.StatusId) {
 		return false
 	}
@@ -294,15 +288,6 @@ func containsU32(haystack []uint32, needle uint32) bool {
 	return false
 }
 
-func containsStr(haystack []string, needle string) bool {
-	for _, v := range haystack {
-		if v == needle {
-			return true
-		}
-	}
-	return false
-}
-
 func (f *fakeDatastore) GetTicket(_ context.Context, rc datastores.TicketReferenceCache, ticketID uint32, _ string) (*types.Ticket, error) {
 	f.lastRC = rc
 	if f.getTicket != nil {

rest/query.go

@@ -117,8 +117,7 @@ func (b *queryBinder) bracketGroups(snake string) [][]string {
 // the cross-group order here is the deterministic ruling. nil when absent.
 // Always a fresh slice once anything joins the snake values: appending onto
 // b.values[snake] directly would write into the url.Values backing array
-// when it has spare capacity (and stringSliceField hands the result to
-// callers).
+// when it has spare capacity.
 func (b *queryBinder) raw(snake string) []string {
 	vals := b.values[snake]
 	var camelVals []string
@@ -191,10 +190,6 @@ func (b *queryBinder) stringField(snake string) string {
 	return vals[len(vals)-1] // camel wins (ruling, see package comment)
 }
 
-func (b *queryBinder) stringSliceField(snake string) []string {
-	return b.raw(snake)
-}
-
 func (b *queryBinder) uint32Field(snake string) uint32 {
 	var out uint32
 	for _, raw := range b.scalar(snake) {