Merge pull request #81 from DoWhile-UOM/dev

Dev
DoWhile-UOM · May 30, 2024 · c617476 · c617476
2 parents 11ddf94 + 38648f1
commit c617476
Show file tree

Hide file tree

Showing 23 changed files with 1,117 additions and 63 deletions.
diff --git a/FirstStep/Controllers/ApplicationController.cs b/FirstStep/Controllers/ApplicationController.cs
@@ -38,6 +38,13 @@ public async Task<ActionResult<ApplicationListingPageDto>> GetApplicationList(in
             return Ok(await _service.GetApplicationList(jobId, status));
         }
 
+        [HttpGet]
+        [Route("GetAssignedApplicationList/hraId={hraId:int}/JobID={jobId:int}/status={status}")]
+        public async Task<ActionResult<ApplicationListingPageDto>> GetAssignedApplicationList(int hraId, int jobId, string status)
+        {
+            return Ok(await _service.GetAssignedApplicationList(hraId, jobId, status));
+        }
+
         [HttpGet]
         [Route("GetApplicationsBySeekerId/{id}")]
         public async Task<ActionResult<IEnumerable<Application>>> GetApplicationsBySeekerId(int id)
@@ -99,6 +106,14 @@ public async Task<IActionResult> DelegateTaskToHRAssistants(int jobID, string hr
             }
         }
 
+        [HttpPatch]
+        [Route("ChangeAssignedHRA/applicationId={applicationId}/hraId={hraId}")]
+        public async Task<IActionResult> ChangeAssignedHRA(int applicationId, int hraId)
+        {
+            await _service.ChangeAssignedHRA(applicationId, hraId);
+            return Ok("Successfully changed assigned HRA.");
+        }
+
         [HttpPut]
         [Route("UpdateApplication")]
         public async Task<IActionResult> UpdateCApplication(Application reqApplication)

diff --git a/FirstStep/Controllers/CompanyController.cs b/FirstStep/Controllers/CompanyController.cs
@@ -86,7 +86,7 @@ public async Task<IActionResult> AddCompany(AddCompanyDto newCompany)
             {
                 Console.WriteLine(ex.Message);
                 Console.WriteLine(ex.StackTrace);
-                return StatusCode(500, "Internal Server Error");
+                return BadRequest(ex.Message);
             }
 
         }

diff --git a/FirstStep/Data/DataContext.cs b/FirstStep/Data/DataContext.cs
@@ -22,8 +22,6 @@ public DataContext(DbContextOptions<DataContext> options) : base(options) { }
 
         public DbSet<Employee> Employees { get; set; } = null!;
 
-
-
         public DbSet<Seeker> Seekers { get; set; } = null!;
 
         public DbSet<HRManager> HRManagers { get; set; } = null!;
@@ -35,7 +33,6 @@ public DataContext(DbContextOptions<DataContext> options) : base(options) { }
         public DbSet<ProfessionKeyword> ProfessionKeywords { get; set; } = null!;
 
         public DbSet<Revision> Revisions { get; set; } = null!;
-
 
         public DbSet<OTPRequest> OTPRequests { get; set; } = null!;
 

diff --git a/FirstStep/Firststep.sln b/FirstStep/Firststep.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34202.233
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FirstStep", "FirstStep.csproj", "{0F818099-7ADC-454B-9915-474071C5409E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FirstStep", "FirstStep.csproj", "{0F818099-7ADC-454B-9915-474071C5409E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FirstStepTest", "..\FirstStepTest\FirstStepTest.csproj", "{23AE72FA-C443-4E2F-9A52-A123AD74A836}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,10 @@ Global
 		{0F818099-7ADC-454B-9915-474071C5409E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0F818099-7ADC-454B-9915-474071C5409E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F818099-7ADC-454B-9915-474071C5409E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23AE72FA-C443-4E2F-9A52-A123AD74A836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23AE72FA-C443-4E2F-9A52-A123AD74A836}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23AE72FA-C443-4E2F-9A52-A123AD74A836}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23AE72FA-C443-4E2F-9A52-A123AD74A836}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE