Merge pull request #911 from bcgov/bug/DSS-1150

KFloodBCGov · web-flow · commit 97f0a2a671ee · 2025-05-08T10:27:21.000-07:00
DSS-1150 Internal Server Error - Sorting
diff --git a/server/StrDss.Data/Repositories/RentalListingRepository.cs b/server/StrDss.Data/Repositories/RentalListingRepository.cs
@@ -64,23 +64,23 @@ var extraSort
 
             if (orderBy == "lastActionDtm")
             {
-                orderBy = "lastActionDtm == null, lastActionDtm";
+                orderBy = "lastActionDtm ?? System.DateTime.MinValue";
             }
             else if (orderBy == "lastActionNm")
             {
-                orderBy = "lastActionNm == null, lastActionNm";
+                orderBy = "lastActionNm ?? \"ZZZZ\"";
             }
             else if (orderBy == "businessLicenceNo")
             {
-                orderBy = "string.IsNullOrWhiteSpace(businessLicenceNo), businessLicenceNo";
+                orderBy = "businessLicenceNo ?? \"ZZZZ\"";
             }
             else if (orderBy == "businessLicenceNoMatched")
             {
-                orderBy = "string.IsNullOrWhiteSpace(businessLicenceNoMatched), businessLicenceNoMatched";
+                orderBy = "businessLicenceNoMatched ?? \"ZZZZ\"";
             }
             else if (orderBy == "nightsBookedYtdQty")
             {
-                orderBy = "nightsBookedYtdQty";
+                orderBy = "nightsBookedYtdQty ?? -1";
             }
 
             var listings = await Page<DssRentalListingVw, RentalListingViewDto>(query, pageSize, pageNumber, orderBy, direction, extraSort);
@@ -114,7 +114,7 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri
 
             if (orderBy == "effectiveBusinessLicenceNo")
             {
-                orderBy = "string.IsNullOrWhiteSpace(effectiveBusinessLicenceNo), effectiveBusinessLicenceNo";
+                orderBy = "effectiveBusinessLicenceNo ?? \"ZZZZ\"";
             }
 
             var groupedQuery = query

Original file line number	Diff line number	Diff line change
`@@ -64,23 +64,23 @@ var extraSort`
`64`	`64`
`65`	`65`	`if (orderBy == "lastActionDtm")`
`66`	`66`	`{`
`67`		`- orderBy = "lastActionDtm == null, lastActionDtm";`
	`67`	`+ orderBy = "lastActionDtm ?? System.DateTime.MinValue";`
`68`	`68`	`}`
`69`	`69`	`else if (orderBy == "lastActionNm")`
`70`	`70`	`{`
`71`		`- orderBy = "lastActionNm == null, lastActionNm";`
	`71`	`+ orderBy = "lastActionNm ?? \"ZZZZ\"";`
`72`	`72`	`}`
`73`	`73`	`else if (orderBy == "businessLicenceNo")`
`74`	`74`	`{`
`75`		`- orderBy = "string.IsNullOrWhiteSpace(businessLicenceNo), businessLicenceNo";`
	`75`	`+ orderBy = "businessLicenceNo ?? \"ZZZZ\"";`
`76`	`76`	`}`
`77`	`77`	`else if (orderBy == "businessLicenceNoMatched")`
`78`	`78`	`{`
`79`		`- orderBy = "string.IsNullOrWhiteSpace(businessLicenceNoMatched), businessLicenceNoMatched";`
	`79`	`+ orderBy = "businessLicenceNoMatched ?? \"ZZZZ\"";`
`80`	`80`	`}`
`81`	`81`	`else if (orderBy == "nightsBookedYtdQty")`
`82`	`82`	`{`
`83`		`- orderBy = "nightsBookedYtdQty";`
	`83`	`+ orderBy = "nightsBookedYtdQty ?? -1";`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`var listings = await Page<DssRentalListingVw, RentalListingViewDto>(query, pageSize, pageNumber, orderBy, direction, extraSort);`
`@@ -114,7 +114,7 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri`
`114`	`114`
`115`	`115`	`if (orderBy == "effectiveBusinessLicenceNo")`
`116`	`116`	`{`
`117`		`- orderBy = "string.IsNullOrWhiteSpace(effectiveBusinessLicenceNo), effectiveBusinessLicenceNo";`
	`117`	`+ orderBy = "effectiveBusinessLicenceNo ?? \"ZZZZ\"";`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`var groupedQuery = query`