Merge branch 'dev' into brokerService

.dockerignore

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

.vscode/launch.json

@@ -0,0 +1,35 @@
+{
+    "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/dotnet/vscode-csharp/blob/main/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}/Cloud/bin/Debug/net6.0/Cloud.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/Cloud",
+            "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+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Cloud.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/Cloud.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/Cloud.sln"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

Cloud/Controllers/FarmController.cs

@@ -62,10 +62,11 @@ namespace Cloud.Controllers
         {
             try
             {
-				var farm = new Farm {
+                var farm = new Farm
+                {
                     Name = farmRequest.Name,
                     UserId = userId,
-					RaspberryMacAddr = farmRequest.RaspberryMacAddr,
+                    RaspberryIP = farmRequest.RaspberryIP,
                 };
 
                 Farm? farmCreated = _context.Farms.Add(farm).Entity;
@@ -90,7 +91,7 @@ namespace Cloud.Controllers
                     return NotFound("Farm is not found");
 
                 farm.Name = farmRequest.Name;
-				farm.RaspberryMacAddr = farmRequest.RaspberryMacAddr;
+                farm.RaspberryIP = farmRequest.RaspberryIP;
 
                 _context.Farms.Update(farm);
                 await _context.SaveChangesAsync();
@@ -123,6 +124,5 @@ namespace Cloud.Controllers
                 return BadRequest(ex.Message);
             }
         }
-
     }
 }

Cloud/Controllers/WeatherForecastController.cs

@@ -1,32 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace Cloud.Controllers;
-
-[ApiController]
-[Route("[controller]")]
-public class WeatherForecastController : ControllerBase
-{
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-    };
-
-    private readonly ILogger<WeatherForecastController> _logger;
-
-    public WeatherForecastController(ILogger<WeatherForecastController> logger)
-    {
-        _logger = logger;
-    }
-
-    [HttpGet(Name = "GetWeatherForecast")]
-    public IEnumerable<WeatherForecast> Get()
-    {
-        return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-        {
-            Date = DateTime.Now.AddDays(index),
-            TemperatureC = Random.Shared.Next(-20, 55),
-            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-        })
-        .ToArray();
-    }
-}

Cloud/Dockerfile

@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+WORKDIR /app
+EXPOSE 5124
+
+ENV ASPNETCORE_URLS=http://+:5124
+
+# Creates a non-root user with an explicit UID and adds permission to access the /app folder
+# For more info, please refer to https://aka.ms/vscode-docker-dotnet-configure-containers
+RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
+USER appuser
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+ARG configuration=Release
+WORKDIR /src
+COPY ["Cloud.csproj", "."]
+RUN dotnet restore "./Cloud.csproj"
+COPY . .
+WORKDIR "/src/."
+RUN dotnet build "./Cloud.csproj" -c $configuration -o /app/build
+
+FROM build AS publish
+ARG configuration=Release
+RUN dotnet publish "./Cloud.csproj" -c $configuration -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "Cloud.dll"]
+

Cloud/Models/Farm.cs

@@ -6,7 +6,6 @@
         public string Name { get; set; }
         public int UserId { get; set; }
         public User? User { get; set; }
-		public string RaspberryMacAddr { get; set; }
-
+        public string RaspberryIP { get; set; }
     }
 }

Cloud/Requests/FarmRequest.cs

@@ -3,6 +3,6 @@
     public class FarmRequest
     {
         public string Name { get; set; }
-		public string RaspberryMacAddr { get; set; }
+        public string RaspberryIP { get; set; }
     }
 }

Cloud/Validation/FarmValidator.cs

@@ -7,9 +7,9 @@ namespace Cloud.Validation
     {
         public FarmValidator()
         {
-			RuleFor(request => request.RaspberryMacAddr)
-				.NotEmpty().WithMessage("MAC address can't be empty")
-				.Matches("^([0-9A-Fa-f]{2}[:-]?){5}([0-9A-Fa-f]{2})$").WithMessage("MAC address is not valid");
+            RuleFor(request => request.RaspberryIP)
+                .NotEmpty().WithMessage("IP address can't be empty")
+                .Matches(@"^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$").WithMessage("IP address is not valid");
 
             RuleFor(request => request.Name)
                 .NotEmpty().WithMessage("Name can't be empty");

Cloud/WeatherForecast.cs

@@ -1,12 +0,0 @@
-namespace Cloud;
-
-public class WeatherForecast
-{
-    public DateTime Date { get; set; }
-
-    public int TemperatureC { get; set; }
-
-    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-    public string? Summary { get; set; }
-}

docker-compose.yml

@@ -1,4 +1,11 @@
 services:
+  cloud:
+    build: ./Cloud/
+    ports:
+      - "5124:5124"
+    depends_on:
+      - postgres
+      - redis
   postgres:
     image: postgres:14
     container_name: cucumber_database
@@ -10,7 +17,6 @@ services:
       - "5438:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data  
-  
   redis:
     image: 'redis:latest'
     ports: