after adding condition for deployed time sort (#3108)

devtron-labs · Mar 24, 2023 · f91d223 · f91d223
1 parent 9023af8
commit f91d223
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/internal/sql/repository/helper/AppListingRepositoryQueryBuilder.go b/internal/sql/repository/helper/AppListingRepositoryQueryBuilder.go
@@ -65,7 +65,8 @@ const (
 )
 
 const (
-	AppNameSortBy SortBy = "appNameSort"
+	AppNameSortBy      SortBy = "appNameSort"
+	LastDeployedSortBy        = "lastDeployedSort"
 )
 
 func (impl AppListingRepositoryQueryBuilder) BuildJobListingQuery(appIDs []int, statuses []string, sortOrder string) string {

diff --git a/pkg/app/AppListingViewBuilder.go b/pkg/app/AppListingViewBuilder.go
@@ -103,6 +103,20 @@ func (impl *AppListingViewBuilderImpl) BuildView(fetchAppListingRequest FetchApp
 					return appContainersResponses[i].AppName > appContainersResponses[j].AppName
 				})
 			}
+		} else if helper.LastDeployedSortBy == fetchAppListingRequest.SortBy {
+			if fetchAppListingRequest.SortOrder == helper.Asc {
+				sort.Slice(appContainersResponses, func(i, j int) bool {
+					deployedTime1 := appContainersResponses[i].AppEnvironmentContainer[0].LastDeployedTime
+					deployedTime2 := appContainersResponses[j].AppEnvironmentContainer[0].LastDeployedTime
+					return deployedTime1 > deployedTime2
+				})
+			} else if fetchAppListingRequest.SortOrder == helper.Desc {
+				sort.Slice(appContainersResponses, func(i, j int) bool {
+					deployedTime1 := appContainersResponses[i].AppEnvironmentContainer[0].LastDeployedTime
+					deployedTime2 := appContainersResponses[j].AppEnvironmentContainer[0].LastDeployedTime
+					return deployedTime1 < deployedTime2
+				})
+			}
 		}
 	}
 	return appContainersResponses, nil