(...) Update get meal, tray, dish by kitchen id

buidangkhoa05 · buidangkhoa05 · commit 9ffe7e5cd7c9 · 2023-10-24T23:24:57.000+07:00
diff --git a/MK.API/Controllers/KitchenController.cs b/MK.API/Controllers/KitchenController.cs
@@ -119,9 +119,9 @@ public async Task<IActionResult> GetById([Required] Guid kitchenId)
         [HttpGet("{kitchenId}/dishes")]
         [ProducesResponseType(typeof(KitchenRes), StatusCodes.Status200OK)]
         [ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
-        public async Task<IActionResult> GetDishByKitchenId([Required] Guid kitchenId, [FromQuery] PagingParameters req)
+        public async Task<IActionResult> GetDishByKitchenId([Required] Guid kitchenId, string searchKey, [FromQuery] PagingParameters req)
         {
-            var result = await _dishService.GetDishesByKitchenId(kitchenId, req ?? new PagingParameters());
+            var result = await _dishService.GetDishesByKitchenId(kitchenId, searchKey, req ?? new PagingParameters());
             return StatusCode((int)result.StatusCode, result);
         }
 
@@ -134,9 +134,9 @@ public async Task<IActionResult> GetDishByKitchenId([Required] Guid kitchenId, [
         [HttpGet("{kitchenId}/trays")]
         [ProducesResponseType(typeof(KitchenRes), StatusCodes.Status200OK)]
         [ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
-        public async Task<IActionResult> GetTrayByKitchenId([Required] Guid kitchenId, [FromQuery] PagingParameters req)
+        public async Task<IActionResult> GetTrayByKitchenId([Required] Guid kitchenId, string searchKey, [FromQuery] PagingParameters req)
         {
-            var result = await _trayService.GetTraysByKitchenId(kitchenId, req ?? new PagingParameters());
+            var result = await _trayService.GetTraysByKitchenId(kitchenId, searchKey, req ?? new PagingParameters());
             return StatusCode((int)result.StatusCode, result);
         }
 
@@ -149,9 +149,9 @@ public async Task<IActionResult> GetTrayByKitchenId([Required] Guid kitchenId, [
         [HttpGet("{kitchenId}/meals")]
         [ProducesResponseType(typeof(KitchenRes), StatusCodes.Status200OK)]
         [ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
-        public async Task<IActionResult> GetMealsByKitchenId([Required] Guid kitchenId, [FromQuery] PagingParameters req)
+        public async Task<IActionResult> GetMealsByKitchenId([Required] Guid kitchenId, string searchKey, [FromQuery] PagingParameters req)
         {
-            var result = await _mealService.GetMealsByKitchenId(kitchenId, req ?? new PagingParameters());
+            var result = await _mealService.GetMealsByKitchenId(kitchenId, searchKey, req ?? new PagingParameters());
             return StatusCode((int)result.StatusCode, result);
         }
 
diff --git a/MK.Application/Service/IDishService.cs b/MK.Application/Service/IDishService.cs
@@ -10,7 +10,7 @@ namespace MK.Application.Service
 {
     public interface IDishService
     {
-        Task<PagingResponse<DishRes>> GetDishesByKitchenId(Guid kitchenId, PagingParameters pagingParam);
+        Task<PagingResponse<DishRes>> GetDishesByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam);
         Task<ResponseObject<DishDetailRes>> GetDishById(Guid dishId);
         Task<PagingResponse<DishRes>> GetAllDish(PagingParameters pagingParam, string[] fields);
         Task<ResponseObject<Guid>> CreateDish(CreateDishReq createReq);
diff --git a/MK.Application/Service/IMealService.cs b/MK.Application/Service/IMealService.cs
@@ -10,7 +10,7 @@ namespace MK.Application.Service
 {
     public interface IMealService
     {
-        Task<PagingResponse<MealRes>> GetMealsByKitchenId(Guid kitchenId, PagingParameters pagingParam);
+        Task<PagingResponse<MealRes>> GetMealsByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam);
         Task<ResponseObject<MealDetailRes>> GetMealById(Guid mealId);
         Task<PagingResponse<MealRes>> GetAll(PagingParameters pagingParam, string[] fields);
         Task<ResponseObject<Guid>> CreateMeal(CreateMealReq createData);
diff --git a/MK.Application/Service/ITrayService.cs b/MK.Application/Service/ITrayService.cs
@@ -10,7 +10,7 @@ namespace MK.Application.Service
 {
     public interface ITrayService
     {
-        Task<PagingResponse<TrayRes>> GetTraysByKitchenId(Guid kitchenId, PagingParameters pagingParam);
+        Task<PagingResponse<TrayRes>> GetTraysByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam);
 
         Task<PagingResponse<TrayRes>> GetAll(PagingParameters pagingParam, string[] fields);
 
diff --git a/MK.Service/Service/DishService.cs b/MK.Service/Service/DishService.cs
@@ -23,13 +23,13 @@ IStorageService storageService
             _storageService = storageService;
         }
 
-        public async Task<PagingResponse<DishRes>> GetDishesByKitchenId(Guid kitchenId, PagingParameters pagingParam)
+        public async Task<PagingResponse<DishRes>> GetDishesByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam)
         {
             try
             {
                 var queryHelper = new QueryHelper<Dish, DishRes>()
                 {
-                    Filter = x => x.KitchenId == kitchenId,
+                    Filter = x => x.KitchenId == kitchenId && (searchKey == null || x.Name.Contains(searchKey)),
                     PagingParams = pagingParam ??= new PagingParameters(),
                 };
 
diff --git a/MK.Service/Service/MealService.cs b/MK.Service/Service/MealService.cs
@@ -16,13 +16,13 @@ public MealService(IUnitOfWork unitOfWork, IMapper mapper) : base(unitOfWork, ma
         {
         }
 
-        public async Task<PagingResponse<MealRes>> GetMealsByKitchenId(Guid kitchenId, PagingParameters pagingParam)
+        public async Task<PagingResponse<MealRes>> GetMealsByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam)
         {
             try
             {
                 var queryHelper = new QueryHelper<Meal, MealRes>()
                 {
-                    Filter = x => x.KitchenId == kitchenId,
+                    Filter = x => x.KitchenId == kitchenId && (searchKey == null || x.Name.Contains(searchKey)),
                     PagingParams = pagingParam ??= new PagingParameters(),
                 };
 
diff --git a/MK.Service/Service/TrayService.cs b/MK.Service/Service/TrayService.cs
@@ -74,13 +74,13 @@ public async Task<ResponseObject<TrayDetailRes>> GetTrayById(Guid trayId)
             }
         }
 
-        public async Task<PagingResponse<TrayRes>> GetTraysByKitchenId(Guid kitchenId, PagingParameters pagingParam)
+        public async Task<PagingResponse<TrayRes>> GetTraysByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam)
         {
             try
             {
                 var queryHelper = new QueryHelper<Tray, TrayRes>()
                 {
-                    Filter = x => x.KitchenId == kitchenId,
+                    Filter = x => x.KitchenId == kitchenId && (searchKey == null || x.Name.Contains(searchKey)),
                     PagingParams = pagingParam ??= new PagingParameters(),
                 };
 

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,9 @@ public async Task<IActionResult> GetById([Required] Guid kitchenId)`
`119`	`119`	`[HttpGet("{kitchenId}/dishes")]`
`120`	`120`	`[ProducesResponseType(typeof(KitchenRes), StatusCodes.Status200OK)]`
`121`	`121`	`[ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]`
`122`		`- public async Task<IActionResult> GetDishByKitchenId([Required] Guid kitchenId, [FromQuery] PagingParameters req)`
	`122`	`+ public async Task<IActionResult> GetDishByKitchenId([Required] Guid kitchenId, string searchKey, [FromQuery] PagingParameters req)`
`123`	`123`	`{`
`124`		`- var result = await _dishService.GetDishesByKitchenId(kitchenId, req ?? new PagingParameters());`
	`124`	`+ var result = await _dishService.GetDishesByKitchenId(kitchenId, searchKey, req ?? new PagingParameters());`
`125`	`125`	`return StatusCode((int)result.StatusCode, result);`
`126`	`126`	`}`
`127`	`127`
`@@ -134,9 +134,9 @@ public async Task<IActionResult> GetDishByKitchenId([Required] Guid kitchenId, [`
`134`	`134`	`[HttpGet("{kitchenId}/trays")]`
`135`	`135`	`[ProducesResponseType(typeof(KitchenRes), StatusCodes.Status200OK)]`
`136`	`136`	`[ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]`
`137`		`- public async Task<IActionResult> GetTrayByKitchenId([Required] Guid kitchenId, [FromQuery] PagingParameters req)`
	`137`	`+ public async Task<IActionResult> GetTrayByKitchenId([Required] Guid kitchenId, string searchKey, [FromQuery] PagingParameters req)`
`138`	`138`	`{`
`139`		`- var result = await _trayService.GetTraysByKitchenId(kitchenId, req ?? new PagingParameters());`
	`139`	`+ var result = await _trayService.GetTraysByKitchenId(kitchenId, searchKey, req ?? new PagingParameters());`
`140`	`140`	`return StatusCode((int)result.StatusCode, result);`
`141`	`141`	`}`
`142`	`142`
`@@ -149,9 +149,9 @@ public async Task<IActionResult> GetTrayByKitchenId([Required] Guid kitchenId, [`
`149`	`149`	`[HttpGet("{kitchenId}/meals")]`
`150`	`150`	`[ProducesResponseType(typeof(KitchenRes), StatusCodes.Status200OK)]`
`151`	`151`	`[ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]`
`152`		`- public async Task<IActionResult> GetMealsByKitchenId([Required] Guid kitchenId, [FromQuery] PagingParameters req)`
	`152`	`+ public async Task<IActionResult> GetMealsByKitchenId([Required] Guid kitchenId, string searchKey, [FromQuery] PagingParameters req)`
`153`	`153`	`{`
`154`		`- var result = await _mealService.GetMealsByKitchenId(kitchenId, req ?? new PagingParameters());`
	`154`	`+ var result = await _mealService.GetMealsByKitchenId(kitchenId, searchKey, req ?? new PagingParameters());`
`155`	`155`	`return StatusCode((int)result.StatusCode, result);`
`156`	`156`	`}`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace MK.Application.Service`
`10`	`10`	`{`
`11`	`11`	`public interface IDishService`
`12`	`12`	`{`
`13`		`- Task<PagingResponse<DishRes>> GetDishesByKitchenId(Guid kitchenId, PagingParameters pagingParam);`
	`13`	`+ Task<PagingResponse<DishRes>> GetDishesByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam);`
`14`	`14`	`Task<ResponseObject<DishDetailRes>> GetDishById(Guid dishId);`
`15`	`15`	`Task<PagingResponse<DishRes>> GetAllDish(PagingParameters pagingParam, string[] fields);`
`16`	`16`	`Task<ResponseObject<Guid>> CreateDish(CreateDishReq createReq);`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ IStorageService storageService`
`23`	`23`	`_storageService = storageService;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public async Task<PagingResponse<DishRes>> GetDishesByKitchenId(Guid kitchenId, PagingParameters pagingParam)`
	`26`	`+ public async Task<PagingResponse<DishRes>> GetDishesByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam)`
`27`	`27`	`{`
`28`	`28`	`try`
`29`	`29`	`{`
`30`	`30`	`var queryHelper = new QueryHelper<Dish, DishRes>()`
`31`	`31`	`{`
`32`		`- Filter = x => x.KitchenId == kitchenId,`
	`32`	`+ Filter = x => x.KitchenId == kitchenId && (searchKey == null \|\| x.Name.Contains(searchKey)),`
`33`	`33`	`PagingParams = pagingParam ??= new PagingParameters(),`
`34`	`34`	`};`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@ public MealService(IUnitOfWork unitOfWork, IMapper mapper) : base(unitOfWork, ma`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`19`		`- public async Task<PagingResponse<MealRes>> GetMealsByKitchenId(Guid kitchenId, PagingParameters pagingParam)`
	`19`	`+ public async Task<PagingResponse<MealRes>> GetMealsByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam)`
`20`	`20`	`{`
`21`	`21`	`try`
`22`	`22`	`{`
`23`	`23`	`var queryHelper = new QueryHelper<Meal, MealRes>()`
`24`	`24`	`{`
`25`		`- Filter = x => x.KitchenId == kitchenId,`
	`25`	`+ Filter = x => x.KitchenId == kitchenId && (searchKey == null \|\| x.Name.Contains(searchKey)),`
`26`	`26`	`PagingParams = pagingParam ??= new PagingParameters(),`
`27`	`27`	`};`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -74,13 +74,13 @@ public async Task<ResponseObject<TrayDetailRes>> GetTrayById(Guid trayId)`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- public async Task<PagingResponse<TrayRes>> GetTraysByKitchenId(Guid kitchenId, PagingParameters pagingParam)`
	`77`	`+ public async Task<PagingResponse<TrayRes>> GetTraysByKitchenId(Guid kitchenId, string searchKey, PagingParameters pagingParam)`
`78`	`78`	`{`
`79`	`79`	`try`
`80`	`80`	`{`
`81`	`81`	`var queryHelper = new QueryHelper<Tray, TrayRes>()`
`82`	`82`	`{`
`83`		`- Filter = x => x.KitchenId == kitchenId,`
	`83`	`+ Filter = x => x.KitchenId == kitchenId && (searchKey == null \|\| x.Name.Contains(searchKey)),`
`84`	`84`	`PagingParams = pagingParam ??= new PagingParameters(),`
`85`	`85`	`};`
`86`	`86`