Release V1.1 (#12)

* removed old configurations

* Add or update the Azure App Service build and deployment workflow config

* using development env

* removed slot name from deployment workflow

* docs improved

* added documentation that explain how to run the thing

* doc detail

* removed properties

* reduced section name lenght

* Fixed vs code launch settings

* Feature get plugins with metadata (#9)

get Plugins return both the plugins, counter, and max count of plugins allowed for the user

* Feature prevent plugin create after max reached (#11)

* plugin name validation

* fixed plugin not appearing

* removed legacy setting

* [vs code env] some fixes to properly run and debug in vs code

* get Plugins shall return both the plugins, counter, and max count of plugins allowed for the user

* [vs code env] fixes to tasks.json to properly build project

* prevent user from creating more plugins than allowed

* Added name validation on update

* minor fixes and cleanup using mapper

* version update

* ammend on previous wrong merge

* added missing repo

* added missing null check

---------

Co-authored-by: Michele Bortot <[email protected]>

* minor fix

---------

Co-authored-by: TouchySpidey <[email protected]>

Author: EkimoCode

.github/workflows/dev_aiplugin-dev.yml

@@ -0,0 +1,56 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy ASP.Net Core app to Azure Web App - aiplugin-dev
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '7.x'
+          include-prerelease: true
+
+      - name: Build with dotnet
+        run: dotnet build --configuration Release
+
+      - name: dotnet publish
+        run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v2
+        with:
+          name: .net-app
+          path: ${{env.DOTNET_ROOT}}/myapp
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Development'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: .net-app
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: 'aiplugin-dev'
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_4A2553DE2662436582B6E3FD7FBBBC7B }}
+          package: .

.gitignore

@@ -335,3 +335,7 @@ ASALocalRun/
 /AiPlugin.Api/AiPlugin.Api.csproj.user
 /Api/appsettings.Development.json
 /Api/FirebaseDoNotShareKeys.json
+/Api/appsettings.Prod.json
+/Api/appsettings.LocalDevelopment.json
+/Api/appsettings.Staging.json
+/Api/appsettings.Production.json

.vscode/launch.json

@@ -2,22 +2,17 @@
     "version": "0.2.0",
     "configurations": [
         {
-            // Use IntelliSense to find out which attributes exist for C# debugging
-            // Use hover for the description of the existing attributes
-            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
             "name": ".NET Core Launch (web)",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/AiPlugin.Api/bin/Debug/net7.0/AiPlugin.Api.dll",
+            "program": "${workspaceFolder}/Api/bin/Debug/net7.0/Api.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/AiPlugin.Api",
+            "cwd": "${workspaceFolder}/Api",
             "stopAtEntry": false,
-            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
                 "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+                "uriFormat": "%s/swagger/index.html"
             },
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"

.vscode/tasks.json

@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/AiPlugin.Api/AiPlugin.Api.csproj",
+                "${workspaceFolder}/Api/Api.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/AiPlugin.Api/AiPlugin.Api.csproj",
+                "${workspaceFolder}/Api/Api.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -33,7 +33,7 @@
                 "watch",
                 "run",
                 "--project",
-                "${workspaceFolder}/AiPlugin.Api/AiPlugin.Api.csproj"
+                "${workspaceFolder}/Api/Api.csproj"
             ],
             "problemMatcher": "$msCompile"
         }

Api/Controllers/PluginController.cs

@@ -14,9 +14,9 @@ namespace AiPlugin.Api.Controllers;
 [Route("api/plugins")]
 public class PluginController : ControllerBase
 {
-    private readonly IBaseRepository<Plugin> pluginRepository;
+    private readonly IPluginRepository pluginRepository;
     private readonly IMapper mapper;
-    public PluginController(IBaseRepository<Plugin> pluginRepository, IMapper mapper)
+    public PluginController(IPluginRepository pluginRepository, IMapper mapper)
     {
         this.pluginRepository = pluginRepository;
         this.mapper = mapper;
@@ -26,6 +26,9 @@ public PluginController(IBaseRepository<Plugin> pluginRepository, IMapper mapper
     [HttpPost]
     public async Task<ActionResult<Plugin>> CreatePlugin([FromBody] PluginCreateRequest request)
     {
+        var plugins = await GetUserPlugins();
+        if (plugins.PluginsCount >= plugins.MaxPlugins) return BadRequest("Max plugins reached");
+
         var plugin = mapper.Map<Plugin>(request);
         plugin.UserId = GetUserId();
         var createdPlugin = await pluginRepository.Add(plugin);
@@ -34,11 +37,9 @@ public async Task<ActionResult<Plugin>> CreatePlugin([FromBody] PluginCreateRequ
 
     // Get plugins
     [HttpGet]
-    public async Task<ActionResult<IEnumerable<Plugin>>> GetPlugins()
+    public async Task<ActionResult<PluginsGetResponse>> GetPlugins()
     {
-        var userId = GetUserId();
-        var plugins = await pluginRepository.Get().Where(p => p.UserId == userId).ToListAsync();
-        return Ok(plugins);
+        return Ok(await GetUserPlugins());
     }
 
     // Get plugin
@@ -201,5 +202,15 @@ private bool IsMatchingAuthenticatedUserId(string userId)
     {
         return string.Equals(userId, GetUserId(), StringComparison.OrdinalIgnoreCase);
     }
+
+    private async Task<PluginsGetResponse> GetUserPlugins()
+    {
+        var plugins = await pluginRepository
+            .Get(GetUserId())
+            .ToListAsync();
+
+        return mapper.Map<PluginsGetResponse>(plugins);
+    }
+
     #endregion
 }

Api/Controllers/PublicPluginController.cs

@@ -12,10 +12,10 @@ namespace AiPlugin.Api.Controllers;
 [ApiController]
 public class PublicPluginController : ControllerBase
 {
-    private readonly IBaseRepository<Plugin> pluginRepository;
+    private readonly IPluginRepository pluginRepository;
     private readonly int millisecondsDelay = 700;
     private readonly IMapper mapper;
-    public PublicPluginController(IBaseRepository<Plugin> pluginRepository, IMapper mapper)
+    public PublicPluginController(IPluginRepository pluginRepository, IMapper mapper)
     {
         this.pluginRepository = pluginRepository;
         this.mapper = mapper;

Api/Dto/PluginsGetResponse.cs

@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+using AiPlugin.Domain;
+
+namespace AiPlugin.Api.Dto;
+public class PluginsGetResponse
+{
+    public int PluginsCount { get; set; }
+    public int MaxPlugins { get; set; }
+    public IEnumerable<Plugin> Plugins { get; set; } = null!;
+}

Api/Mappings/MappingProfile.cs

@@ -29,7 +29,7 @@ public MappingProfile()
             {
                 dest.Paths = new OpenApiPaths();
 
-                foreach (var section in src.Sections)
+                foreach (var section in src.Sections?? new List<Section>())
                 {
                     dest.Paths.Add($"/{section.Name}", new OpenApiPathItem
                     {
@@ -112,6 +112,11 @@ public MappingProfile()
         CreateMap<PluginUpdateRequest, Plugin>();
         CreateMap<SectionCreateRequest, Section>();
         CreateMap<SectionUpdateRequest, Section>();
+
+        CreateMap<IEnumerable<Plugin>, PluginsGetResponse>()
+            .ForMember(dest => dest.PluginsCount, opt => opt.MapFrom(src => src.Count()))
+            .ForMember(dest => dest.MaxPlugins, opt => opt.MapFrom(src => 3))
+            .ForMember(dest => dest.Plugins, opt => opt.MapFrom(src => src));
     }
 
     private string GetBaseUrl()

Api/Program.cs

@@ -10,9 +10,6 @@
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Logging.AddConsole();
-//deserialize and inject GPTSettings fron "GPTSettings" section of appsettings.json
-var gPTSettings = builder.Configuration.GetSection("GPTSettings").Get<GPTSettings>()!;
-builder.Services.AddSingleton(gPTSettings);
 
 //var keyVaultEndpoint = new Uri(Environment.GetEnvironmentVariable("VaultUri"));
 //builder.Configuration.AddAzureKeyVault(keyVaultEndpoint, new DefaultAzureCredential());
@@ -33,7 +30,7 @@
         });
 });
 
-var version = "1.2.2"; //pluginId and admin subdomain management with authenticated users
+var version = "1.2.3"; //added plugin count and max plugin count to get plugins response
 builder.Services.AddSwaggerGen(options =>
 {
     options.OperationFilter<OpenApiParameterIgnoreFilter>();
@@ -46,7 +43,7 @@
 });
 
 
-builder.Services.AddScoped<IBaseRepository<Plugin>, PluginRepository>();
+builder.Services.AddScoped<IPluginRepository, PluginRepository>();
 
 builder.Services.AddAuthentication(options => { options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; })
       .AddJwtBearer(options =>