fix images service being required even if feature is disabled

ita-social-projects · Apr 20, 2023 · 62e7711 · 62e7711
1 parent 1053db9
commit 62e7711
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 72 deletions.
diff --git a/OutOfSchool/OutOfSchool.WebApi/Extensions/Startup/FileStorageExtensions.cs b/OutOfSchool/OutOfSchool.WebApi/Extensions/Startup/FileStorageExtensions.cs
@@ -34,9 +34,7 @@ public static IServiceCollection AddImagesStorage(this IServiceCollection servic
     {
         _ = services ?? throw new ArgumentNullException(nameof(services));
 
-        var isDevelopment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == Environments.Development;
-
-        if (turnOnFakeStorage && isDevelopment)
+        if (turnOnFakeStorage)
         {
             return services.AddTransient<IImageFilesStorage, FakeImagesStorage>();
         }

diff --git a/OutOfSchool/OutOfSchool.WebApi/Startup.cs b/OutOfSchool/OutOfSchool.WebApi/Startup.cs
@@ -242,7 +242,10 @@ public static void AddApplicationServices(this WebApplicationBuilder builder)
         services.AddTransient<IProviderRepository, ProviderRepository>();
         services.AddTransient<IWorkshopRepository, WorkshopRepository>();
         //services.AddTransient<IExternalImageStorage, ExternalImageStorage>();
-        services.AddImagesStorage(turnOnFakeStorage: configuration.GetValue<bool>("TurnOnFakeImagesStorage"));
+        var featuresConfig = configuration.GetSection(FeatureManagementConfig.Name).Get<FeatureManagementConfig>();
+        var isImagesEnabled = featuresConfig.Images;
+        var turnOnFakeStorage = configuration.GetValue<bool>("Images:TurnOnFakeImagesStorage") || !isImagesEnabled;
+        services.AddImagesStorage(turnOnFakeStorage: turnOnFakeStorage);
 
         services.AddTransient<IElasticsearchSyncRecordRepository, ElasticsearchSyncRecordRepository>();
         services.AddTransient<INotificationRepository, NotificationRepository>();
@@ -332,7 +335,7 @@ public static void AddApplicationServices(this WebApplicationBuilder builder)
             quartzConfig.ConnectionStringKey,
             q =>
         {
-            if (!builder.Environment.IsEnvironment("Release"))
+            if (!turnOnFakeStorage)
             {
                 // TODO: for now this is not used in release
                 q.AddGcpSynchronization(services, quartzConfig);

diff --git a/OutOfSchool/OutOfSchool.WebApi/appsettings.Development.json b/OutOfSchool/OutOfSchool.WebApi/appsettings.Development.json
@@ -42,8 +42,10 @@
   "Quartz": {
     "ConnectionStringKey": "QuartzConnection"
   },
-  "TurnOnFakeImagesStorage": true,
   "Redis": {
     "Password": "Qwerty123!"
+  },
+  "Images": {
+    "TurnOnFakeImagesStorage": true
   }
 }
diff --git a/OutOfSchool/OutOfSchool.WebApi/appsettings.Release.json b/OutOfSchool/OutOfSchool.WebApi/appsettings.Release.json
@@ -70,7 +70,7 @@
 
   "FeatureManagement": {
     "Release1": true,
-    "Release2": true,
+    "Release2": false,
     "Release3": false,
     "Images": false
   },
@@ -144,6 +144,9 @@
   },
   "StatisticReports": {
     "UseExternalStorage": false
+  },
+  "Images": {
+    "TurnOnFakeImagesStorage": true
   }
 }
 

diff --git a/OutOfSchool/OutOfSchool.WebApi/appsettings.json b/OutOfSchool/OutOfSchool.WebApi/appsettings.json
@@ -80,60 +80,61 @@
         }
     },
     "Images": {
-        "Workshop": {
-            "Specs": {
-                "MinWidthPixels": 350,
-                "MaxWidthPixels": 10000,
-                "MinHeightPixels": 250,
-                "MaxHeightPixels": 8000,
-                "MaxSizeBytes": 16777216,
-                "MinWidthHeightRatio": 1,
-                "MaxWidthHeightRatio": 3,
-                "SupportedFormats": [
-                    "jpeg",
-                    "png"
-                ]
-            },
-            "Limits": {
-                "MaxCountOfFiles": 10
-            }
+      "TurnOnFakeImagesStorage": false,
+      "Workshop": {
+        "Specs": {
+          "MinWidthPixels": 350,
+          "MaxWidthPixels": 10000,
+          "MinHeightPixels": 250,
+          "MaxHeightPixels": 8000,
+          "MaxSizeBytes": 16777216,
+          "MinWidthHeightRatio": 1,
+          "MaxWidthHeightRatio": 3,
+          "SupportedFormats": [
+            "jpeg",
+            "png"
+          ]
         },
-        "Teacher": {
-            "Specs": {
-                "MinWidthPixels": 350,
-                "MaxWidthPixels": 10000,
-                "MinHeightPixels": 250,
-                "MaxHeightPixels": 8000,
-                "MaxSizeBytes": 16777216,
-                "MinWidthHeightRatio": 0.5,
-                "MaxWidthHeightRatio": 2,
-                "SupportedFormats": [
-                    "jpeg",
-                    "png"
-                ]
-            },
-            "Limits": {
-                "MaxCountOfFiles": 1
-            }
+        "Limits": {
+          "MaxCountOfFiles": 10
+        }
+      },
+      "Teacher": {
+        "Specs": {
+          "MinWidthPixels": 350,
+          "MaxWidthPixels": 10000,
+          "MinHeightPixels": 250,
+          "MaxHeightPixels": 8000,
+          "MaxSizeBytes": 16777216,
+          "MinWidthHeightRatio": 0.5,
+          "MaxWidthHeightRatio": 2,
+          "SupportedFormats": [
+            "jpeg",
+            "png"
+          ]
         },
-        "Provider": {
-            "Specs": {
-                "MinWidthPixels": 350,
-                "MaxWidthPixels": 10000,
-                "MinHeightPixels": 250,
-                "MaxHeightPixels": 8000,
-                "MaxSizeBytes": 16777216,
-                "MinWidthHeightRatio": 0.5,
-                "MaxWidthHeightRatio": 2,
-                "SupportedFormats": [
-                    "jpeg",
-                    "png"
-                ]
-            },
-            "Limits": {
-                "MaxCountOfFiles": 4
-            }
+        "Limits": {
+          "MaxCountOfFiles": 1
+        }
+      },
+      "Provider": {
+        "Specs": {
+          "MinWidthPixels": 350,
+          "MaxWidthPixels": 10000,
+          "MinHeightPixels": 250,
+          "MaxHeightPixels": 8000,
+          "MaxSizeBytes": 16777216,
+          "MinWidthHeightRatio": 0.5,
+          "MaxWidthHeightRatio": 2,
+          "SupportedFormats": [
+            "jpeg",
+            "png"
+          ]
+        },
+        "Limits": {
+          "MaxCountOfFiles": 4
         }
+      }
     },
 
     "AllowedHosts": "*",
@@ -213,21 +214,21 @@
     }
   },
 
-    "ChangesLog": {
-        "TrackedProperties": {
-            "Provider": [ "FullTitle", "EdrpouIpn", "Director", "LegalAddress", "InstitutionId" ],
-            "Application": [ "Status" ]
-        }
-    },
-    "GeoCoding": {
-        "BaseUrl": "https://api.visicom.ua/data-api/5.0/uk/geocode.json",
-        "ApiKey": "",
-        "Radius": 50
-    },
-
-    "StatisticReports": {
-        "UseExternalStorage": false
+  "ChangesLog": {
+    "TrackedProperties": {
+      "Provider": [ "FullTitle", "EdrpouIpn", "Director", "LegalAddress", "InstitutionId" ],
+      "Application": [ "Status" ]
     }
+  },
+  "GeoCoding": {
+    "BaseUrl": "https://api.visicom.ua/data-api/5.0/uk/geocode.json",
+    "ApiKey": "",
+    "Radius": 50
+  },
+
+  "StatisticReports": {
+    "UseExternalStorage": false
+  }
 }