Reports service

MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.docker.yml

@@ -168,22 +168,46 @@ modules:
         downstream: reports-service/reports
         auth: true
 
-      - upstream: /
-        method: GET
+      - upstream: /{reportId}
+        method: DELETE
         use: downstream
-        downstream: reports-service/reports
+        downstream: reports-service/reports/{reportId}
         auth: true
 
-      - upstream: /
-        method: PUT
+      - upstream: /search
+        method: POST
         use: downstream
-        downstream: reports-service/reports
+        downstream: reports-service/reports/search
         auth: true
 
-      - upstream: /{reportId}
+      - upstream: /{reportId}/cancel
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/cancel
+        auth: true
+
+      - upstream: /{reportId}/start-review
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/start-review
+        auth: true
+
+      - upstream: /{reportId}/resolve
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/resolve
+        auth: true
+
+      - upstream: /{reportId}/reject
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/reject
+        auth: true
+
+      - upstream: /students/{studentId}
         method: GET
         use: downstream
-        downstream: reports-service/reports/{reportId}
+        downstream: reports-service/reports/students/{studentId}
         auth: true
 
     services:

MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.yml

@@ -168,22 +168,46 @@ modules:
         downstream: reports-service/reports
         auth: true
 
-      - upstream: /
-        method: GET
+      - upstream: /{reportId}
+        method: DELETE
         use: downstream
-        downstream: reports-service/reports
+        downstream: reports-service/reports/{reportId}
         auth: true
 
-      - upstream: /
-        method: PUT
+      - upstream: /search
+        method: POST
         use: downstream
-        downstream: reports-service/reports
+        downstream: reports-service/reports/search
         auth: true
 
-      - upstream: /{reportId}
+      - upstream: /{reportId}/cancel
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/cancel
+        auth: true
+
+      - upstream: /{reportId}/start-review
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/start-review
+        auth: true
+
+      - upstream: /{reportId}/resolve
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/resolve
+        auth: true
+
+      - upstream: /{reportId}/reject
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/reject
+        auth: true
+
+      - upstream: /students/{studentId}
         method: GET
         use: downstream
-        downstream: reports-service/reports/{reportId}
+        downstream: reports-service/reports/students/{studentId}
         auth: true
 
     services:

MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada.docker.yml

@@ -145,22 +145,46 @@ modules:
         downstream: reports-service/reports
         auth: true
 
-      - upstream: /
-        method: GET
+      - upstream: /{reportId}
+        method: DELETE
         use: downstream
-        downstream: reports-service/reports
+        downstream: reports-service/reports/{reportId}
         auth: true
 
-      - upstream: /
-        method: PUT
+      - upstream: /search
+        method: POST
         use: downstream
-        downstream: reports-service/reports
+        downstream: reports-service/reports/search
         auth: true
 
-      - upstream: /{reportId}
+      - upstream: /{reportId}/cancel
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/cancel
+        auth: true
+
+      - upstream: /{reportId}/start-review
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/start-review
+        auth: true
+
+      - upstream: /{reportId}/resolve
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/resolve
+        auth: true
+
+      - upstream: /{reportId}/reject
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/reject
+        auth: true
+
+      - upstream: /students/{studentId}
         method: GET
         use: downstream
-        downstream: reports-service/reports/{reportId}
+        downstream: reports-service/reports/students/{studentId}
         auth: true
 
     services:

MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada.yml

@@ -147,22 +147,46 @@ modules:
         downstream: reports-service/reports
         auth: true
 
-      - upstream: /
-        method: GET
+      - upstream: /{reportId}
+        method: DELETE
         use: downstream
-        downstream: reports-service/reports
+        downstream: reports-service/reports/{reportId}
         auth: true
 
-      - upstream: /
-        method: PUT
+      - upstream: /search
+        method: POST
         use: downstream
-        downstream: reports-service/reports
+        downstream: reports-service/reports/search
         auth: true
 
-      - upstream: /{reportId}
+      - upstream: /{reportId}/cancel
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/cancel
+        auth: true
+
+      - upstream: /{reportId}/start-review
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/start-review
+        auth: true
+
+      - upstream: /{reportId}/resolve
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/resolve
+        auth: true
+
+      - upstream: /{reportId}/reject
+        method: POST
+        use: downstream
+        downstream: reports-service/reports/{reportId}/reject
+        auth: true
+
+      - upstream: /students/{studentId}
         method: GET
         use: downstream
-        downstream: reports-service/reports/{reportId}
+        downstream: reports-service/reports/students/{studentId}
         auth: true
 
     services:

MiniSpace.Services.Reports/MiniSpace.Services.Reports.sln

@@ -0,0 +1,48 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{62C95F84-EA55-4778-B3B2-A86F4CAC3251}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniSpace.Services.Reports.Api", "src\MiniSpace.Services.Reports.Api\MiniSpace.Services.Reports.Api.csproj", "{1B494198-CB0A-49A0-95A8-4AAE613CEACA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniSpace.Services.Reports.Application", "src\MiniSpace.Services.Reports.Application\MiniSpace.Services.Reports.Application.csproj", "{E9BDACF7-D03A-4CAF-B127-80444BB751CD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniSpace.Services.Reports.Core", "src\MiniSpace.Services.Reports.Core\MiniSpace.Services.Reports.Core.csproj", "{C1F71C74-5021-4FC8-9EB9-7222D093ABF9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniSpace.Services.Reports.Infrastructure", "src\MiniSpace.Services.Reports.Infrastructure\MiniSpace.Services.Reports.Infrastructure.csproj", "{F4851582-777D-473D-8A50-AB4FA57EC91A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1B494198-CB0A-49A0-95A8-4AAE613CEACA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B494198-CB0A-49A0-95A8-4AAE613CEACA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B494198-CB0A-49A0-95A8-4AAE613CEACA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B494198-CB0A-49A0-95A8-4AAE613CEACA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9BDACF7-D03A-4CAF-B127-80444BB751CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9BDACF7-D03A-4CAF-B127-80444BB751CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9BDACF7-D03A-4CAF-B127-80444BB751CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9BDACF7-D03A-4CAF-B127-80444BB751CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1F71C74-5021-4FC8-9EB9-7222D093ABF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1F71C74-5021-4FC8-9EB9-7222D093ABF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1F71C74-5021-4FC8-9EB9-7222D093ABF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1F71C74-5021-4FC8-9EB9-7222D093ABF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4851582-777D-473D-8A50-AB4FA57EC91A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4851582-777D-473D-8A50-AB4FA57EC91A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4851582-777D-473D-8A50-AB4FA57EC91A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4851582-777D-473D-8A50-AB4FA57EC91A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{1B494198-CB0A-49A0-95A8-4AAE613CEACA} = {62C95F84-EA55-4778-B3B2-A86F4CAC3251}
+		{E9BDACF7-D03A-4CAF-B127-80444BB751CD} = {62C95F84-EA55-4778-B3B2-A86F4CAC3251}
+		{C1F71C74-5021-4FC8-9EB9-7222D093ABF9} = {62C95F84-EA55-4778-B3B2-A86F4CAC3251}
+		{F4851582-777D-473D-8A50-AB4FA57EC91A} = {62C95F84-EA55-4778-B3B2-A86F4CAC3251}
+	EndGlobalSection
+EndGlobal

MiniSpace.Services.Reports/scripts/build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+dotnet build -c release

MiniSpace.Services.Reports/scripts/dockerize-tag-push.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export ASPNETCORE_ENVIRONMENT=docker
+
+cd ..
+
+docker build -t minispace.services.reports:latest .
+
+docker tag minispace.services.reports:latest adrianvsaint/minispace.services.reports:latest
+
+docker push adrianvsaint/minispace.services.reports:latest

MiniSpace.Services.Reports/scripts/start.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+export ASPNETCORE_ENVIRONMENT=local
+cd ../src/MiniSpace.Services.Reports.Api
+dotnet run

MiniSpace.Services.Reports/scripts/test.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+dotnet test

MiniSpace.Services.Reports/src/MiniSpace.Services.Reports.Api/MiniSpace.Services.Reports.Api.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <InvariantGlobalization>true</InvariantGlobalization>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Convey" Version="1.1.448" />
+    <PackageReference Include="Convey.Logging" Version="1.1.448" />
+    <PackageReference Include="Convey.WebApi" Version="1.1.448" />
+    <PackageReference Include="Convey.WebApi.CQRS" Version="1.1.448" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MiniSpace.Services.Reports.Application\MiniSpace.Services.Reports.Application.csproj" />
+    <ProjectReference Include="..\MiniSpace.Services.Reports.Core\MiniSpace.Services.Reports.Core.csproj" />
+    <ProjectReference Include="..\MiniSpace.Services.Reports.Infrastructure\MiniSpace.Services.Reports.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>

MiniSpace.Services.Reports/src/MiniSpace.Services.Reports.Api/Program.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Convey;
+using Convey.Logging;
+using Convey.Types;
+using Convey.WebApi;
+using Convey.WebApi.CQRS;
+using Microsoft.AspNetCore;
+using MiniSpace.Services.Reports.Application;
+using MiniSpace.Services.Reports.Application.Commands;
+using MiniSpace.Services.Reports.Application.DTO;
+using MiniSpace.Services.Reports.Application.Queries;
+using MiniSpace.Services.Reports.Application.Services;
+using MiniSpace.Services.Reports.Core.Wrappers;
+using MiniSpace.Services.Reports.Infrastructure;
+
+namespace MiniSpace.Services.Reports.Api
+{
+    public class Program
+    {
+        public static async Task Main(string[] args)
+            => await WebHost.CreateDefaultBuilder(args)
+                .ConfigureServices(services => services
+                    .AddConvey()
+                    .AddWebApi()
+                    .AddApplication()
+                    .AddInfrastructure()
+                    .Build())
+                .Configure(app => app
+                    .UseInfrastructure()
+                    .UseEndpoints(endpoints => endpoints
+                        .Post<SearchReports>("reports/search", async (cmd, ctx) =>
+                        {
+                            var pagedResult = await ctx.RequestServices.GetService<IReportsService>().BrowseReportsAsync(cmd);
+                            await ctx.Response.WriteJsonAsync(pagedResult);
+                        })
+                    )
+                    .UseDispatcherEndpoints(endpoints => endpoints
+                        .Get("", ctx => ctx.Response.WriteAsync(ctx.RequestServices.GetService<AppOptions>().Name))
+                        .Post<CreateReport>("reports", afterDispatch: (cmd, ctx) 
+                            => ctx.Response.Created($"reports/{cmd.ReportId}"))
+                        .Delete<DeleteReport>("reports/{reportId}")
+                        .Post<CancelReport>("reports/{reportId}/cancel")
+                        .Post<StartReportReview>("reports/{reportId}/start-review")
+                        .Post<ResolveReport>("reports/{reportId}/resolve")
+                        .Post<RejectReport>("reports/{reportId}/reject")
+                        .Get<GetStudentReports, PagedResponse<IEnumerable<ReportDto>>>("reports/students/{studentId}")
+                        ))
+                .UseLogging()
+                .Build()
+                .RunAsync();
+    }
+}

MiniSpace.Services.Reports/src/MiniSpace.Services.Reports.Api/Properties/launchSettings.json

@@ -0,0 +1,26 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:5005"
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": false,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "local"
+      }
+    },
+    "MiniSpace.Services.Reports": {
+      "commandName": "Project",
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:5005",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "local"
+      }
+    }
+  }
+}