Merge branch 'aliencube:main' into feature/22-response-payload-definition

Author: jhmin99

Directory.Build.props

@@ -7,7 +7,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
-    <AspireVersion>8.*</AspireVersion>
+    <AspireVersion>8.2.0</AspireVersion>
     <AzureOpenAIVersion>2.*-*</AzureOpenAIVersion>
     <AspNetCoreVersion>8.*</AspNetCoreVersion>
     <MicrosoftExtensionsVersion>8.*</MicrosoftExtensionsVersion>

src/AzureOpenAIProxy.ApiApp/Endpoints/AdminEventEndpoints.cs

@@ -105,4 +105,37 @@ public static RouteHandlerBuilder AddUpdateAdminEvents(this WebApplication app)
 
         return builder;
     }
+    
+    /// <summary>
+    /// Adds the admin event endpoint
+    /// </summary>
+    /// <param name="app"><see cref="WebApplication"/> instance.</param>
+    /// <returns>Returns <see cref="RouteHandlerBuilder"/> instance.</returns>
+    public static RouteHandlerBuilder CreateAdminEvent(this WebApplication app)
+    {
+        var builder = app.MapPost(AdminEndpointUrls.AdminEvents, async (
+            [FromBody] AdminEventDetails payload,
+            HttpRequest request) =>
+        {
+            return await Task.FromResult(Results.Ok());
+        })
+        // TODO: Check both request/response payloads
+        .Accepts<AdminEventDetails>(contentType: "application/json")
+        .Produces<AdminEventDetails>(statusCode: StatusCodes.Status200OK, contentType: "application/json")
+        // TODO: Check both request/response payloads
+        .Produces(statusCode: StatusCodes.Status400BadRequest)
+        .Produces(statusCode: StatusCodes.Status401Unauthorized)
+        .Produces<string>(statusCode: StatusCodes.Status500InternalServerError, contentType: "text/plain")
+        .WithTags("admin")
+        .WithName("CreateAdminEvent")
+        .WithOpenApi(operation =>
+        {
+            operation.Summary = "Create admin event";
+            operation.Description = "Create admin event";
+
+            return operation;
+        });
+
+        return builder;
+    }
 }

src/AzureOpenAIProxy.ApiApp/Endpoints/EndpointUrls.cs

@@ -1,4 +1,4 @@
-namespace AzureOpenAIProxy.ApiApp.Endpoints;
+namespace AzureOpenAIProxy.ApiApp.Endpoints;
 
 /// <summary>
 /// This represents the collection of the endpoint URLs.
@@ -14,4 +14,9 @@ public static class EndpointUrls
     /// Declares the chat completions endpoint.
     /// </summary>
     public const string ChatCompletions = "/openai/deployments/{deploymentName}/chat/completions";
-}
+
+    /// <summary>
+    /// Declares the event endpoint.
+    /// </summary>
+    public const string Events = "/events";
+}

src/AzureOpenAIProxy.ApiApp/Endpoints/EventEndpoint.cs

@@ -0,0 +1,39 @@
+using System.Text.Json;
+
+using AzureOpenAIProxy.ApiApp.Models;
+
+namespace AzureOpenAIProxy.ApiApp.Endpoints;
+
+/// <summary>
+/// This represents the endpoint entity for events that the logged user joined.
+/// </summary>
+public static class EventEndpoint
+{
+    /// <summary>
+    /// Adds the event endpoint.
+    /// </summary>
+    /// <param name="app"><see cref="WebApplication"/> instance.</param>
+    /// <returns>Returns <see cref="RouteHandlerBuilder"/> instance.</returns>
+    public static RouteHandlerBuilder AddEventList(this WebApplication app)
+    {
+        var builder = app.MapGet(EndpointUrls.Events, () =>
+        {
+            // TODO: Issue #179 https://github.com/aliencube/azure-openai-sdk-proxy/issues/179
+            return Results.Ok();
+        })
+        .Produces<List<EventDetails>>(statusCode: StatusCodes.Status200OK, contentType: "application/json")
+        .Produces(statusCode: StatusCodes.Status401Unauthorized)
+        .Produces<string>(statusCode: StatusCodes.Status500InternalServerError, contentType: "text/plain")
+        .WithTags("events")
+        .WithName("GetEvents")
+        .WithOpenApi(operation =>
+        {
+            operation.Description = "Gets all events' details that the user joined.";
+            operation.Summary = "This endpoint gets all events' details that the user joined.";
+
+            return operation;
+        });
+
+        return builder;
+    }
+}

src/AzureOpenAIProxy.ApiApp/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using Azure.Identity;
+using Azure.Identity;
 using Azure.Security.KeyVault.Secrets;
 
 using AzureOpenAIProxy.ApiApp.Builders;
@@ -132,4 +132,4 @@ public static IServiceCollection AddOpenApiService(this IServiceCollection servi
 
         return services;
     }
-}
+}

src/AzureOpenAIProxy.ApiApp/Filters/OpenApiTagFilter.cs

@@ -16,7 +16,8 @@ public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
         [
             new OpenApiTag { Name = "weather", Description = "Weather forecast operations" },
             new OpenApiTag { Name = "openai", Description = "Azure OpenAI operations" },
-            new OpenApiTag { Name = "admin", Description = "Admin for organizing events" }
+            new OpenApiTag { Name = "admin", Description = "Admin for organizing events" },
+            new OpenApiTag { Name = "events", Description = "User events" }
         ];
     }
 }

src/AzureOpenAIProxy.ApiApp/Models/AdminEventDetails.cs

@@ -3,30 +3,15 @@
 /// <summary>
 /// This represent the event detail data for response by admin event endpoint.
 /// </summary>
-public class AdminEventDetails
+public class AdminEventDetails : EventDetails
 {
     /// <summary>
-    /// Gets or sets the event id.
-    /// </summary>
-    public required string? EventId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the event title name.
-    /// </summary>
-    public required string? Title { get; set; }
-
-    /// <summary>
-    /// Gets or sets the event summary.
-    /// </summary>
-    public required string? Summary { get; set; }
-
-    /// <summary>
-    /// Gets or sets the event description. 
+    /// Gets or sets the event description.
     /// </summary>
     public string? Description { get; set; }
 
     /// <summary>
-    /// Gets or sets the event start date. 
+    /// Gets or sets the event start date.
     /// </summary>
     public required DateTimeOffset? DateStart { get; set; }
 
@@ -46,7 +31,7 @@ public class AdminEventDetails
     public required bool? IsActive { get; set; }
 
     /// <summary>
-    /// Gets or sets the event organizer name. 
+    /// Gets or sets the event organizer name.
     /// </summary>
     public required string? OrganizerName { get; set; }
 
@@ -64,14 +49,4 @@ public class AdminEventDetails
     /// Gets or sets the event coorganizer email.
     /// </summary>
     public string? CoorganizerEmail { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Azure OpenAI Service request max token capacity. 
-    /// </summary>
-    public required int? MaxTokenCap { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Azure OpenAI Service daily request capacity.
-    /// </summary>
-    public required int? DailyRequestCap { get; set; }
 }

src/AzureOpenAIProxy.ApiApp/Models/EventDetails.cs

@@ -0,0 +1,35 @@
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+
+using AzureOpenAIProxy.ApiApp.Models;
+
+/// <summary>
+/// This represents the event's detailed data for response by EventEndpoint.
+/// </summary>
+public class EventDetails
+{
+    /// <summary>
+    /// Gets or sets the event id.
+    /// </summary>
+    public required string? EventId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the event title name.
+    /// </summary>
+    public required string? Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the event summary.
+    /// </summary>
+    public required string? Summary { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Azure OpenAI Service request max token capacity.
+    /// </summary>
+    public required int? MaxTokenCap { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Azure OpenAI Service daily request capacity.
+    /// </summary>
+    public required int? DailyRequestCap { get; set; }
+}

src/AzureOpenAIProxy.ApiApp/Program.cs

@@ -39,9 +39,13 @@
 app.AddWeatherForecast();
 app.AddChatCompletions();
 
+// Event Endpoints
+app.AddEventList();
+
 // Admin Endpoints
 app.AddAdminEvents();
 app.AddAdminEventList();
 app.AddUpdateAdminEvents();
+app.CreateAdminEvent();
 
 await app.RunAsync();