Refactor handlers, update DTOs, and add service configs

Refactored command handlers to use DataMapper's Map method.
Updated AddDishCommand to include RestaurantId.
Refactored DishesController to use IDishesRepository.
Updated DataMapper with new Map methods.
Enhanced ResturantDTO to include a list of Dish objects.
Commented out middleware in Program.cs.
Modified DishesRepository to return dish ID.
Updated IDishesRepository method signatures.
Added UserSecretsId to Resturants.csproj.
Introduced AddDishDTO and DishDTO classes.
Added serviceDependencies.json and serviceDependencies.local.json.

src/Actions/Commands/AddDish/AddDishCommand.cs

@@ -4,13 +4,12 @@ namespace Resturants.Actions.Commands.AddDish
 {
     public class AddDishCommand : IRequest
     {
-        public int Id { get; set; }
         public string Name { get; set; } = default!;
         public string Description { get; set; } = default!;
         public decimal Price { get; set; }
 
         public int? KiloCalories { get; set; }
 
-        // public int RestaurantId { get; set; }
+        public int RestaurantId { get; set; }
     }
 }

src/Actions/Commands/AddDish/AddDishCommandHandler.cs

@@ -1,35 +1,34 @@
 using MediatR;
+using Restaurants.DomainMapper;
 using Restaurants.Domains.Models;
+using Restaurants.Repository.Interfaces;
 using Resturants.Repository.Interfaces;
 
 namespace Resturants.Actions.Commands.AddDish
 {
     public class AddDishCommandHandler : IRequestHandler<AddDishCommand>
     {
-        private readonly IDishesRepository _repository;
-
+        private readonly IDishesRepository _dish_repository;
+        private readonly IResturantRepository _resturant_repository;
         private readonly ILogger<AddDishCommandHandler> _logger;
 
-        public AddDishCommandHandler(IDishesRepository repository, ILogger<AddDishCommandHandler> logger)
+        public AddDishCommandHandler(IDishesRepository dish_repository, 
+            IResturantRepository resturant_repository,
+            ILogger<AddDishCommandHandler> logger)
         {
-            _repository = repository;
-
+            _dish_repository = dish_repository;
+            _resturant_repository = resturant_repository;
             _logger = logger;
         }
         public async Task Handle(AddDishCommand request, CancellationToken cancellation_token)
         {
             _logger.LogInformation("Adding new dish {@DishRequest}", request);
 
-            Dish domain_dish = new()
-            {
-                Name = request.Name,
-                Price = request.Price,
-                Description = request.Description
-            };
+            //var id = request.RestaurantId;
 
-            await _repository.AddDishAsync(domain_dish, cancellation_token);
+            //var resturant = await _resturant_repository.GetResturantByIdAsync(id) ?? throw new Exception(nameof(Resturant));
 
-            throw new NotImplementedException();
+
         }
     }
 }

src/Actions/Commands/AddResturant/AddResturantCommandHandler.cs

@@ -14,7 +14,7 @@ public AddResturantCommandHandler(IResturantRepository repository)
         }
         public async Task<int> Handle(AddResturantCommand request, CancellationToken cancellationToken)
         {
-            var domain_resturant = DataMapper.Instance.Mapper(request);
+            var domain_resturant = DataMapper.Instance.Map(request);
 
                 var saved_resturant = await _repository.AddResturantAsync(domain_resturant!);
 

src/Actions/Commands/UpdateResturant/UpdateResturantCommandHandler.cs

@@ -17,7 +17,7 @@ public async Task<bool> Handle(UpdateResturantCommand request, CancellationToken
         {
                 var id = request.Id;
 
-                var domain_resturant = DataMapper.Instance.Mapper(request);
+                var domain_resturant = DataMapper.Instance.Map(request);
 
                 var is_updated = await _repository.UpdateResturantAsync(id, domain_resturant);
 

src/Actions/Queries/GetResturantById/GetResturantByIdQueryHandler.cs

@@ -19,7 +19,7 @@ public GetResturantByIdQueryHandler(IResturantRepository repository)
 
                 if (resturant is null) return await Task.FromResult<ResturantDTO?>(null);
 
-                return DataMapper.Instance.Mapper(resturant);
+                return DataMapper.Instance.Map(resturant);
         }
     }
 }

src/Actions/Queries/GetResturants/GetResturantsQueryHandler.cs

@@ -19,7 +19,7 @@ public async Task<IEnumerable<ResturantDTO>> Handle(GetResturantsQuery request,
 
             if (resturants.Count is 0) return [];
 
-            return [.. resturants.Select(DataMapper.Instance.Mapper)];
+            return [.. resturants.Select(DataMapper.Instance.Map)];
         }
     }
 }

src/Controllers/DishesController.cs

@@ -1,59 +1,40 @@
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Restaurants.DomainMapper;
 using Restaurants.Domains.Models;
 using Resturants.Actions.Commands.AddDish;
+using Resturants.Domains.DTOs;
+using Resturants.Repository.Interfaces;
 
 namespace Resturants.Controllers
 {
     [Route("endpoints/resturants/{resturant_id}/[controller]")]
     [ApiController]
     public class DishesController : ControllerBase
     {
-        private readonly IMediator _mediator;
-
-        public DishesController(IMediator mediator)
-        {
-            _mediator = mediator;
-        }
-
-
-        [HttpGet]
-        public async Task<ActionResult<IEnumerable<Dish>>> GetDishes()
-        {
-           throw new NotImplementedException();
-        }
-
 
-        [HttpGet]
-        [Route("{id:int}")]
-        public async Task<ActionResult<Dish>> GetDishById(int id)
-        {
-            throw new NotImplementedException();
-        }
+        private readonly IDishesRepository _repository;
 
-
-        [HttpPut]
-        [Route("{id:int}")]
-        public async Task<IActionResult> UpdateDish()
+        public DishesController(IDishesRepository repository)
         {
-            throw new NotImplementedException();
+
+            this._repository = repository;
         }
 
-
         [HttpPost]
-        public async Task<ActionResult<Dish>> AddDish([FromRoute] int resturant_id, AddDishCommand command)
+        public async Task<ActionResult<Dish>> AddDish([FromRoute] int resturant_id, AddDishDTO dish_entry)
         {
-            await _mediator.Send(command);
+            var domain_dish = DataMapper.Instance.Map(dish_entry);
+
+            var saved = await _repository.AddDishAsync(domain_dish, CancellationToken.None);
 
-            return Created();
+
+
+            return Ok(saved);
         }
 
 
-        [HttpDelete]
-        [Route("{id:int}")]
-        public async Task<IActionResult> DeleteDish(int id)
-        {
-            throw new NotImplementedException();
-        }
+
     }
 }

src/DomainMapper/DataMapper.cs

@@ -2,6 +2,8 @@
 using Restaurants.Actions.Commands.UpdateResturant;
 using Restaurants.Domains.DTOs;
 using Restaurants.Domains.Models;
+using Resturants.Actions.Commands.AddDish;
+using Resturants.Domains.DTOs;
 
 namespace Restaurants.DomainMapper
 {
@@ -15,7 +17,7 @@ private DataMapper()
 
         public static DataMapper Instance => _instance;
 
-        public ResturantDTO Mapper(Resturant source) => new()
+        public ResturantDTO Map(Resturant source) => new()
         {
             Name = source.Name,
             Description = source.Description,
@@ -25,7 +27,7 @@ private DataMapper()
             Email = source.Email
         };
 
-        public Resturant Mapper(AddResturantCommand add_resturant_command) => new()
+        public Resturant Map(AddResturantCommand add_resturant_command) => new()
         {
             Name = add_resturant_command.Name,
             Description = add_resturant_command.Description,
@@ -34,7 +36,7 @@ private DataMapper()
             Email = add_resturant_command.Email
         };
 
-        public Resturant Mapper(AddResturantDTO add_resturant_dto) => new()
+        public Resturant Map(AddResturantDTO add_resturant_dto) => new()
         {
             Name = add_resturant_dto.Name,
             Description = add_resturant_dto.Description,
@@ -43,13 +45,21 @@ private DataMapper()
             Email = add_resturant_dto.Email
         };
 
-        public Resturant Mapper(UpdateResturantCommand update_resturant) => new()
+        public Resturant Map(UpdateResturantCommand update_resturant) => new()
         {
             Name = update_resturant.Name,
             Description = update_resturant.Description,
             Category = update_resturant.Category,
             PhoneNumber = update_resturant.PhoneNumber,
             Email = update_resturant.Email
         };
+
+        public Dish Map(AddDishDTO command) => new()
+        {
+            Name = command.Name,
+            Description = command.Description,
+            Price = command.Price,
+            KiloCalories = command.KiloCalories
+        };
     }
 }

src/Domains/DTOs/AddDishDTO.cs

@@ -0,0 +1,13 @@
+namespace Resturants.Domains.DTOs
+{
+    public class AddDishDTO
+    {
+        public string Name { get; set; } = default!;
+        public string Description { get; set; } = default!;
+        public decimal Price { get; set; }
+
+        public int? KiloCalories { get; set; }
+
+        public int RestaurantId { get; set; }
+    }
+}

src/Domains/DTOs/DishDTO.cs

@@ -0,0 +1,12 @@
+namespace Resturants.Domains.DTOs
+{
+    public class DishDTO
+    {
+        public int Id { get; set; }
+        public string Name { get; set; } = default!;
+        public string Description { get; set; } = default!;
+        public decimal Price { get; set; }
+
+        public int? KiloCalories { get; set; }
+    }
+}

src/Domains/DTOs/ResturantDTO.cs

@@ -1,4 +1,6 @@
-namespace Restaurants.Domains.DTOs
+using Restaurants.Domains.Models;
+
+namespace Restaurants.Domains.DTOs
 {
     public class ResturantDTO
     {
@@ -8,5 +10,7 @@ public class ResturantDTO
         public bool HasDelivery { get; set; }
         public string? PhoneNumber { get; set; }
         public string? Email { get; set; }
+
+        public List<Dish> Dishes { get; set; } = [];
     }
 }

src/Program.cs

@@ -50,8 +50,8 @@ public static async Task Main(string[] args)
 
             await seeder.SeedAsync();
 
-            app.UseMiddleware<ErrorHandler>();
-            app.UseSerilogRequestLogging();
+          //  app.UseMiddleware<ErrorHandler>();
+        //    app.UseSerilogRequestLogging();
 
             if (app.Environment.IsDevelopment())
             {

src/Properties/serviceDependencies.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "mssql1": {
+      "type": "mssql",
+      "connectionId": "ConnectionStrings:DatabaseConnection",
+      "dynamicId": null
+    },
+    "secrets1": {
+      "type": "secrets",
+      "connectionId": null
+    }
+  }
+}

src/Properties/serviceDependencies.local.json

@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "mssql1": {
+      "secretStore": "LocalSecretsFile",
+      "type": "mssql.onprem",
+      "connectionId": "ConnectionStrings:DatabaseConnection",
+      "dynamicId": null
+    },
+    "secrets1": {
+      "secretStore": null,
+      "resourceId": null,
+      "type": "secrets.user",
+      "connectionId": null
+    }
+  }
+}

src/Repository/Implementations/DishesRepository.cs

@@ -12,33 +12,13 @@ public DishesRepository(ResturantDbContext context)
         {
             _context = context;
         }
-        public async Task<Dish> AddDishAsync(Dish add_dish, CancellationToken cancellation_token)
+        public async Task<int> AddDishAsync(Dish add_dish, CancellationToken cancellation_token)
         {
             _context.Dishes.Add(add_dish);
 
             await _context.SaveChangesAsync();
 
-            return add_dish;
-        }
-
-        public Task<bool> DeleteDishAsync(int id, CancellationToken cancellation_token)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<Dish?> GetDishByIdAsync(int id, CancellationToken cancellation_token)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<List<Dish>?> GetDishesAsync(CancellationToken cancellation_token)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<bool> UpdateDishAsync(int id, Dish update_dish, CancellationToken cancellation_token)
-        {
-            throw new NotImplementedException();
+            return add_dish.Id;
         }
     }
 }

src/Repository/Implementations/ResturantRepository.cs

@@ -79,8 +79,6 @@ public async Task<bool> UpdateResturantAsync(int id, Resturant update_resturant)
 
             existing_resturant.Email = update_resturant.Email;
 
-
-
             _context.Resturants.Update(existing_resturant);
 
             await _context.SaveChangesAsync();

src/Repository/Interfaces/IDishesRepository.cs

@@ -4,10 +4,10 @@ namespace Resturants.Repository.Interfaces
 {
     public interface IDishesRepository
     {
-        Task<List<Dish>> GetDishesAsync(CancellationToken cancellation_token);
-        Task<Dish?> GetDishByIdAsync(int id, CancellationToken cancellation_token);
-        Task<Dish> AddDishAsync(Dish add_dish, CancellationToken cancellation_token);
-        Task<bool> DeleteDishAsync(int id, CancellationToken cancellation_token);
-        Task<bool> UpdateDishAsync(int id, Dish update_dish, CancellationToken cancellation_token);
+        //Task<List<Dish>?> GetDishesAsync(CancellationToken cancellation_token);
+        //Task<Dish?> GetDishByIdAsync(int id, CancellationToken cancellation_token);
+        Task<int> AddDishAsync(Dish add_dish, CancellationToken cancellation_token);
+        //Task<bool> DeleteDishAsync(int id, CancellationToken cancellation_token);
+       // Task<bool> UpdateDishAsync(int id, Dish update_dish, CancellationToken cancellation_token);
     }
 }

src/Resturants.csproj

@@ -4,6 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
+	<UserSecretsId>26c268de-0d90-40e2-9620-2dd45614e88e</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

src/Seeders/ResturantSeeder.cs

@@ -132,7 +132,7 @@ private static IEnumerable<Resturant> GetResturants()
             //    converted_domain_resturants.Add(DataMapper.Instance.Mapper(resturant));
             //}
 
-            dto_resturants.ForEach(r => converted_domain_resturants.Add(DataMapper.Instance.Mapper(r)));
+            dto_resturants.ForEach(r => converted_domain_resturants.Add(DataMapper.Instance.Map(r)));
 
             return converted_domain_resturants;
         }