From 79f941f4d6d2b29a855ac961247b779dcf9301e3 Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Tue, 25 Jun 2024 19:04:42 +0200
Subject: [PATCH] fixes, improvements

---
 AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs | 2 +-
 AyCode.Database/DbSets/Profiles/AcProfileDbSetExtensions.cs  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs b/AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs
index 2d35397..3193198 100644
--- a/AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs
+++ b/AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs
@@ -63,7 +63,7 @@ public static class AcCompanyDbSetExtensions
         return ctx.Companies.Update(company).State == EntityState.Modified;
     }
 
-    public static bool RemoveCompany<TCompany, TProfile, TAddress, TUserToCompany>(this IAcCompanyDbSetBase<TCompany, TProfile, TAddress, TUserToCompany> ctx, TCompany company) 
+    private static bool RemoveCompany<TCompany, TProfile, TAddress, TUserToCompany>(this IAcCompanyDbSetBase<TCompany, TProfile, TAddress, TUserToCompany> ctx, TCompany company) 
         where TCompany : class, IAcCompany<TProfile, TAddress>
         where TProfile : class, IAcProfile<TAddress>
         where TAddress : class, IAcAddress
diff --git a/AyCode.Database/DbSets/Profiles/AcProfileDbSetExtensions.cs b/AyCode.Database/DbSets/Profiles/AcProfileDbSetExtensions.cs
index c464dbe..5012b6b 100644
--- a/AyCode.Database/DbSets/Profiles/AcProfileDbSetExtensions.cs
+++ b/AyCode.Database/DbSets/Profiles/AcProfileDbSetExtensions.cs
@@ -1,4 +1,5 @@
 using AyCode.Core.Server.Loggers;
+using AyCode.Database.DbSets.Addresses;
 using AyCode.Database.DbSets.Profiles;
 using AyCode.Entities;
 using AyCode.Interfaces.Addresses;
@@ -22,11 +23,11 @@ public static class AcProfileDbSetExtensions
     public static bool UpdateProfile<TProfile>(this IAcProfileDbSetBase<TProfile> ctx, TProfile profile) where TProfile : class, IAcProfileDtoBase
         => ctx.Profiles.Update(profile).State == EntityState.Modified;
 
-    public static bool RemoveProfile<TProfile, TAddress>(this IAcProfileDbSetBase<TProfile, TAddress> ctx, TProfile profile) 
+    private static bool RemoveProfile<TProfile, TAddress>(this IAcProfileDbSetBase<TProfile, TAddress> ctx, TProfile profile) 
         where TProfile : class, IAcProfile<TAddress>
         where TAddress : class, IAcAddressDtoBase
     {
-        var address = ctx.Addresses.FirstOrDefault(x => x.Id == profile.AddressId);
+        var address = ctx.GetAddressById(profile.AddressId);
         if (address != null) ctx.Addresses.Remove(address);
 
         return ctx.Profiles.Remove(profile).State == EntityState.Deleted;