Merge pull request #743 from rokwire/develop

merge develop into main
rokwire · Dec 18, 2024 · 369ae06 · 369ae06
2 parents 01e7e72 + b752a3c
commit 369ae06
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+## [1.45.2] - 2024-18-12
+### Fixed
+- Fix Case-Insensitive Sorting [#741](https://github.com/rokwire/core-building-block/issues/741)
+
 ## [1.45.1] - 2024-13-10
 ### Fixed
 - GET services/accounts returns unsorted response [#733](https://github.com/rokwire/core-building-block/issues/733)

diff --git a/SECURITY.md b/SECURITY.md
@@ -4,8 +4,8 @@
 Patches for **Core Building Block** in this repository will only be applied to the following versions:
 | Version  | Supported          |
 | -------- | ------------------ |
-|1.45.1  | :white_check_mark: |
-| < 1.45.1| :x:                |
+|1.45.2  | :white_check_mark: |
+| < 1.45.2| :x:                |
 
 ## Reporting a Bug or Vulnerability
 

diff --git a/driven/storage/adapter.go b/driven/storage/adapter.go
@@ -1541,7 +1541,14 @@ func (sa *Adapter) FindPublicAccounts(context TransactionContext, appID string,
 	}
 
 	pipeline = append(pipeline, bson.M{"$match": bson.M{"org_apps_memberships.app_org_id": appOrg.ID, "privacy.public": true}})
-	pipeline = append(pipeline, bson.M{"$sort": bson.D{{Key: "profile.last_name", Value: 1}, {Key: "profile.first_name", Value: 1}}})
+	pipeline = append(pipeline, bson.M{"$addFields": bson.M{
+		"normalized_last_name":  bson.M{"$toLower": "$profile.last_name"},
+		"normalized_first_name": bson.M{"$toLower": "$profile.first_name"},
+	}})
+	pipeline = append(pipeline, bson.M{"$sort": bson.D{
+		{Key: "normalized_last_name", Value: 1},
+		{Key: "normalized_first_name", Value: 1},
+	}})
 
 	if offset != nil && *offset > 0 {
 		pipeline = append(pipeline, bson.M{"$skip": *offset})

diff --git a/driver/web/docs/gen/def.yaml b/driver/web/docs/gen/def.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
   title: Rokwire Core Building Block API
   description: Core Building Block API Documentation
-  version: 1.45.1
+  version: 1.45.2
 servers:
   - url: 'https://api.rokwire.illinois.edu/core'
     description: Production server

diff --git a/driver/web/docs/index.yaml b/driver/web/docs/index.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
   title: Rokwire Core Building Block API
   description: Core Building Block API Documentation
-  version: 1.45.1
+  version: 1.45.2
 servers:
   - url: https://api.rokwire.illinois.edu/core
     description: Production server