2.1.0

Minor enhancements.
1plam · Jun 13, 2023 · af8216a · af8216a
1 parent 47f7b5a
commit af8216a
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 34 deletions.
diff --git a/FleetJourney.Application/Mapping/CarPoolMapper.cs b/FleetJourney.Application/Mapping/CarPoolMapper.cs
@@ -1,6 +1,7 @@
 using FleetJourney.Application.Contracts.Requests.CarPool;
 using FleetJourney.Application.Contracts.Responses.CarPool;
 using FleetJourney.Domain.CarPool;
+using FleetJourney.Domain.Messages.CarPool;
 using Riok.Mapperly.Abstractions;
 
 namespace FleetJourney.Application.Mapping;
@@ -14,6 +15,8 @@ public static partial class CarPoolMapper
 
     public static partial Car ToCar(this UpdateCarRequest request);
 
+    public static partial Car ToCar(this CreateCar message);
+
     public static Car ToCar(this UpdateCarRequest request, Guid carId)
     {
         request.Id = carId;

diff --git a/FleetJourney.Application/Mapping/EmployeeMapper.cs b/FleetJourney.Application/Mapping/EmployeeMapper.cs
@@ -1,6 +1,7 @@
 using FleetJourney.Application.Contracts.Requests.Employees;
 using FleetJourney.Application.Contracts.Responses.Employees;
 using FleetJourney.Domain.EmployeeInfo;
+using FleetJourney.Domain.Messages.Employees;
 using Riok.Mapperly.Abstractions;
 
 namespace FleetJourney.Application.Mapping;
@@ -13,6 +14,8 @@ public static partial class EmployeeMapper
     public static partial Employee ToEmployee(this CreateEmployeeRequest request);
 
     public static partial Employee ToEmployee(this UpdateEmployeeRequest request);
+
+    public static partial Employee ToEmployee(this CreateEmployee message);
 
     public static Employee ToEmployee(this UpdateEmployeeRequest request, Guid id)
     {

diff --git a/FleetJourney.Application/Mapping/TripMapper.cs b/FleetJourney.Application/Mapping/TripMapper.cs
@@ -1,5 +1,6 @@
 using FleetJourney.Application.Contracts.Requests.Trips;
 using FleetJourney.Application.Contracts.Responses.Trips;
+using FleetJourney.Domain.Messages.Trips;
 using FleetJourney.Domain.Trips;
 using Riok.Mapperly.Abstractions;
 
@@ -13,6 +14,8 @@ public static partial class TripMapper
     public static partial Trip ToTrip(this CreateTripRequest request);
 
     public static partial Trip ToTrip(this UpdateTripRequest request);
+
+    public static partial Trip ToTrip(this CreateTrip message);
 
     public static Trip ToTrip(this UpdateTripRequest request, Guid id)
     {

diff --git a/FleetJourney.Application/Messages/Orchestrates/CarPoolOrchestrator.cs b/FleetJourney.Application/Messages/Orchestrates/CarPoolOrchestrator.cs
@@ -1,4 +1,5 @@
-using FleetJourney.Application.Services.Abstractions;
+using FleetJourney.Application.Mapping;
+using FleetJourney.Application.Services.Abstractions;
 using FleetJourney.Domain.CarPool;
 using FleetJourney.Domain.Messages.CarPool;
 using MassTransit;
@@ -24,17 +25,8 @@ public async Task Consume(ConsumeContext<CreateCar> context)
     {
         var message = context.Message;
         _logger.LogInformation("Creating car with number: {Id}", message.LicensePlateNumber);
-
-        var car = new Car
-        {
-            LicensePlateNumber = message.LicensePlateNumber,
-            Brand = message.Brand,
-            Model = message.Model,
-            EndOfLifeMileage = message.EndOfLifeMileage,
-            MaintenanceInterval = message.MaintenanceInterval,
-            CurrentMileage = message.CurrentMileage
-        };
 
+        var car = message.ToCar();
         await _carPoolService.CreateAsync(car, context.CancellationToken);
     }
 

diff --git a/FleetJourney.Application/Messages/Orchestrates/EmployeeOrchestrator.cs b/FleetJourney.Application/Messages/Orchestrates/EmployeeOrchestrator.cs
@@ -1,4 +1,5 @@
-using FleetJourney.Application.Services.Abstractions;
+using FleetJourney.Application.Mapping;
+using FleetJourney.Application.Services.Abstractions;
 using FleetJourney.Domain.EmployeeInfo;
 using FleetJourney.Domain.Messages.Employees;
 using MassTransit;
@@ -24,15 +25,8 @@ public async Task Consume(ConsumeContext<CreateEmployee> context)
     {
         var message = context.Message;
         _logger.LogInformation("Creating employee with email: {Email}", message.Email);
-
-        var employee = new Employee
-        {
-            Email = message.Email,
-            Name = message.Name,
-            LastName = message.LastName,
-            Birthdate = message.Birthdate
-        };
-
+
+        var employee = message.ToEmployee();
         await _employeeService.CreateAsync(employee, context.CancellationToken);
     }
 

diff --git a/FleetJourney.Application/Messages/Orchestrates/TripOrchestrator.cs b/FleetJourney.Application/Messages/Orchestrates/TripOrchestrator.cs
@@ -1,4 +1,5 @@
-using FleetJourney.Application.Services.Abstractions;
+using FleetJourney.Application.Mapping;
+using FleetJourney.Application.Services.Abstractions;
 using FleetJourney.Domain.Messages.Trips;
 using FleetJourney.Domain.Trips;
 using MassTransit;
@@ -25,15 +26,7 @@ public async Task Consume(ConsumeContext<CreateTrip> context)
         var message = context.Message;
         _logger.LogInformation("Creating trip for employee with Id: {EmployeeId}", message.EmployeeId);
 
-        var trip = new Trip
-        {
-            CarId = message.CarId,
-            StartMileage = message.StartMileage,
-            EndMileage = message.EndMileage,
-            IsPrivateTrip = message.IsPrivateTrip,
-            EmployeeId = message.EmployeeId,
-        };
-
+        var trip = message.ToTrip();
         await _tripService.CreateAsync(trip, context.CancellationToken);
     }
 

diff --git a/FleetJourney.Deploy/CarPoolApi/carpool-api-deployment.yaml b/FleetJourney.Deploy/CarPoolApi/carpool-api-deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: carpool-api
-          image: plaam/fleetjourney-carpool-api:1.0.9
+          image: plaam/fleetjourney-carpool-api:1.1.0
           imagePullPolicy: Always
           ports:
             - containerPort: 80

diff --git a/FleetJourney.Deploy/EmployeesApi/employees-api-deployment.yaml b/FleetJourney.Deploy/EmployeesApi/employees-api-deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: employees-api
-          image: plaam/fleetjourney-employees-api:1.0.9
+          image: plaam/fleetjourney-employees-api:1.1.0
           imagePullPolicy: Always
           ports:
             - containerPort: 80

diff --git a/FleetJourney.Deploy/TripsApi/trips-api-deployment.yaml b/FleetJourney.Deploy/TripsApi/trips-api-deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: trips-api
-          image: plaam/fleetjourney-trips-api:1.0.9
+          image: plaam/fleetjourney-trips-api:1.1.0
           imagePullPolicy: Always
           ports:
             - containerPort: 80