@@ -163,10 +163,13 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
163163 }
164164
165165 var discussions []* github.Discussion
166- queries := & discussionQueries {}
166+ queries := & discussionQueries {}
167167
168- if categoryID != nil {
169- if useOrdering {
168+ // we need to check what user inputs we received at runtime, and use the
169+ // most appropriate query
170+ switch {
171+ // use query WithCategoryAndOrder
172+ case categoryID != nil && useOrdering :
170173 log .Printf ("GraphQL Query with category and order: %+v" , queries .WithCategoryAndOrder )
171174 log .Printf ("GraphQL Variables: %+v" , vars )
172175
@@ -177,7 +180,9 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
177180 for _ , node := range queries .WithCategoryAndOrder .Repository .Discussions .Nodes {
178181 discussions = append (discussions , fragmentToDiscussion (node ))
179182 }
180- } else {
183+
184+ // use query WithCategoryNoOrder
185+ case categoryID != nil && ! useOrdering :
181186 log .Printf ("GraphQL Query with category no order: %+v" , queries .WithCategoryNoOrder )
182187 log .Printf ("GraphQL Variables: %+v" , vars )
183188
@@ -188,9 +193,9 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
188193 for _ , node := range queries .WithCategoryNoOrder .Repository .Discussions .Nodes {
189194 discussions = append (discussions , fragmentToDiscussion (node ))
190195 }
191- }
192- } else {
193- if useOrdering {
196+
197+ // use query BasicWithOrder
198+ case categoryID == nil && useOrdering :
194199 log .Printf ("GraphQL Query basic with order: %+v" , queries .BasicWithOrder )
195200 log .Printf ("GraphQL Variables: %+v" , vars )
196201
@@ -201,7 +206,9 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
201206 for _ , node := range queries .BasicWithOrder .Repository .Discussions .Nodes {
202207 discussions = append (discussions , fragmentToDiscussion (node ))
203208 }
204- } else {
209+
210+ // use query BasicNoOrder
211+ case categoryID == nil && ! useOrdering :
205212 log .Printf ("GraphQL Query basic no order: %+v" , queries .BasicNoOrder )
206213 log .Printf ("GraphQL Variables: %+v" , vars )
207214
@@ -212,8 +219,7 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
212219 for _ , node := range queries .BasicNoOrder .Repository .Discussions .Nodes {
213220 discussions = append (discussions , fragmentToDiscussion (node ))
214221 }
215- }
216- }
222+ }
217223
218224 out , err := json .Marshal (discussions )
219225 if err != nil {
0 commit comments