From 3884c74d9b93ee0f38878d86c77bd89831dbdcd5 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 19 Sep 2025 16:46:41 +0530
Subject: [PATCH] First saving the project sevice mapping then the project org
 mapping

---
 .../Controllers/OrganizationController.cs              | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Marco.Pms.Services/Controllers/OrganizationController.cs b/Marco.Pms.Services/Controllers/OrganizationController.cs
index af98d12..b20a1d7 100644
--- a/Marco.Pms.Services/Controllers/OrganizationController.cs
+++ b/Marco.Pms.Services/Controllers/OrganizationController.cs
@@ -352,6 +352,7 @@ namespace Marco.Pms.Services.Controllers
                 }
 
                 List<ProjectOrgMapping> projectOrgMappings = new List<ProjectOrgMapping>();
+                List<ProjectServiceMapping> projectServiceMappings = new List<ProjectServiceMapping>();
 
                 foreach (var serviceId in model.ServiceIds)
                 {
@@ -368,6 +369,7 @@ namespace Marco.Pms.Services.Controllers
                     {
                         projectService = new ProjectServiceMapping
                         {
+                            Id = Guid.NewGuid(),
                             ProjectId = project.Id,
                             ServiceId = serviceId,
                             TenantId = project.TenantId,
@@ -376,7 +378,7 @@ namespace Marco.Pms.Services.Controllers
                             ActualStartDate = DateTime.UtcNow,
                             IsActive = true
                         };
-                        _context.ProjectServiceMappings.Add(projectService);
+                        projectServiceMappings.Add(projectService);
                     }
                     var projectOrgMapping = new ProjectOrgMapping
                     {
@@ -395,6 +397,12 @@ namespace Marco.Pms.Services.Controllers
                     }
                 }
 
+                if (projectServiceMappings.Any())
+                {
+                    _context.ProjectServiceMappings.AddRange(projectServiceMappings);
+                    await _context.SaveChangesAsync();
+                }
+
                 _context.ProjectOrgMappings.AddRange(projectOrgMappings);
 
                 await _context.SaveChangesAsync();