Data model refactoring:

- Explicit model configuration in database context
- Naming fixes

src/JoinRpg.Data.Write.Interfaces/IUnitOfWork.cs

@@ -20,5 +20,5 @@ public interface IUnitOfWork : IDisposable
     IPlotRepository GetPlotRepository();
     IForumRepository GetForumRepository();
     ICharacterRepository GetCharactersRepository();
-    IAccommodationRepository GetAccomodationRepository();
+    IAccommodationRepository GetAccommodationRepository();
 }

src/JoinRpg.DataModel/Claim.cs

@@ -12,10 +12,8 @@ public class Claim : IProjectEntity, ILinkable, IFieldContainter
 
     public int? CharacterGroupId { get; set; }
 
-    [CanBeNull]
     public virtual CharacterGroup? Group { get; set; }
 
-    [CanBeNull]
     public virtual Character? Character { get; set; }
 
     public int PlayerUserId { get; set; }
@@ -95,9 +93,14 @@ public enum Status
 
     public Status ClaimStatus { get; set; }
 
-    public int? AccommodationRequest_Id { get; set; }
+    /// <summary>
+    /// Database Id of active accommodation request
+    /// </summary>
+    public int? AccommodationRequestId { get; set; }
 
-    [ForeignKey(nameof(AccommodationRequest_Id))]
+    /// <summary>
+    /// Accommodation request
+    /// </summary>
     public virtual AccommodationRequest? AccommodationRequest { get; set; }
 
     #region Finance

src/JoinRpg.DataModel/ProjectItemTag.cs

@@ -6,6 +6,9 @@ public class ProjectItemTag
 {
     [Key]
     public int ProjectItemTagId { get; set; }
+
     [MaxLength(400)]
     public string TagName { get; set; }
+
+    public ICollection<PlotFolder> Folders { get; set; }
 }

src/JoinRpg.Services.Impl/AccommodationInviteServiceImpl.cs

@@ -153,7 +153,7 @@ private async Task<IEnumerable<AccommodationInvite>?>
 
         var receiversClaims = await UnitOfWork
             .GetDbSet<Claim>()
-            .Where(claim => claim.AccommodationRequest_Id == receiverAccommodationRequestId)
+            .Where(claim => claim.AccommodationRequestId == receiverAccommodationRequestId)
             .Include(c => c.Player)
             .ToArrayAsync()
             .ConfigureAwait(false);

src/JoinRpg.Services.Impl/ClaimServiceImpl.cs

@@ -592,7 +592,7 @@ await GetCurrentUser(),
         var leaveEmail = await ConsiderLeavingRoom(claim);
 
         acr.Subjects.Remove(claim);
-        claim.AccommodationRequest_Id = null;
+        claim.AccommodationRequestId = null;
         claim.AccommodationRequest = null;
         UnitOfWork.GetDbSet<AccommodationRequest>()
             .Add(

src/JoinRpg.Services.Impl/DbServiceImplBase.cs

@@ -67,7 +67,7 @@ protected DbServiceImplBase(IUnitOfWork unitOfWork, ICurrentUserAccessor current
         _claimRepository = new Lazy<IClaimsRepository>(unitOfWork.GetClaimsRepository);
         _plotRepository = new Lazy<IPlotRepository>(unitOfWork.GetPlotRepository);
         _forumRepository = new Lazy<IForumRepository>(unitOfWork.GetForumRepository);
-        _accomodationRepository = new Lazy<IAccommodationRepository>(UnitOfWork.GetAccomodationRepository);
+        _accomodationRepository = new Lazy<IAccommodationRepository>(UnitOfWork.GetAccommodationRepository);
         _charactersRepository =
             new Lazy<ICharacterRepository>(unitOfWork.GetCharactersRepository);
 

src/JoinRpg.WebPortal.Models/AccommodationPotentialNeighbors.cs

@@ -16,7 +16,7 @@ public AccommodationPotentialNeighbors(Claim claim, NeighborType type)
         ClaimName = claim.Name;
         UserName = claim.Player.PrefferedName;
         Type = type;
-        AccommodationRequestId = claim.AccommodationRequest_Id;
+        AccommodationRequestId = claim.AccommodationRequestId;
     }
 }
 

src/Joinrpg.Web.Identity/MyUserStore.Common.cs

@@ -9,12 +9,12 @@ namespace Joinrpg.Web.Identity;
 public partial class MyUserStore
 {
     private readonly MyDbContext _ctx;
-    private readonly IDbSet<DbUser> UserSet;
+    private readonly DbSet<DbUser> _userSet;
 
     public MyUserStore(MyDbContext ctx)
     {
         _ctx = ctx;
-        UserSet = _ctx.Set<DbUser>();
+        _userSet = _ctx.Set<DbUser>();
     }
 
     /// <inheritedoc />
@@ -27,7 +27,7 @@ private async Task CreateImpl(JoinIdentityUser user, CancellationToken ct = defa
             throw new ArgumentNullException(nameof(user));
         }
 
-        var hasAnyUser = await UserSet.AnyAsync(ct);
+        var hasAnyUser = await _userSet.AnyAsync(ct);
 
         var dbUser = new DbUser()
         {