Merge pull request #40 from Ali-YousefiTelori/develop

fix parameter mismatch bug
EasyMicroservices · Dec 24, 2023 · 82cc585 · 82cc585
2 parents 79f4eaa + 474febc
commit 82cc585
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/...rvices.ContentsMicroservice.Clients/EasyMicroservices.ContentsMicroservice.Clients.csproj b/...rvices.ContentsMicroservice.Clients/EasyMicroservices.ContentsMicroservice.Clients.csproj
@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.20</Version>
+    <Version>0.0.0.21</Version>
     <Description>client generated code.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>microservice,Content,Contents,client</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Clients/Helpers/ContentLanguageHelper.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.Clients/Helpers/ContentLanguageHelper.cs
@@ -118,34 +118,44 @@ async Task ResolveContentLanguage(object contract, string language, HashSet<obje
                 return;
             var type = contract.GetType();
             mappedItems.Add(contract);
-            foreach (var property in type.GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance))
+            if (IsClass(type) && typeof(IEnumerable).IsAssignableFrom(type))
             {
-                if (property.GetCustomAttribute<ContentLanguageAttribute>() != null)
+                foreach (var item in (IEnumerable)contract)
                 {
-                    var contentResult = await _contentClient.GetByLanguageAsync(new GetByLanguageRequestContract()
-                    {
-                        Key = property.Name,
-                        UniqueIdentity = GetUniqueIdentity(contract),
-                        Language = language
-                    });
-                    if (contentResult.IsSuccess)
-                        property.SetValue(contract, contentResult.Result.Data);
+                    await ResolveContentLanguage(item, language, mappedItems);
                 }
-                else if (IsClass(property.PropertyType) && typeof(IEnumerable).IsAssignableFrom(property.PropertyType))
+            }
+            else
+            {
+                foreach (var property in type.GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance))
                 {
-                    var items = property.GetValue(contract);
-                    if (items == null)
-                        continue;
-                    foreach (var item in (IEnumerable)items)
+                    if (property.GetCustomAttribute<ContentLanguageAttribute>() != null)
                     {
-                        await ResolveContentLanguage(item, language, mappedItems);
+                        var contentResult = await _contentClient.GetByLanguageAsync(new GetByLanguageRequestContract()
+                        {
+                            Key = property.Name,
+                            UniqueIdentity = GetUniqueIdentity(contract),
+                            Language = language
+                        });
+                        if (contentResult.IsSuccess)
+                            property.SetValue(contract, contentResult.Result.Data);
+                    }
+                    else if (IsClass(property.PropertyType) && typeof(IEnumerable).IsAssignableFrom(property.PropertyType))
+                    {
+                        var items = property.GetValue(contract);
+                        if (items == null)
+                            continue;
+                        foreach (var item in (IEnumerable)items)
+                        {
+                            await ResolveContentLanguage(item, language, mappedItems);
+                        }
+                    }
+                    else if (IsClass(property.PropertyType))
+                    {
+                        var value = property.GetValue(contract);
+                        if (value != null)
+                            await ResolveContentLanguage(value, language, mappedItems);
                     }
-                }
-                else if (IsClass(property.PropertyType))
-                {
-                    var value = property.GetValue(contract);
-                    if (value != null)
-                        await ResolveContentLanguage(value, language, mappedItems);
                 }
             }
         }