From e53d45ed77ffa29904936cfdbad1559c021719bc Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 10 Apr 2025 19:16:21 +0530
Subject: [PATCH] Created new Api for creating and editing activities

---
 .../Controllers/MasterController.cs           | 28 +++++++++++++++++++
 .../Controllers/TaskController.cs             | 11 --------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index c52ecc5..204d37b 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -1,10 +1,12 @@
 using Marco.Pms.DataAccess.Data;
 using Marco.Pms.Model.Dtos.Activities;
+using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Utilities;
 using MarcoBMS.Services.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 
 namespace Marco.Pms.Services.Controllers
 {
@@ -20,6 +22,15 @@ namespace Marco.Pms.Services.Controllers
             _context = context;
             _userHelper = userHelper;
         }
+        [HttpGet]
+        [Route("activities")]
+        public async Task<IActionResult> GetActivitiesMaster()
+        {
+            var tenantId = _userHelper.GetTenantId();
+            var activities = await _context.ActivityMasters.Where(c => c.TenantId == tenantId).ToListAsync();
+            return Ok(ApiResponse<object>.SuccessResponse(activities, "Success.", 200));
+        }
+
         [HttpPost("activity")]
         public async Task<IActionResult> CreateActivity([FromBody] CreateActivityMasterDto createActivity)
         {
@@ -34,5 +45,22 @@ namespace Marco.Pms.Services.Controllers
             await _context.SaveChangesAsync();
             return Ok(ApiResponse<object>.SuccessResponse(activityMaster, "Activity created successfully", 200));
         }
+
+        [HttpPost("edit{id}")]
+        public async Task<IActionResult> UpdateActivity(int id, [FromBody] CreateActivityMasterDto createActivity)
+        {
+            var tenantId = _userHelper.GetTenantId();
+            var employee = await _userHelper.GetCurrentEmployeeAsync();
+            ActivityMaster? activity = await _context.ActivityMasters.FirstOrDefaultAsync(x => x.Id == id);
+            if (activity != null) { 
+                activity.ActivityName = activity.ActivityName;
+                activity.UnitOfMeasurement = createActivity.UnitOfMeasurement;
+                activity.TenantId = tenantId;
+                await _context.SaveChangesAsync();
+                return Ok(ApiResponse<object>.SuccessResponse(activity, "Activity updated successfully", 200));
+            }
+            
+            return NotFound(ApiResponse<object>.ErrorResponse("Activity no found", "Activity no found", 404));
+        }
     }
 }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index f7eb3f3..721138e 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -35,17 +35,6 @@ namespace MarcoBMS.Services.Controllers
             return _userHelper.GetTenantId();
         }
 
-        [HttpGet]
-        [Route("activities")]
-        public async Task<IActionResult> GetActivitiesMaster()
-        {
-            var tenantId = GetTenantId();
-            var activities = await _context.ActivityMasters.Where(c => c.TenantId == tenantId).ToListAsync();
-            return Ok(ApiResponse<object>.SuccessResponse(activities, "Success.", 200));
-        }
-
-
-
         [HttpPost("assign")]
         public async Task<IActionResult> AssignTask([FromBody] AssignTaskDto assignTask)
         {