VCST-4174: Add optional container attribute

src/VirtoCommerce.Xapi.Core/Extensions/GraphQLBuilderExtensions.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using GraphQL;
 using GraphQL.DI;
 using GraphQL.Validation;
 using Microsoft.Extensions.DependencyInjection;
+using VirtoCommerce.Xapi.Core.Models;
 using ServiceLifetime = GraphQL.DI.ServiceLifetime;
 
 namespace VirtoCommerce.Xapi.Core.Extensions
@@ -46,6 +48,7 @@ public static IGraphQLBuilder AddCustomValidationRule(this IGraphQLBuilder build
         public static IGraphQLBuilder AddSchema(this IGraphQLBuilder builder, IServiceCollection services, Type assemblyMarker)
         {
             builder.AddGraphTypes(assemblyMarker.Assembly);
+            builder.AddOptionalGraphTypes(assemblyMarker);
             services.AddMediatR(configuration => configuration.RegisterServicesFromAssembly(assemblyMarker.Assembly));
             services.AddAutoMapper(assemblyMarker);
             services.AddSchemaBuilders(assemblyMarker);
@@ -56,11 +59,35 @@ public static IGraphQLBuilder AddSchema(this IGraphQLBuilder builder, IServiceCo
         public static IGraphQLBuilder AddSchema(this IGraphQLBuilder builder, IServiceCollection services, Type coreAssemblyMarker, Type dataAssemblyMarker)
         {
             builder.AddGraphTypes(coreAssemblyMarker.Assembly);
+            builder.AddOptionalGraphTypes(coreAssemblyMarker);
             services.AddMediatR(configuration => configuration.RegisterServicesFromAssemblies(coreAssemblyMarker.Assembly, dataAssemblyMarker.Assembly));
             services.AddAutoMapper(coreAssemblyMarker, dataAssemblyMarker);
             services.AddSchemaBuilders(dataAssemblyMarker);
 
             return builder;
         }
+
+        public static void AddOptionalGraphTypes(this IGraphQLBuilder builder, Type assemblyType)
+        {
+            var dependencyNames = assemblyType.GetCustomAttributes<OptionalGraphQlTypesContainerAttribute>()
+                .Select(x => x.DependencyName)
+                .Where(x => x != null)
+                .ToArray();
+
+            if (dependencyNames.Length > 0)
+            {
+                var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+
+                foreach (var dependencyName in dependencyNames)
+                {
+                    var targetAssembly = loadedAssemblies.FirstOrDefault(x => x.GetName().Name.Equals(dependencyName, StringComparison.OrdinalIgnoreCase));
+
+                    if (targetAssembly != null)
+                    {
+                        builder.AddGraphTypes(targetAssembly);
+                    }
+                }
+            }
+        }
     }
 }

src/VirtoCommerce.Xapi.Core/Models/OptionalGraphQlTypesContainerAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace VirtoCommerce.Xapi.Core.Models;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class OptionalGraphQlTypesContainerAttribute : Attribute
+{
+    public string DependencyName { get; set; }
+
+    public OptionalGraphQlTypesContainerAttribute(string dependencyName)
+    {
+        DependencyName = dependencyName;
+    }
+}

src/VirtoCommerce.Xapi.Data/Queries/GetStoreQueryHandler.cs

@@ -67,14 +67,15 @@ public async Task<StoreResponse> Handle(GetStoreQuery request, CancellationToken
             return null;
         }
 
-        var cultureName = request.CultureName ?? store.DefaultLanguage;
+        var availableLanguages = !store.Languages.IsNullOrEmpty() ? store.Languages.Select(x => new Language(x)).ToList() : [];
+
+        var cultureName = GetCultureName(request.CultureName, store.DefaultLanguage, availableLanguages);
 
         var allCurrencies = await _storeCurrencyResolver.GetAllStoreCurrenciesAsync(store.Id, cultureName);
         var availableCurrencies = allCurrencies.Where(x => store.Currencies.Contains(x.Code)).ToList();
         var defaultCurrency = await _storeCurrencyResolver.GetStoreCurrencyAsync(store.DefaultCurrency, store.Id, cultureName);
 
         var defaultLanguage = store.DefaultLanguage != null ? new Language(store.DefaultLanguage) : Language.InvariantLanguage;
-        var availableLanguages = !store.Languages.IsNullOrEmpty() ? store.Languages.Select(x => new Language(x)).ToList() : new List<Language>();
 
         var response = new StoreResponse
         {
@@ -197,4 +198,19 @@ protected virtual object ToSettingValue(ObjectSettingEntry s)
             return result;
         }
     }
+
+    private static string GetCultureName(string cultureName, string defaultCultureName, IList<Language> availableLanguages)
+    {
+        if (cultureName.IsNullOrEmpty())
+        {
+            cultureName = defaultCultureName;
+        }
+        else if (cultureName.Length == 2)
+        {
+            cultureName = availableLanguages.FirstOrDefault(x => cultureName == x.TwoLetterLanguageName)?.CultureName;
+            cultureName ??= defaultCultureName;
+        }
+
+        return cultureName;
+    }
 }