From 685c8b1713de24e6f3d9470cc91e35d285e4f008 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Mon, 3 Jun 2024 07:48:33 +0200 Subject: [PATCH] improvements, fixes --- .../Extensions/GuidExtensions.cs | 5 ++--- AyCode.Database/DataLayers/PooledDal.cs | 1 + .../DbSets/Companies/AcCompanyDbSetExtensions.cs | 3 ++- AyCode.Entities/ServiceProviders/AcCompany.cs | 1 + AyCode.Services/SignalRs/IAcSignalRHubClient.cs | 16 +++++++++++++++- 5 files changed, 21 insertions(+), 5 deletions(-) rename {AyCode.Utils => AyCode.Core}/Extensions/GuidExtensions.cs (84%) diff --git a/AyCode.Utils/Extensions/GuidExtensions.cs b/AyCode.Core/Extensions/GuidExtensions.cs similarity index 84% rename from AyCode.Utils/Extensions/GuidExtensions.cs rename to AyCode.Core/Extensions/GuidExtensions.cs index 57d829f..a0edf41 100644 --- a/AyCode.Utils/Extensions/GuidExtensions.cs +++ b/AyCode.Core/Extensions/GuidExtensions.cs @@ -1,7 +1,6 @@ -using JetBrains.Annotations; -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; -namespace AyCode.Utils.Extensions +namespace AyCode.Core.Extensions { public static class GuidExtensions { diff --git a/AyCode.Database/DataLayers/PooledDal.cs b/AyCode.Database/DataLayers/PooledDal.cs index 5ecb808..eec3ea8 100644 --- a/AyCode.Database/DataLayers/PooledDal.cs +++ b/AyCode.Database/DataLayers/PooledDal.cs @@ -1,4 +1,5 @@ using System.Collections.Concurrent; +using AyCode.Core.Extensions; using AyCode.Utils.Extensions; namespace AyCode.Database.DataLayers diff --git a/AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs b/AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs index 44903ec..5ade2fd 100644 --- a/AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs +++ b/AyCode.Database/DbSets/Companies/AcCompanyDbSetExtensions.cs @@ -1,4 +1,5 @@ -using AyCode.Database.DbSets.Profiles; +using AyCode.Core.Extensions; +using AyCode.Database.DbSets.Profiles; using AyCode.Interfaces.Addresses; using AyCode.Interfaces.Profiles; using AyCode.Interfaces.Profiles.Dtos; diff --git a/AyCode.Entities/ServiceProviders/AcCompany.cs b/AyCode.Entities/ServiceProviders/AcCompany.cs index 1edb946..c4f2a16 100644 --- a/AyCode.Entities/ServiceProviders/AcCompany.cs +++ b/AyCode.Entities/ServiceProviders/AcCompany.cs @@ -1,6 +1,7 @@  using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using AyCode.Core.Extensions; using AyCode.Interfaces.Addresses; using AyCode.Interfaces.Profiles; using AyCode.Interfaces.Profiles.Dtos; diff --git a/AyCode.Services/SignalRs/IAcSignalRHubClient.cs b/AyCode.Services/SignalRs/IAcSignalRHubClient.cs index d67e160..5583bce 100644 --- a/AyCode.Services/SignalRs/IAcSignalRHubClient.cs +++ b/AyCode.Services/SignalRs/IAcSignalRHubClient.cs @@ -2,9 +2,23 @@ using MessagePack; using Newtonsoft.Json.Linq; using System.Text.RegularExpressions; +using AyCode.Core.Interfaces; namespace AyCode.Services.SignalRs; +public class IdMessage : IId +{ + public Guid Id { get; set; } + + public IdMessage() + {} + + public IdMessage(Guid id) : this() + { + Id = id; + } +} + public class SignalPostJsonMessage { [Key(0)] @@ -55,7 +69,7 @@ public interface ISignalPostMessage : ISignalRMessage } [MessagePackObject] -public class SignalRequestByIdMessage(Guid id) : ISignalRequestMessage +public class SignalRequestByIdMessage(Guid id) : ISignalRequestMessage, IId { [Key(0)] public Guid Id { get; set; } = id;