fix

MyOffice.Services/Currency/CurrencyService.cs

@@ -1,71 +1,85 @@
 namespace MyOffice.Services.Currency;
 
+using AutoMapper;
+
 using Core;
 using Core.Extensions;
 using Data.Models.Currencies;
 using Data.Repositories.Currency;
-using MyOffice.Services.Currency.Domain;
+using Domain;
 
 public class CurrencyService
 {
 	private readonly ICurrencyGlobalRepository _currencyGlobalRepository;
 	private readonly ICurrencyRepository _currencyRepository;
 	private readonly ICurrencyRateRepository _currencyRateRepository;
+	private readonly IMapper _mapper;
 
 	public CurrencyService(
 		ICurrencyGlobalRepository currencyGlobalRepository,
 		ICurrencyRepository currencyRepository,
-		ICurrencyRateRepository currencyRateRepository
+		ICurrencyRateRepository currencyRateRepository,
+		IMapper mapper
 	)
 	{
 		_currencyGlobalRepository = currencyGlobalRepository;
 		_currencyRepository = currencyRepository;
 		_currencyRateRepository = currencyRateRepository;
+		_mapper = mapper;
 	}
 
-	public List<CurrencyGlobal> GetGlobalAll()
+	public List<CurrencyGlobalDto> GetGlobalAll()
 	{
-		return _currencyGlobalRepository.GetAll();
+		return _mapper.Map<List<CurrencyGlobalDto>>(_currencyGlobalRepository.GetAll());
 	}
 
-	public List<Currency> GetAll(Guid userId)
+	public List<CurrencyDto> GetAll(Guid userId)
 	{
-		return _currencyRepository.GetAll(userId);
+		return _mapper.Map<List<CurrencyDto>>(_currencyRepository.GetAll(userId));
 	}
 
-	public Dictionary<Currency, CurrencyRate?> GetAllWithRates(Guid userId)
+	public List<CurrencyWithRateDto> GetAllWithRates(Guid userId)
 	{
 		var list = _currencyRepository.GetAll(userId);
-		return list.ToDictionary(
-			x => x,
-			x => _currencyRateRepository.GetLastRates(x.Id).FirstOrDefault()
-		);
+
+		return list.Select(x => new CurrencyWithRateDto
+		{
+			Currency = _mapper.Map<CurrencyDto>(x),
+			Rate = _mapper.Map<CurrencyRateDto>(_currencyRateRepository.GetLastRates(x.Id).FirstOrDefault()),
+		}).ToList();
 	}
 
-	public Exec<Currency, CurrencyAddStatus> CurrencyAdd(Guid userId, Currency currency)
+	public Exec<CurrencyDto, CurrencyAddStatus> CurrencyAdd(Guid userId, CurrencyDto input)
 	{
-		if (currency == null)
-			throw new ArgumentNullException(nameof(currency));
+		if (input == null)
+			throw new ArgumentNullException(nameof(input));
 
-		var result = new Exec<Currency, CurrencyAddStatus>(CurrencyAddStatus.success);
+		var result = new Exec<CurrencyDto, CurrencyAddStatus>(CurrencyAddStatus.success);
 
-		var exists = _currencyRepository.GetByGlobalCurrency(userId, currency.CurrencyGlobalId);
+		var exists = _currencyRepository.GetByGlobalCurrency(userId, input.CurrencyGlobalId);
 		if (exists != null)
 		{
-			return result.Set(exists, CurrencyAddStatus.exists);
+			return result.Set(_mapper.Map<CurrencyDto>(exists), CurrencyAddStatus.exists);
 		}
 
-		currency.Id = Guid.NewGuid();
-		currency.UserId = userId;
+		var currency = new Currency
+		{
+			Id = Guid.NewGuid(),
+			UserId = userId,
+			CurrencyGlobalId = input.CurrencyGlobalId,
+			Name = input.Name,
+			ShortName = input.ShortName,
+		};
+
 		if (!_currencyRepository.Add(currency))
 		{
 			return result.Set(CurrencyAddStatus.failed);
 		}
 
-		return result.Set(currency);
+		return result.Set(_mapper.Map<CurrencyDto>(currency));
 	}
 
-	public Exec<Currency, CurrencyEditStatus> CurrencyUpdate(
+	public Exec<CurrencyDto, CurrencyEditStatus> CurrencyUpdate(
 		Guid userId, 
 		Guid currencyId, 
 		CurrencyEdit currency
@@ -74,7 +88,7 @@ public class CurrencyService
 		if (currency == null)
 			throw new ArgumentNullException(nameof(currency));
 
-		var result = new Exec<Currency, CurrencyEditStatus>(CurrencyEditStatus.success);
+		var result = new Exec<CurrencyDto, CurrencyEditStatus>(CurrencyEditStatus.success);
 
 		var exists = _currencyRepository.Get(userId, currencyId);
 		if (exists == null)
@@ -104,15 +118,15 @@ public class CurrencyService
 			}
 		}
 
-		return result.Set(exists);
+		return result.Set(_mapper.Map<CurrencyDto>(exists));
 	}
 
-	public Exec<CurrencyRate, CurrencyAddRateStatus> CurrencyRateAdd(Guid userId, Guid currencyId, CurrencyRate currencyRate)
+	public Exec<CurrencyRateDto, CurrencyAddRateStatus> CurrencyRateAdd(Guid userId, Guid currencyId, CurrencyRateDto input)
 	{
-		if (currencyRate == null)
-			throw new ArgumentNullException(nameof(currencyRate));
+		if (input == null)
+			throw new ArgumentNullException(nameof(input));
 
-		var result = new Exec<CurrencyRate, CurrencyAddRateStatus>(CurrencyAddRateStatus.success);
+		var result = new Exec<CurrencyRateDto, CurrencyAddRateStatus>(CurrencyAddRateStatus.success);
 
 		var currency = _currencyRepository.Get(userId, currencyId);
 		if (currency == null)
@@ -120,11 +134,17 @@ public class CurrencyService
 			return result.Set(CurrencyAddRateStatus.not_found);
 		}
 
-		currencyRate.CurrencyId = currency.Id;
-		currencyRate.DateTime = currencyRate.DateTime.Date;
+		var currencyRate = new CurrencyRate
+		{
+			CurrencyId = currency.Id,
+			DateTime = input.DateTime.Date,
+			Rate = input.Rate,
+			Quantity = input.Quantity,
+		};
 
 		var rates = _currencyRateRepository.GetAtDate(currencyRate.CurrencyId, currencyRate.DateTime);
 		var rate = rates.Find(x => x.Rate == currencyRate.Rate);
+
 		if (rate == null)
 		{
 			if (!_currencyRateRepository.AddRate(currencyRate))
@@ -132,15 +152,15 @@ public class CurrencyService
 				return result.Set(CurrencyAddRateStatus.failed);
 			}
 
-			rate = currencyRate;
-
-			if (rate.DateTime.EndOfDay() <= DateTime.UtcNow.EndOfDay())
+			// TODO: more logic to fix current rate
+			if (currencyRate.DateTime.Date == DateTime.UtcNow.Date || !currency.CurrentRateId.HasValue)
 			{
-				currency.CurrentRateId = rate.Id;
+				currency.CurrencyGlobal = null;
+				currency.CurrentRateId = currencyRate.Id;
 				_currencyRepository.Update(currency);
 			}
 		}
 
-		return result.Set(rate);
+		return result.Set(_mapper.Map<CurrencyRateDto>(rate));
 	}
 }

MyOffice.Services/Currency/Domain/CurrencyDto.cs

@@ -0,0 +1,22 @@
+namespace MyOffice.Services.Currency.Domain;
+
+using MyOffice.Data.Models.Currencies;
+using MyOffice.Data.Models.Users;
+
+public class CurrencyDto
+{
+	public Guid Id { get; set; }
+	public string CurrencyGlobalId { get; set; } = null!;
+	public CurrencyGlobal? CurrencyGlobal { get; set; }
+	public Guid UserId { get; set; }
+	public User? User { get; set; }
+
+	public string Name { get; set; } = null!;
+	public string ShortName { get; set; } = null!;
+	public IEnumerable<CurrencyRate>? Rates { get; set; }
+
+	public int? CurrentRateId { get; set; }
+	public CurrencyRate? CurrentRate { get; set; }
+
+	public bool IsPrimary { get; set; }
+}

MyOffice.Services/Currency/Domain/CurrencyGlobalDto.cs

@@ -0,0 +1,9 @@
+namespace MyOffice.Services.Currency.Domain;
+
+public class CurrencyGlobalDto
+{
+	public string Id { get; set; } = null!;
+	public string Name { get; set; } = null!;
+	public string Symbol { get; set; } = null!;
+	public int DefaultQuantity { get; set; }
+}

MyOffice.Services/Currency/Domain/CurrencyRateDto.cs

@@ -0,0 +1,12 @@
+namespace MyOffice.Services.Currency.Domain;
+
+public class CurrencyRateDto
+{
+	public int Id { get; set; }
+	public Guid CurrencyId { get; set; }
+	public CurrencyDto? Currency { get; set; }
+	public DateTime DateTime { get; set; }
+	public int Quantity { get; set; }
+	public decimal Rate { get; set; }
+	public IEnumerable<CurrencyDto>? Currencies { get; set; }
+}

MyOffice.Services/Currency/Domain/CurrencyWithRateDto.cs

@@ -0,0 +1,7 @@
+namespace MyOffice.Services.Currency.Domain;
+
+public class CurrencyWithRateDto
+{
+	public CurrencyDto Currency { get; set; } = null!;
+	public CurrencyRateDto? Rate { get; set; }
+}