Fixes 4015: Force order by issued-date desc (#7)

* Switch to pulp-ubi image * Fixes 4015: Force order by issued-date desc * Fix tests --------- Co-authored-by: Justin Sherrill <jsherril@redhat.com>
content-services · Apr 24, 2024 · ad2f392 · ad2f392
1 parent 3e7801a
commit ad2f392
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/internal/test/integration/rpm_test.go b/internal/test/integration/rpm_test.go
@@ -257,21 +257,21 @@ func (r *RpmSuite) TestRpmRepositoryVersionErrataListFilter() {
 	singleList, total, err := r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Search: ""}, tangy.PageOptions{})
 	require.NoError(r.T(), err)
 	assert.NotEmpty(r.T(), singleList)
-	assert.Equal(r.T(), total, 5)
+	assert.Equal(r.T(), total, 6)
 
 	// test limit
 	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{}, tangy.PageOptions{Limit: 1})
 	require.NoError(r.T(), err)
 	assert.NotEmpty(r.T(), singleList)
 	assert.Equal(r.T(), len(singleList), 1)
-	assert.Equal(r.T(), total, 5)
+	assert.Equal(r.T(), total, 6)
 
 	// test offset
 	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{}, tangy.PageOptions{Offset: 3})
 	require.NoError(r.T(), err)
 	assert.NotEmpty(r.T(), singleList)
-	assert.Equal(r.T(), len(singleList), 2)
-	assert.Equal(r.T(), total, 5)
+	assert.Equal(r.T(), len(singleList), 3)
+	assert.Equal(r.T(), total, 6)
 
 	// id filter partial
 	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Search: "0055"}, tangy.PageOptions{})
@@ -283,13 +283,13 @@ func (r *RpmSuite) TestRpmRepositoryVersionErrataListFilter() {
 	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Type: []string{"security"}}, tangy.PageOptions{})
 	require.NoError(r.T(), err)
 	assert.NotEmpty(r.T(), singleList)
-	assert.Equal(r.T(), total, 3)
+	assert.Equal(r.T(), total, 4)
 
 	// multiple types filter
 	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Type: []string{"security", "enhancement"}}, tangy.PageOptions{})
 	require.NoError(r.T(), err)
 	assert.NotEmpty(r.T(), singleList)
-	assert.Equal(r.T(), total, 4)
+	assert.Equal(r.T(), total, 5)
 
 	// type filter partial (empty)
 	emptyList, total, err := r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Type: []string{"secu"}}, tangy.PageOptions{})
@@ -298,19 +298,19 @@ func (r *RpmSuite) TestRpmRepositoryVersionErrataListFilter() {
 	assert.Equal(r.T(), total, 0)
 
 	// severity filter
-	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"low"}}, tangy.PageOptions{})
+	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"Low"}}, tangy.PageOptions{})
 	require.NoError(r.T(), err)
 	assert.NotEmpty(r.T(), singleList)
 	assert.Equal(r.T(), total, 1)
 
 	// multiple severities filter
-	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"low", "Unknown"}}, tangy.PageOptions{})
+	singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"Low", "Unknown"}}, tangy.PageOptions{})
 	require.NoError(r.T(), err)
 	assert.NotEmpty(r.T(), singleList)
-	assert.Equal(r.T(), total, 5)
+	assert.Equal(r.T(), total, 3)
 
 	// severity filter partial (empty)
-	emptyList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"lo"}}, tangy.PageOptions{})
+	emptyList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"Lo"}}, tangy.PageOptions{})
 	require.NoError(r.T(), err)
 	assert.Empty(r.T(), emptyList)
 	assert.Equal(r.T(), total, 0)

diff --git a/pkg/tangy/rpm.go b/pkg/tangy/rpm.go
@@ -310,7 +310,7 @@ func (t *tangyImpl) RpmRepositoryVersionErrataList(ctx context.Context, hrefs []
 	args["limit"] = pageOpts.Limit
 	args["offset"] = pageOpts.Offset
 	rows, err := conn.Query(ctx, queryOpen+innerUnion+filterQuery+
-		" ORDER BY re.id ASC, re.title ASC, re.issued_date ASC, re.type ASC, re.severity ASC LIMIT @limit OFFSET @offset",
+		" ORDER BY re.issued_date DESC, re.title ASC, re.type ASC, re.severity ASC LIMIT @limit OFFSET @offset",
 		args)
 	if err != nil {
 		return nil, 0, err