Merge pull request #65 from one-project-one-month/dev

Dev

README.md

@@ -184,4 +184,28 @@ Scaffold-DbContext "Server=.;Database=AdminPortal;User ID=sa; Password=sa@123;In
 
 ### CI
 
-GitHub Actions
+GitHub Actions
+
+https://stackoverflow.com/questions/30346907/how-to-remove-webdav-module-from-iis
+https://learn.microsoft.com/en-us/answers/questions/856808/iis-net-6-aspnetcorev2-405-method-not-allowed
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <system.webServer>
+        <security>
+            <requestFiltering>
+                <verbs>
+                    <add verb="GET" allowed="true" />
+                    <add verb="POST" allowed="true" />
+                    <add verb="PUT" allowed="true" />
+                    <add verb="PATCH" allowed="true" />
+                    <add verb="DELETE" allowed="true" />
+                </verbs>
+            </requestFiltering>
+        </security>
+		<modules runAllManagedModulesForAllRequests="true">
+		  <remove name="WebDAVModule" />
+		</modules>
+    </system.webServer>
+</configuration>
+```

REMS.BackendApi/Features/Agent/AgentController.cs

@@ -65,14 +65,6 @@ public async Task<IActionResult> UpdateAgent(int userId, AgentRequestModel reque
         }
     }
 
-    [HttpPost("LoginAgent", Name = "LoginAgent")]
-    public async Task<IActionResult> LoginAgent(AgentLoginRequestModel agentLoginInfo)
-    {
-        Result<string> res = await _blAgent.LoginAgentAsync(agentLoginInfo);
-
-        return Ok(res);
-    }
-
     [HttpGet("SearchUser/{id}", Name = "SearchUser")]
     public async Task<IActionResult> SearchUser(int id)
     {
@@ -96,4 +88,12 @@ public async Task<IActionResult> SearchAgentByNameAndLocation(SearchAgentRequest
 
         return Ok(agentList);
     }
+
+    [HttpGet("AgentAll", Name = "AgentAll")]
+    public async Task<IActionResult> AgentAll()
+    {
+        Result<List<AgentDto>> agentList = await _blAgent.AgentAll();
+
+        return Ok(agentList);
+    }
 }

REMS.BackendApi/Features/Appointment/AppointmentController.cs

@@ -46,7 +46,7 @@ public async Task<IActionResult> DeleteAppointment(int id)
         }
 
         [HttpGet("{propertyId}/{pageNo}/{pageSize}")]
-        public async Task<IActionResult> GetAppointmentByAgentId(int propertyId, int pageNo, int pageSize)
+        public async Task<IActionResult> GetAppointmentByPropertyIdAsync(int propertyId, int pageNo, int pageSize)
         {
             try
             {
@@ -76,5 +76,21 @@ public async Task<IActionResult> UpdateAppointment(int id, AppointmentRequestMod
                 return StatusCode(StatusCodes.Status500InternalServerError, ex);
             }
         }
+
+        [HttpGet("GetAppointmentByClientId/{clientId}/{pageNo}/{pageSize}", Name = "GetAppointmentByClientId")]
+        public async Task<IActionResult> GetAppointmentByClientId(int clientId, int pageNo, int pageSize)
+        {
+            try
+            {
+                var response = await _blAppointment.GetAppointmentByClientId(clientId, pageNo, pageSize);
+                if (response.IsError)
+                    return BadRequest(response);
+                return Ok(response);
+            }
+            catch (Exception ex)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError, ex.ToString());
+            }
+        }
     }
 }

REMS.BackendApi/Features/Client/ClientController.cs

@@ -4,7 +4,7 @@ namespace REMS.BackendApi.Features.Client;
 
 [Route("api/v1/clients")]
 [ApiController]
-[Authorize(Roles = "Agent")]
+//[Authorize(Roles = "Agent")]
 public class ClientController : ControllerBase
 {
     private readonly BL_Client _blClient;

REMS.BackendApi/Features/Property/PropertyController.cs

@@ -1,4 +1,5 @@
-using REMS.Models.Property;
+using REMS.Models;
+using REMS.Models.Property;
 
 namespace REMS.BackendApi.Features.Property;
 
@@ -14,11 +15,16 @@ public PropertyController(BL_Property blProperties)
     }
 
     [HttpGet]
-    public async Task<IActionResult> GetProperties()
+    public async Task<IActionResult> GetProperties(string? propertyStatus = "")
     {
         try
         {
-            var response = await _blProperties.GetProperties();
+            if (!string.IsNullOrWhiteSpace(propertyStatus) && !IsValidPropertyStatus(propertyStatus))
+            {
+                return BadRequest($"Invalid Status; Status should be one of the following: {string.Join(", ", Enum.GetNames(typeof(PropertyStatus)))}");
+            }
+
+            var response = await _blProperties.GetProperties(propertyStatus);
             return Ok(response);
         }
         catch (Exception ex)
@@ -28,11 +34,16 @@ public async Task<IActionResult> GetProperties()
     }
 
     [HttpGet("{pageNo}/{pageSize}")]
-    public async Task<IActionResult> GetProperties(int pageNo, int pageSize)
+    public async Task<IActionResult> GetProperties(int pageNo, int pageSize, string? propertyStatus = "")
     {
         try
         {
-            var response = await _blProperties.GetProperties(pageNo, pageSize);
+            if (!string.IsNullOrWhiteSpace(propertyStatus) && !IsValidPropertyStatus(propertyStatus))
+            {
+                return BadRequest($"Invalid Status; Status should be one of the following: {string.Join(", ", Enum.GetNames(typeof(PropertyStatus)))}");
+            }
+
+            var response = await _blProperties.GetProperties(pageNo, pageSize, propertyStatus);
             return Ok(response);
         }
         catch (Exception ex)
@@ -42,13 +53,13 @@ public async Task<IActionResult> GetProperties(int pageNo, int pageSize)
     }
 
     [HttpGet("agent/{agentId}")]
-    public async Task<IActionResult> GetPropertiesByAgentId(int agentId, [FromQuery] string propertyStatus = nameof(PropertyStatus.Approved))
+    public async Task<IActionResult> GetPropertiesByAgentId(int agentId, [FromQuery] string propertyStatus = "")
     {
         try
         {
-            if (!Enum.TryParse<PropertyStatus>(propertyStatus, out var parsedStatus) || !Enum.IsDefined(typeof(PropertyStatus), parsedStatus))
+            if (!string.IsNullOrWhiteSpace(propertyStatus) && !IsValidPropertyStatus(propertyStatus))
             {
-                throw new Exception($"Invalid Status; Status should be one of the following: {string.Join(", ", Enum.GetNames(typeof(PropertyStatus)))}");
+                return BadRequest($"Invalid Status; Status should be one of the following: {string.Join(", ", Enum.GetNames(typeof(PropertyStatus)))}");
             }
 
             var response = await _blProperties.GetPropertiesByAgentId(agentId, propertyStatus);
@@ -61,13 +72,13 @@ public async Task<IActionResult> GetPropertiesByAgentId(int agentId, [FromQuery]
     }
 
     [HttpGet("agent/{agentId}/{pageNo}/{pageSize}")]
-    public async Task<IActionResult> GetPropertiesByAgentId(int agentId, int pageNo, int pageSize, [FromQuery] string propertyStatus = nameof(PropertyStatus.Approved))
+    public async Task<IActionResult> GetPropertiesByAgentId(int agentId, int pageNo, int pageSize, [FromQuery] string propertyStatus = "")
     {
         try
         {
-            if (!Enum.TryParse<PropertyStatus>(propertyStatus, out var parsedStatus) || !Enum.IsDefined(typeof(PropertyStatus), parsedStatus))
+            if (!string.IsNullOrWhiteSpace(propertyStatus) && !IsValidPropertyStatus(propertyStatus))
             {
-                throw new Exception($"Invalid Status; Status should be one of the following: {string.Join(", ", Enum.GetNames(typeof(PropertyStatus)))}");
+                return BadRequest($"Invalid Status; Status should be one of the following: {string.Join(", ", Enum.GetNames(typeof(PropertyStatus)))}");
             }
 
             var response = await _blProperties.GetPropertiesByAgentId(agentId, pageNo, pageSize, propertyStatus);
@@ -96,15 +107,15 @@ public async Task<IActionResult> GetPropertyById(int propertyId)
     [HttpPost]
     public async Task<IActionResult> CreateProperty([FromBody] PropertyRequestModel requestModel)
     {
-        if (requestModel == null)
+        var validationResult = ValidatePropertyRequestModel(requestModel);
+        if (validationResult != null)
         {
-            return BadRequest("Request model cannot be null");
+            return validationResult;
         }
 
         try
         {
             var response = await _blProperties.CreateProperty(requestModel);
-            // return CreatedAtAction(nameof(GetPropertyById), new { propertyId = response.Property.PropertyId }, response);
             return Ok(response);
         }
         catch (Exception ex)
@@ -113,17 +124,18 @@ public async Task<IActionResult> CreateProperty([FromBody] PropertyRequestModel
         }
     }
 
-    [HttpPut("{propertyId}")]
+    [HttpPut("Update/{propertyId}")]
     public async Task<IActionResult> UpdateProperty(int propertyId, [FromBody] PropertyRequestModel requestModel)
     {
         if (propertyId < 1)
         {
             return BadRequest("Invalid Property Id");
         }
 
-        if (requestModel == null)
+        var validationResult = ValidatePropertyRequestModel(requestModel);
+        if (validationResult != null)
         {
-            return BadRequest("Request model cannot be null");
+            return validationResult;
         }
 
         try
@@ -174,18 +186,46 @@ public async Task<IActionResult> DeleteProperty(int propertyId)
         {
             var result = await _blProperties.DeleteProperty(propertyId);
             return Ok(result);
-            //if (result)
-            //{
-            //    return NoContent();
-            //}
-            //else
-            //{
-            //    return NotFound("Property not found");
-            //}
         }
         catch (Exception ex)
         {
             return BadRequest(ex.Message);
         }
     }
+
+    private IActionResult ValidatePropertyRequestModel(PropertyRequestModel requestModel)
+    {
+        if (requestModel == null)
+        {
+            return BadRequest("Request model cannot be null");
+        }
+
+        if (!IsValidPropertyType(requestModel.PropertyType))
+        {
+            return BadRequest($"Invalid Type; Property Type should be one of the following: {string.Join(", ", Enum.GetNames(typeof(PropertyType)))}");
+        }
+
+        if (!IsValidPropertyAvailiableType(requestModel.AvailiablityType))
+        {
+            return BadRequest($"Invalid Availability Type; Property Availability Type should be one of the following: {string.Join(", ", Enum.GetNames(typeof(PropertyAvailiableType)))}");
+        }
+
+        return null;
+    }
+
+
+    private static bool IsValidPropertyStatus(string status)
+    {
+        return Enum.TryParse<PropertyStatus>(status, out var parsedStatus) && Enum.IsDefined(typeof(PropertyStatus), parsedStatus);
+    }
+
+    private static bool IsValidPropertyType(string propertyType)
+    {
+        return Enum.TryParse<PropertyType>(propertyType, out var parsedPropertyType) && Enum.IsDefined(typeof(PropertyType), parsedPropertyType);
+    }
+
+    private static bool IsValidPropertyAvailiableType(string propertyAvailiableType)
+    {
+        return Enum.TryParse<PropertyAvailiableType>(propertyAvailiableType, out var paresedPropertyAvailiableType) && Enum.IsDefined(typeof(PropertyAvailiableType), paresedPropertyAvailiableType);
+    }
 }

REMS.BackendApi/appsettings.json

@@ -8,8 +8,8 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     //"DbConnection": "Server=.;Database=REMS;User Id=sa;Password=sasa@123;TrustServerCertificate=True;",
-    "DbConnection": "Server=.;Database=rems;User Id=sa;Password=sasa@123;TrustServerCertificate=True;"
-    //"DbConnection": "Server=LAPTOP-TTIU8JF8;Database=REMS;User Id=sa;Password=Minkhantthu3367;TrustServerCertificate=True;"
+    //"DbConnection": "Server=.;Database=rems;User Id=sa;Password=sasa@123;TrustServerCertificate=True;"
+    "DbConnection": "Server=LAPTOP-TTIU8JF8;Database=REMS;User Id=sa;Password=Minkhantthu3367;TrustServerCertificate=True;"
     //"DbConnection": "Server=.;Database=REMS;User Id=sa;Password=P@ssw0rd;TrustServerCertificate=True;"
     //"DbConnection": "Server=.\\SQL2019E;Database=REMS;User Id=sa;Password=p@ssw0rd;TrustServerCertificate=True;"
   },

REMS.Mapper/ChangeModel.cs

@@ -79,9 +79,9 @@ public static Client Change(this ClientRequestModel requestModel)
         return client;
     }
 
-    public static ClientResponseModel Change(this Client dataModel, User user)
+    public static ClientModel Change(this Client dataModel, User user)
     {
-        var clientResponseModel = new ClientResponseModel
+        var clientResponseModel = new ClientModel
         {
             ClientId = dataModel.ClientId,
             UserId = dataModel.UserId,
@@ -214,6 +214,7 @@ public static ReviewModel Change(this Review dataModel)
             PropertyId = dataModel.PropertyId,
             Rating = dataModel.Rating,
             Comments = dataModel.Comments,
+            DateCreated = dataModel.DateCreated,
         };
 
         return reviewModel;

REMS.Models/Appointment/AppointmentDetail.cs

@@ -0,0 +1,30 @@
+
+using REMS.Models.Custom;
+
+namespace REMS.Models.Appointment;
+
+
+public partial class AppointmentDetail
+{
+    public int? AppointmentId { get; set; }
+    public string? AgentName { get; set; }
+    public string? ClientName { get; set; }
+    public string? AppointmentDate { get; set; }
+    public string? AppointmentTime { get; set; }
+    public string? AgentPhoneNumber { get; set; }
+    public string? Status { get; set; }
+    public string? Note { get; set; }
+    public string? Address { get; set; }
+    public string? City { get; set; }
+    public string? State { get; set; }
+    public decimal? Price { get; set; }
+    public decimal? Size { get; set; }
+    public int? NumberOfBedrooms { get; set; }
+    public int? NumberOfBathrooms { get; set; }
+}
+
+public partial class AppointmentDetailList
+{
+    public PageSettingModel? pageSetting { get; set; }
+    public List<AppointmentDetail> appointmentDetails { get; set; }
+}

REMS.Models/Appointment/AppointmentResponseModel.cs

@@ -1,4 +1,7 @@
-using System;
+using REMS.Database.AppDbContextModels;
+using REMS.Models.Agent;
+using REMS.Models.Client;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,5 +12,6 @@ namespace REMS.Models.Appointment
     public class AppointmentResponseModel
     {
         public AppointmentModel? Appointment { get; set; }
+
     }
 }

REMS.Models/Client/ClientListResponseModel.cs

@@ -10,6 +10,6 @@ namespace REMS.Models.Client;
 
 public class ClientListResponseModel
 {
-    public List<ClientResponseModel> DataLst { get; set; }
+    public List<ClientModel> DataLst { get; set; }
     public PageSettingModel PageSetting { get; set; }
 }

REMS.Models/Client/ClientModel.cs

@@ -15,4 +15,6 @@ public class ClientModel
     public string? Email { get; set; }
 
     public string? Address { get; set; }
+
+    public string? Role { get; set; }
 }

REMS.Models/Property/PropertyResponseModel.cs

@@ -1,7 +1,11 @@
-namespace REMS.Models.Property;
+using REMS.Models.Review;
+
+namespace REMS.Models.Property;
 
 public class PropertyResponseModel
 {
     public PropertyModel Property { get; set; }
     public List<PropertyImageModel> Images { get; set; }
+
+    public List<ReviewModel> Reviews { get; set; }
 }

REMS.Models/Result.cs

@@ -40,4 +40,9 @@ public static Result<T> Error(Exception ex)
             IsSuccess = false,
         };
     }
+
+    public static implicit operator Result<T>(Result<string>? v)
+    {
+        throw new NotImplementedException();
+    }
 }