Updated the GetDefaultMembershipSourceAttributes endpoint to remove _Code from attribute names in its response. Added a new field to the attributes, hasMapping to determine if this attribute is a code/desc attribute.

Author: Angel Mendez

Service/GroupMembershipManagement/Hosts/WebApi/Services.WebApi/GetDefaultSqlMembershipSourceAttributesHandler.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 using Microsoft.Data.SqlClient;
+using Microsoft.Graph.Models;
 using Models;
 using Newtonsoft.Json;
 using Repositories.Contracts;
@@ -35,30 +36,24 @@ protected override async Task<GetDefaultSqlMembershipSourceAttributesResponse> E
         {
             try
             {
-                var sqlFilterAttributes = await GetSqlAttributes();
+                var sqlFilterAttributes = await GetSqlAttributesAsync();
                 var storedAttributeSettings = await _databaseSqlMembershipSourcesRepository.GetDefaultSourceAttributesAsync();
 
                 if (storedAttributeSettings != null)
                 {
-                    storedAttributeSettings.RemoveAll(attribute =>
-                        !sqlFilterAttributes.Any(t => t.Name == attribute.Name && t.Type == attribute.Type)
-                    );
+                    storedAttributeSettings.RemoveAll(attribute => !sqlFilterAttributes.Any(t => t.Name == attribute.Name && t.Type == attribute.Type));
 
                     await _databaseSqlMembershipSourcesRepository.UpdateDefaultSourceAttributesAsync(storedAttributeSettings);
                 }
 
-                var attributesToReturn = sqlFilterAttributes.Select(attributeTuple =>
+                var attributesToReturn = sqlFilterAttributes.Select(sqlAttribute =>
                 {
                     var storedAttribute = storedAttributeSettings?.FirstOrDefault(attribute =>
-                        attribute.Name == attributeTuple.Name && attribute.Type == attributeTuple.Type
+                        attribute.Name == sqlAttribute.Name && attribute.Type == sqlAttribute.Type
                     );
 
-                    return storedAttribute ?? new SqlMembershipAttribute
-                    {
-                        Name = attributeTuple.Name,
-                        Type = attributeTuple.Type,
-                        CustomLabel = ""
-                    };
+                    return storedAttribute ?? sqlAttribute;
+
                 }).ToList();
 
                 return new GetDefaultSqlMembershipSourceAttributesResponse { Attributes = attributesToReturn };
@@ -70,14 +65,35 @@ protected override async Task<GetDefaultSqlMembershipSourceAttributesResponse> E
             }
         }
 
-        private async Task<List<(string Name, string Type)>> GetSqlAttributes()
+        private async Task<List<SqlMembershipAttribute>> GetSqlAttributesAsync()
         {
             var tableName = await GetTableNameAsync();
-            var attributes = await GetColumnNamesAsync(tableName);
+            var columns = await GetColumnDetailsAsync(tableName);
+            var attributes = columns.Select(column =>
+            {
+                var codeSuffix = "_Code";
+                var attributeName = column.Name;
+                var hasMapping = false;
+
+                if (attributeName.EndsWith(codeSuffix))
+                {
+                    attributeName = attributeName.Substring(0, attributeName.Length - codeSuffix.Length);
+                    hasMapping = true;
+                }
+
+                return new SqlMembershipAttribute
+                {
+                    Name = attributeName,
+                    Type = column.Type,
+                    CustomLabel = "",
+                    HasMapping = hasMapping
+                };
+            }).ToList();
+
             return attributes;
         }
 
-        private async Task<List<(string Name, string Type)>> GetColumnNamesAsync(string tableName)
+        private async Task<List<(string Name, string Type)>> GetColumnDetailsAsync(string tableName)
         {
             var attributes = new List<(string Name, string Type)>();
 

Service/GroupMembershipManagement/Hosts/WebApi/WebApi.Tests/SqlMembershipSourcesControllerTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+using Azure.Messaging.EventGrid.SystemEvents;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Models;
@@ -71,7 +72,7 @@ public void Initialize()
 
             _databaseSqlMembershipSourcesRepository.Setup(x => x.GetDefaultSourceAsync()).ReturnsAsync(() => _defaultSource);
             _databaseSqlMembershipSourcesRepository.Setup(x => x.GetDefaultSourceAttributesAsync()).ReturnsAsync(() => _storedAttributeSettings);
-            _sqlMembershipRepository.Setup(x => x.GetColumnDetailsAsync(It.IsAny<string>())).ReturnsAsync(new List<(string Name, string Type)> { ("Name1", "nvarchar"), ("Name2", "int"), ("Name3", "nvarchar") });
+            _sqlMembershipRepository.Setup(x => x.GetColumnDetailsAsync(It.IsAny<string>())).ReturnsAsync(new List<(string Name, string Type)> { ("Name1", "nvarchar"), ("Name2", "int"), ("Name3_Code", "nvarchar") });
             _sqlMembershipRepository.Setup(x => x.GetAttributeValuesAsync(It.IsAny<string>(), It.IsAny<string>())).ReturnsAsync(new List<(string Code, string Description)> { ("Code1", "Description1"), ("Code2", "Description2"), ("Code3", "Description3") });
             _sqlMembershipRepository.Setup(x => x.CheckIfTableExistsAsync(It.IsAny<string>())).ReturnsAsync(true);
             _sqlMembershipRepository.Setup(x => x.CheckIfMappingsTableExistsAsync(It.IsAny<string>())).ReturnsAsync(true);
@@ -119,6 +120,30 @@ public async Task NoStoredCustomLabelsTestAsync()
             Assert.AreEqual(attributes.Count, 3);
             Assert.AreEqual(attributes[0].Name, "Name1");
             Assert.AreEqual(attributes[0].CustomLabel, "");
+            Assert.IsFalse(attributes[0].HasMapping);
+        }
+
+        [TestMethod]
+        public async Task CodeColumnRenameTestAsync()
+        {
+            _databaseSqlMembershipSourcesRepository.Setup(x => x.GetDefaultSourceAttributesAsync()).ReturnsAsync(() => null);
+
+            var response = await _sqlMembershipSourcesController.GetDefaultSourceAttributesAsync();
+
+            Assert.IsNotNull(response);
+
+            var okResult = response as OkObjectResult;
+
+            Assert.IsNotNull(okResult);
+            Assert.IsNotNull(okResult.Value);
+
+            var attributes = okResult.Value as List<SqlMembershipAttribute>;
+            Assert.IsNotNull(attributes);
+
+            Assert.AreEqual(attributes.Count, 3);
+            Assert.AreEqual(attributes[2].Name, "Name3");
+            Assert.AreEqual(attributes[2].CustomLabel, "");
+            Assert.IsTrue(attributes[2].HasMapping);
         }
 
         [TestMethod]
@@ -130,13 +155,15 @@ public async Task TestRemovalOfStaleStoredSettingsAsync()
                 {
                     Name = "Name1",
                     CustomLabel = "CustomLabel1",
-                    Type = "nvarchar"
+                    Type = "nvarchar", 
+                    HasMapping = false
                 },
                 new SqlMembershipAttribute
                 {
                     Name = "RemovedAttribute1",
                     CustomLabel = "RemovedCustomLabel1",
-                    Type = "nvarchar"
+                    Type = "nvarchar",
+                    HasMapping = false
                 }
             };
 
@@ -157,6 +184,7 @@ public async Task TestRemovalOfStaleStoredSettingsAsync()
             Assert.AreEqual(attributes.Count, 3);
             Assert.AreEqual(attributes[0].Name, "Name1");
             Assert.AreEqual(attributes[0].CustomLabel, "CustomLabel1");
+            Assert.IsFalse(attributes[0].HasMapping);
             Assert.AreEqual(attributes[1].CustomLabel, "");
 
             _databaseSqlMembershipSourcesRepository.Verify(x => x.UpdateDefaultSourceAttributesAsync(It.Is<List<SqlMembershipAttribute>>(list => !list.Any(a => a.Name == "RemovedAttribute1"))), Times.Once());

Service/GroupMembershipManagement/Models/SqlMembershipAttribute.cs

@@ -8,5 +8,6 @@ public class SqlMembershipAttribute
         public string Name { get; set; }
         public string CustomLabel { get; set; }
         public string Type { get; set; }
+        public bool HasMapping { get; set; }
     }
 }