Merge Dev into Master

.github/workflows/ci.yml

@@ -0,0 +1,82 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - dev
+      - feature/**
+
+jobs:
+  dotnet-format:
+    name: dotnet format
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '10.0.x'
+
+      - name: Restore
+        run: dotnet restore ./JobFlow.API/JobFlow.API.csproj
+
+      - name: Verify formatting
+        run: dotnet format ./JobFlow.API/JobFlow.API.csproj --verify-no-changes --verbosity minimal
+
+  dependency-review:
+    name: Dependency review
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Dependency review
+        uses: actions/dependency-review-action@v4
+        continue-on-error: true
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '10.0.x'
+
+      - name: Restore
+        run: dotnet restore ./JobFlow.API/JobFlow.API.csproj
+
+      - name: Build
+        run: dotnet build ./JobFlow.API/JobFlow.API.csproj -c Release --no-restore
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '10.0.x'
+
+      - name: Restore
+        run: dotnet restore ./JobFlow.API/JobFlow.API.csproj
+
+      - name: Test
+        run: dotnet test ./JobFlow.API/JobFlow.API.csproj -c Release --no-build
+

.github/workflows/master_jobflow-api.yml

@@ -1,9 +1,6 @@
 name: Build and deploy ASP.Net Core app to Azure Web App - jobflow-api
 
 on:
-  push:
-    tags:
-      - 'release-*'
   workflow_dispatch:
 
 jobs:
@@ -20,7 +17,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '10.0.x'
-          include-prerelease: true
 
       # ✅ Restore explicitly
       - name: Restore dependencies

.github/workflows/staging_jobflow-api.yml

@@ -0,0 +1,95 @@
+name: Build and deploy ASP.Net Core app to Azure Web App - jobflow-api-staging
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '10.0.x'
+
+      - name: Build with dotnet
+        run: dotnet build JobFlow.API/JobFlow.API.csproj --configuration Release
+
+      - name: dotnet publish
+        run: dotnet publish JobFlow.API/JobFlow.API.csproj --configuration Release --output ${{env.DOTNET_ROOT}}/myapp
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v4
+        with:
+          name: .net-app
+          path: ${{env.DOTNET_ROOT}}/myapp
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Staging'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: .net-app
+
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_15A959992577476DBE8A0461C48B98E2 }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_0D7B12FDA6784264AD6F6B11A9FD4D54 }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_9763D46E278F4180A2B5D8CC4B8B9E88 }}
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'jobflow-api-staging'
+          slot-name: 'Production'
+          package: .
+
+  deploy-prod:
+    runs-on: ubuntu-latest
+    needs: deploy
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: .net-app
+
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_15A959992577476DBE8A0461C48B98E2 }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_0D7B12FDA6784264AD6F6B11A9FD4D54 }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_9763D46E278F4180A2B5D8CC4B8B9E88 }}
+
+      - name: Deploy to Azure Web App (prod)
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'jobflow-api'
+          slot-name: 'Production'
+          package: .

JobFlow.API/Controllers/AssignmentController.cs

@@ -96,5 +96,31 @@ public async Task<IActionResult> UpdateStatus(Guid id, [FromBody] UpdateAssignme
         return Ok(result.Value);
     }
 
+    // Update assignees for an assignment
+    [HttpPut("{id:guid}/assignees")]
+    public async Task<IActionResult> UpdateAssignees(Guid id, [FromBody] UpdateAssignmentAssigneesRequestDto dto)
+    {
+        var organizationId = HttpContext.GetOrganizationId();
+
+        var result = await _assignmentService.UpdateAssignmentAssigneesAsync(organizationId, id, dto);
+        if (result.IsFailure)
+            return BadRequest(result.Error);
+
+        return Ok(result.Value);
+    }
+
+    // Update assignment notes
+    [HttpPut("{id:guid}/notes")]
+    public async Task<IActionResult> UpdateNotes(Guid id, [FromBody] UpdateAssignmentNotesRequestDto dto)
+    {
+        var organizationId = HttpContext.GetOrganizationId();
+
+        var result = await _assignmentService.UpdateAssignmentNotesAsync(organizationId, id, dto);
+        if (result.IsFailure)
+            return BadRequest(result.Error);
+
+        return Ok(result.Value);
+    }
+
 
 }

JobFlow.API/Controllers/AuthController.cs

@@ -3,8 +3,10 @@
 using System.Text;
 using FirebaseAdmin.Auth;
 using JobFlow.Business.ModelErrors;
+using JobFlow.Business.Models.DTOs;
 using JobFlow.Business.Services.ServiceInterfaces;
 using JobFlow.Domain.Models;
+using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.IdentityModel.Tokens;
@@ -29,6 +31,7 @@ public AuthController(
     // ============================================================
     [HttpPost]
     [Route("login-with-firebase")]
+    [AllowAnonymous]
     public async Task<IActionResult> LoginWithFirebase([FromBody] TokenDto model)
     {
         try
@@ -57,7 +60,8 @@ public async Task<IActionResult> LoginWithFirebase([FromBody] TokenDto model)
             else
                 user = userInfo.Value;
 
-            return Ok(new { user.Organization });
+            var organizationDto = user.Organization?.Adapt<OrganizationDto>();
+            return Ok(new { organization = organizationDto });
         }
         catch (Exception ex)
         {
@@ -210,15 +214,15 @@ public async Task<IActionResult> DeleteAccount(string uid)
             return BadRequest(new { Message = "Failed to delete user.", Error = ex.Message });
         }
     }
-    
+
 }
 
 // ============================================================
 // DTOs
 // ============================================================
 public class TokenDto
 {
-    public string Token { get; set; }
+    public string Token { get; set; } = string.Empty;
 }
 
 public class CreateAccountRequest