Release of new project

.github/workflows/prevent-env-file.yml

@@ -0,0 +1,22 @@
+name: Prevent .env files in PRs
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  check-env-files:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Search for .env files
+        run: |
+          if git diff --name-only origin/main...HEAD | grep -E '(^|/)\.env'; then
+            echo "❌ PR contain .env file, merge is forbiden."
+            exit 1
+          else
+            echo "✅ There are no .env files in this PR-u."
+          fi

.gitignore

@@ -1,2 +1,2 @@
-# MacOS
-.DS_Store
+**/.DS_Store
+**/.idea/**

Fitness/Backend/.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.0",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}

Fitness/Backend/.dockerignore

@@ -1,30 +1,25 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
-!**/.gitignore
-!.git/HEAD
-!.git/config
-!.git/packed-refs
-!.git/refs/heads/**
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.idea
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

Fitness/Backend/.gitignore

@@ -2,6 +2,8 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+.idea
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
@@ -56,6 +58,8 @@ out/
 # mpeltonen/sbt-idea plugin
 .idea_modules/
 
+.idea/
+
 # JIRA plugin
 atlassian-ide-plugin.xml
 
@@ -487,3 +491,4 @@ FodyWeavers.xsd
 
 # .env
 **/.env
+uploads/**

Fitness/Backend/Common/EventBus.Messages/Constants/EventBusConstants.cs

@@ -8,8 +8,9 @@ namespace EventBus.Messages.Constants
 {
     public static class EventBusConstants
     {
-        public const string BookTrainingQueue = "bookingtraining-queue";
-        public const string CancellingTrainingQueue = "cancellingtraining-queue";
         public const string NotificationQueue = "notification-queue";
+        public const string IndividualReservationQueue = "individual-reservation-queue";
+        public const string GroupReservationQueue = "group-reservation-queue";
+        public const string ReviewQueue = "review-queue";
     }
 }

Fitness/Backend/Common/EventBus.Messages/Events/GroupReservationEvent.cs

@@ -0,0 +1,22 @@
+namespace EventBus.Messages.Events;
+
+public class GroupReservationEvent : IntegrationBaseEvent
+{
+    public string ReservationId { get; set; }
+    public string? ClientId { get; set; }
+    public string? TrainerId { get; set; }
+    public string? TrainingName { get; set; }
+    public int? Capacity { get; set; }
+    public TimeOnly? StartTime { get; set; }
+    public TimeOnly? EndTime { get; set; }
+    public DateOnly? Date { get; set; }
+    public GroupReservationEventType EventType { get; set; }
+}
+
+public enum GroupReservationEventType
+{
+    Added,
+    Removed,
+    ClientBooked,
+    ClientCancelled,
+}

Fitness/Backend/Common/EventBus.Messages/Events/IndividualReservationEvent.cs

@@ -0,0 +1,20 @@
+namespace EventBus.Messages.Events;
+
+public class IndividualReservationEvent : IntegrationBaseEvent
+{
+    public string ReservationId { get; set; }
+    public string? ClientId { get; set; }
+    public string? TrainerId { get; set; }
+    public string? TrainingTypeId { get; set; }
+    public TimeOnly? StartTime { get; set; }
+    public TimeOnly? EndTime { get; set; }
+    public DateOnly? Date { get; set; }
+    public IndividualReservationEventType EventType { get; set; }
+}
+
+public enum IndividualReservationEventType
+{
+    Booked,
+    CancelledByClient,
+    CancelledByTrainer,
+}

Fitness/Backend/Common/EventBus.Messages/Events/NotificationEvent.cs

@@ -2,18 +2,11 @@ namespace EventBus.Messages.Events;
 
 public class NotificationEvent : IntegrationBaseEvent
 {
-    public string UserId { get; set; }
-    public UserType UType { get; set; }
+    public IDictionary<string, string> UserIdToUserType { get; set; }
     public string Title { get; set; }
     public string Content { get; set; }
-    public NotificationType NType { get; set; }
+    public NotificationType Type { get; set; }
     public bool Email { get; set; }
-
-    public enum UserType
-    {
-        Client,
-        Trainer
-    }
 
     public enum NotificationType
     {

Fitness/Backend/Common/EventBus.Messages/Events/ReviewEvent.cs

@@ -0,0 +1,16 @@
+namespace EventBus.Messages.Events;
+
+public class ReviewEvent : IntegrationBaseEvent
+{
+    public string ReservationId { get; set; }
+    public string? UserId { get; set; }
+    public string? Comment { get; set; }
+    public int? Rating { get; set; }
+    public ReviewEventType EventType { get; set; }
+}
+
+public enum ReviewEventType
+{
+    ClientReview,
+    TrainerReview
+}

Fitness/Backend/Fitness.sln

@@ -25,6 +25,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventBus.Messages", "Common
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaymentService.API", "Services\PaymentService\PaymentService.API\PaymentService.API.csproj", "{39B7B5E9-F9D8-4A1F-B4E5-216248755CCA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnalyticsService.Common", "Services\AnalyticsService\AnalyticsService.Common\AnalyticsService.Common.csproj", "{64737429-3650-42B7-A1ED-AB7573B51278}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnalyticsService.API", "Services\AnalyticsService\AnalyticsService.API\AnalyticsService.API.csproj", "{29B1A1CD-24C1-41D5-B8C8-AD1CE3AE180A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReservationService.API", "Services\ReservationService\ReservationService.API\ReservationService.API.csproj", "{F3C942A5-0892-4451-9092-900F63365EC1}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationService.API", "Services\NotificationService\NotificationService.API\NotificationService.API.csproj", "{42D48CA2-5675-47F2-BAE7-91E595258CBA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientService.Common", "Services\ClientService\ClientService.Common\ClientService.Common.csproj", "{FA536695-2D2D-4B71-8883-95B6EEF320F6}"
@@ -35,12 +41,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainerService.Common", "Se
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainerService.GRPC", "Services\TrainerService\TrainerService.GRPC\TrainerService.GRPC.csproj", "{8A41AB5B-51F7-4F30-9B49-19BF8E09FC5B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatService.API", "Services\ChatService.API\ChatService.API.csproj", "{CE504321-77C1-4981-B815-489CA83FB163}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatService.API", "Services\ChatService\ChatService.API\ChatService.API.csproj", "{CE504321-77C1-4981-B815-489CA83FB163}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GatewayService.API", "Services\GatewayService\GatewayService.API\GatewayService.API.csproj", "{0E6E9A4F-6271-45A4-BA0A-9468C6F15275}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsulConfig.Settings", "Common\ConsulConfig.Settings\ConsulConfig.Settings.csproj", "{E8032951-A2BF-4DA6-B433-C3004A2D1021}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{1D121431-9B0F-4592-9D0B-90B2E191AA64}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NutritionService", "NutritionService", "{F2366384-2A1A-4EFE-8CDC-284F923B0A84}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NutritionService.API", "Services\NutritionService\NutritionService.API\NutritionService.API.csproj", "{7D625DE7-ABFB-4782-8F3F-5D9A701439D1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "videoTrainingService.API", "Services\videoTrainingService\videoTrainingService.API\videoTrainingService.API.csproj", "{5A3A398E-4133-43EF-A92C-338E8E13715C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +97,10 @@ Global
 		{39B7B5E9-F9D8-4A1F-B4E5-216248755CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39B7B5E9-F9D8-4A1F-B4E5-216248755CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39B7B5E9-F9D8-4A1F-B4E5-216248755CCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3C942A5-0892-4451-9092-900F63365EC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3C942A5-0892-4451-9092-900F63365EC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3C942A5-0892-4451-9092-900F63365EC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3C942A5-0892-4451-9092-900F63365EC1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42D48CA2-5675-47F2-BAE7-91E595258CBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42D48CA2-5675-47F2-BAE7-91E595258CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42D48CA2-5675-47F2-BAE7-91E595258CBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -115,6 +133,22 @@ Global
 		{E8032951-A2BF-4DA6-B433-C3004A2D1021}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8032951-A2BF-4DA6-B433-C3004A2D1021}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8032951-A2BF-4DA6-B433-C3004A2D1021}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64737429-3650-42B7-A1ED-AB7573B51278}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64737429-3650-42B7-A1ED-AB7573B51278}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64737429-3650-42B7-A1ED-AB7573B51278}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64737429-3650-42B7-A1ED-AB7573B51278}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29B1A1CD-24C1-41D5-B8C8-AD1CE3AE180A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29B1A1CD-24C1-41D5-B8C8-AD1CE3AE180A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29B1A1CD-24C1-41D5-B8C8-AD1CE3AE180A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29B1A1CD-24C1-41D5-B8C8-AD1CE3AE180A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A3A398E-4133-43EF-A92C-338E8E13715C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A3A398E-4133-43EF-A92C-338E8E13715C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A3A398E-4133-43EF-A92C-338E8E13715C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A3A398E-4133-43EF-A92C-338E8E13715C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D625DE7-ABFB-4782-8F3F-5D9A701439D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D625DE7-ABFB-4782-8F3F-5D9A701439D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D625DE7-ABFB-4782-8F3F-5D9A701439D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D625DE7-ABFB-4782-8F3F-5D9A701439D1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -123,6 +157,8 @@ Global
 		{DD1D07DE-12AA-437E-AC5C-B6F21A9D64C8} = {89F11E05-9275-456A-B680-9E47AEFC6A05}
 		{4E7EFF7C-F700-473B-9265-48C289A497BF} = {08A30FB7-C7FE-49F3-B26F-FB0F9945EF7A}
 		{E8032951-A2BF-4DA6-B433-C3004A2D1021} = {08A30FB7-C7FE-49F3-B26F-FB0F9945EF7A}
+		{F2366384-2A1A-4EFE-8CDC-284F923B0A84} = {1D121431-9B0F-4592-9D0B-90B2E191AA64}
+		{7D625DE7-ABFB-4782-8F3F-5D9A701439D1} = {F2366384-2A1A-4EFE-8CDC-284F923B0A84}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B317DCB6-F066-4D68-9E03-E9DF67260B22}

Fitness/Backend/Security/IdentityServer/IdentityServer.csproj

@@ -34,4 +34,8 @@
     <ProjectReference Include="..\..\Common\ConsulConfig.Settings\ConsulConfig.Settings.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Migrations\" />
+  </ItemGroup>
+
 </Project>