@@ -1721,35 +1721,40 @@ func (q *fakeQuerier) GetPreviousTemplateVersion(_ context.Context, arg database
1721
1721
q .mutex .RLock ()
1722
1722
defer q .mutex .RUnlock ()
1723
1723
1724
- sortedTemplateVersions := slices .Clone (q .templateVersions )
1725
- slices .SortFunc (sortedTemplateVersions , func (i , j database.TemplateVersion ) bool {
1726
- return i .CreatedAt .After (j .CreatedAt )
1727
- })
1728
-
1729
- templateVersions := make ([]database.TemplateVersion , 0 )
1730
- for _ , templateVersion := range sortedTemplateVersions {
1731
- if templateVersion .OrganizationID != arg .OrganizationID {
1724
+ var currentTemplateVersion database.TemplateVersion
1725
+ for _ , templateVersion := range q .templateVersions {
1726
+ if templateVersion .TemplateID != arg .TemplateID {
1732
1727
continue
1733
1728
}
1734
- if templateVersion .TemplateID != arg .TemplateID {
1729
+ if templateVersion .Name != arg .Name {
1730
+ continue
1731
+ }
1732
+ if templateVersion .OrganizationID != arg .OrganizationID {
1735
1733
continue
1736
1734
}
1737
- templateVersions = append (templateVersions , templateVersion )
1735
+ currentTemplateVersion = templateVersion
1736
+ break
1738
1737
}
1739
1738
1740
- templateVersionIndex := - 1
1741
- for versionIndex , templateVersion := range templateVersions {
1742
- if strings .EqualFold (templateVersion .Name , arg .Name ) {
1743
- templateVersionIndex = versionIndex
1744
- break
1739
+ previousTemplateVersions := make ([]database.TemplateVersion , 0 )
1740
+ for _ , templateVersion := range q .templateVersions {
1741
+ if templateVersion .ID == currentTemplateVersion .ID {
1742
+ continue
1743
+ }
1744
+ if templateVersion .CreatedAt .Before (currentTemplateVersion .CreatedAt ) {
1745
+ previousTemplateVersions = append (previousTemplateVersions , templateVersion )
1745
1746
}
1746
1747
}
1747
1748
1748
- if templateVersionIndex > 0 {
1749
- return templateVersions [ templateVersionIndex ], nil
1749
+ if len ( previousTemplateVersions ) == 0 {
1750
+ return database. TemplateVersion {}, sql . ErrNoRows
1750
1751
}
1751
1752
1752
- return database.TemplateVersion {}, sql .ErrNoRows
1753
+ sort .Slice (previousTemplateVersions , func (i , j int ) bool {
1754
+ return previousTemplateVersions [i ].CreatedAt .After (previousTemplateVersions [j ].CreatedAt )
1755
+ })
1756
+
1757
+ return previousTemplateVersions [0 ], nil
1753
1758
}
1754
1759
1755
1760
func (q * fakeQuerier ) GetParameterSchemasByJobID (_ context.Context , jobID uuid.UUID ) ([]database.ParameterSchema , error ) {
0 commit comments