Use id as second order column if created unix is the same

Author: lunny

models/packages/package_version.go

@@ -275,9 +275,9 @@ func (opts *PackageSearchOptions) configureOrderBy(e db.Engine) {
 	case SortVersionAsc:
 		e.Asc("package_version.version")
 	case SortCreatedAsc:
-		e.Asc("package_version.created_unix")
+		e.Asc("package_version.created_unix").Asc("package_version.id")
 	default:
-		e.Desc("package_version.created_unix")
+		e.Desc("package_version.created_unix").Desc("package_version.id")
 	}
 
 	// Sort by id for stable order with duplicates in the other field

tests/integration/api_packages_swift_test.go

@@ -237,11 +237,12 @@ func TestPackageSwift(t *testing.T) {
 			`{"name":"`+packageName+`","version":"`+packageVersion2+`","description":"`+packageDescription+`","codeRepository":"`+packageRepositoryURL+`","author":{"givenName":"`+packageAuthor+`"},"repositoryURLs":["`+packageRepositoryURL+`"]}`,
 		)
 
+		// default versions will be ordered by created unix and id desc
 		pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeSwift)
 		assert.NoError(t, err)
 		assert.Len(t, pvs, 2)
 
-		pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[1])
+		pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0])
 		assert.NoError(t, err)
 		assert.NotNil(t, pd.SemVer)
 		assert.Equal(t, packageID, pd.Package.Name)
@@ -255,7 +256,7 @@ func TestPackageSwift(t *testing.T) {
 		assert.Len(t, pd.VersionProperties, 1)
 		assert.Equal(t, packageRepositoryURL, pd.VersionProperties.GetByName(swift_module.PropertyRepositoryURL))
 
-		pfs, err := packages.GetFilesByVersionID(db.DefaultContext, pvs[1].ID)
+		pfs, err := packages.GetFilesByVersionID(db.DefaultContext, pvs[0].ID)
 		assert.NoError(t, err)
 		assert.Len(t, pfs, 1)
 		assert.Equal(t, fmt.Sprintf("%s-%s.zip", packageName, packageVersion2), pfs[0].Name)