From e83a254e9d6b8f1d2b3dde4511ad91b808480310 Mon Sep 17 00:00:00 2001
From: shchoholiev <sh.codework@gmail.com>
Date: Sun, 29 Oct 2023 01:54:43 +0000
Subject: [PATCH 1/2] SA-72 Added use of Azure App Config

---
 ShoppingAssistantApi.Api/Program.cs                |  2 ++
 .../ShoppingAssistantApi.Api.csproj                |  1 +
 ShoppingAssistantApi.Api/appsettings.json          | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ShoppingAssistantApi.Api/Program.cs b/ShoppingAssistantApi.Api/Program.cs
index e7f574b..6d67dd6 100644
--- a/ShoppingAssistantApi.Api/Program.cs
+++ b/ShoppingAssistantApi.Api/Program.cs
@@ -6,6 +6,8 @@ using ShoppingAssistantApi.Api.ApiExtentions;
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
+var appConfig = Environment.GetEnvironmentVariable("APP_CONFIG") ?? builder.Configuration.GetConnectionString("AppConfig");
+builder.Configuration.AddAzureAppConfiguration(appConfig);
 
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddJWTTokenAuthentication(builder.Configuration);
diff --git a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj
index 761a282..e38ca43 100644
--- a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj
+++ b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.3.3" />
     <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="13.3.3" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.5" />
+    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
 
diff --git a/ShoppingAssistantApi.Api/appsettings.json b/ShoppingAssistantApi.Api/appsettings.json
index 10f68b8..a018db4 100644
--- a/ShoppingAssistantApi.Api/appsettings.json
+++ b/ShoppingAssistantApi.Api/appsettings.json
@@ -5,5 +5,17 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "MongoDatabaseName": "ShoppingAssistant"
+  },
+  "JsonWebTokenKeys": {
+    "ValidateIssuer": true,
+    "ValidateAudience": true,
+    "ValidateLifetime": true,
+    "ValidateIssuerSigningKey": true
+  },
+  "OpenAi": {
+    "ApiUrl": "https://api.openai.com/v1/chat/completions"
+  }
 }

From 953f397cc8fd417c6f83fcfcc3d0415988b35703 Mon Sep 17 00:00:00 2001
From: shchoholiev <sh.codework@gmail.com>
Date: Sun, 29 Oct 2023 01:59:08 +0000
Subject: [PATCH 2/2] SA-72 Updated dev github workflow

---
 .github/workflows/develop_shopping-assistant-api-dev.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/develop_shopping-assistant-api-dev.yml b/.github/workflows/develop_shopping-assistant-api-dev.yml
index 11c692d..e24cb0d 100644
--- a/.github/workflows/develop_shopping-assistant-api-dev.yml
+++ b/.github/workflows/develop_shopping-assistant-api-dev.yml
@@ -4,9 +4,6 @@
 name: Build and deploy ASP.Net Core app to Azure Web App - shopping-assistant-api-dev
 
 on:
-  push:
-    branches:
-      - develop
   workflow_dispatch:
 
 jobs:
@@ -25,6 +22,9 @@ jobs:
       - name: Build with dotnet
         run: dotnet build --configuration Release
 
+      - name: Test with dotnet
+        run: dotnet test --no-build --verbosity normal
+
       - name: dotnet publish
         run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp
 
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     environment:
-      name: 'Production'
+      name: 'Development'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
     steps: