From 2f625f1674b1c9e2992e4c68dcb742db58f0f125 Mon Sep 17 00:00:00 2001
From: DavidMakarov <davidmakarow@mail.ru>
Date: Thu, 16 May 2024 21:16:19 +0400
Subject: [PATCH] fix MessageInfo model, fix verisons of EntityFrameworkCore
 packages

---
 FlowerShop/FlowerShop.sln                     |   4 +--
 FlowerShop/FlowerShop/FlowerShopView.csproj   |   9 +++++-
 .../FlowerShopDatabaseImplement.csproj        |  29 ++----------------
 ... => 20240516171210_InitCreate.Designer.cs} |   8 ++---
 ...Create.cs => 20240516171210_InitCreate.cs} |   4 ++-
 .../FlowerShopDatabaseModelSnapshot.cs        |   5 +--
 .../Models/MessageInfo.cs                     |   4 ++-
 backup.zip                                    | Bin 0 -> 2491 bytes
 8 files changed, 23 insertions(+), 40 deletions(-)
 rename FlowerShop/FlowerShopDatabaseImplement/Migrations/{20240516142709_InitCreate.Designer.cs => 20240516171210_InitCreate.Designer.cs} (97%)
 rename FlowerShop/FlowerShopDatabaseImplement/Migrations/{20240516142709_InitCreate.cs => 20240516171210_InitCreate.cs} (99%)
 create mode 100644 backup.zip

diff --git a/FlowerShop/FlowerShop.sln b/FlowerShop/FlowerShop.sln
index 41b0d9e..1604f94 100644
--- a/FlowerShop/FlowerShop.sln
+++ b/FlowerShop/FlowerShop.sln
@@ -17,9 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShopFileImplement", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShopDatabaseImplement", "FlowerShopDatabaseImplement\FlowerShopDatabaseImplement.csproj", "{07E0542C-0ED4-4F69-B72D-B51EFF80C599}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlowerShopRestApi", "FlowerShopRestApi\FlowerShopRestApi.csproj", "{D77CFA3F-2DF8-4C16-A9D3-CC9C7AE1448B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShopRestApi", "FlowerShopRestApi\FlowerShopRestApi.csproj", "{D77CFA3F-2DF8-4C16-A9D3-CC9C7AE1448B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlowerShopClientApp", "FlowerShopClientApp\FlowerShopClientApp.csproj", "{E2A0B066-DBAA-4F67-9829-661DE97EA695}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShopClientApp", "FlowerShopClientApp\FlowerShopClientApp.csproj", "{E2A0B066-DBAA-4F67-9829-661DE97EA695}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/FlowerShop/FlowerShop/FlowerShopView.csproj b/FlowerShop/FlowerShop/FlowerShopView.csproj
index 591c681..cd8fa87 100644
--- a/FlowerShop/FlowerShop/FlowerShopView.csproj
+++ b/FlowerShop/FlowerShop/FlowerShopView.csproj
@@ -9,7 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.27">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.16">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -17,11 +22,13 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="NLog" Version="5.2.8" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
     <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.19" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\FlowerShopBusinessLogic\FlowerShopBusinessLogic.csproj" />
+    <ProjectReference Include="..\FlowerShopDatabaseImplement\FlowerShopDatabaseImplement.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj b/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
index 6c57539..c437053 100644
--- a/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
+++ b/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
@@ -6,21 +6,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <Optimize>False</Optimize>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.19" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.19">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.18" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,21 +20,6 @@
     <ProjectReference Include="..\FlowerShopDataModels\FlowerShopDataModels.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-	
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
 		<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
 	</Target>
diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516142709_InitCreate.Designer.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516171210_InitCreate.Designer.cs
similarity index 97%
rename from FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516142709_InitCreate.Designer.cs
rename to FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516171210_InitCreate.Designer.cs
index 7a9d7a5..1390e1c 100644
--- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516142709_InitCreate.Designer.cs
+++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516171210_InitCreate.Designer.cs
@@ -12,14 +12,15 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace FlowerShopDatabaseImplement.Migrations
 {
     [DbContext(typeof(FlowerShopDatabase))]
-    [Migration("20240516142709_InitCreate")]
+    [Migration("20240516171210_InitCreate")]
     partial class InitCreate
     {
+        /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.27")
+                .HasAnnotation("ProductVersion", "7.0.16")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -157,9 +158,6 @@ namespace FlowerShopDatabaseImplement.Migrations
                     b.Property<DateTime>("DateDelivery")
                         .HasColumnType("timestamp without time zone");
 
-                    b.Property<int>("Id")
-                        .HasColumnType("integer");
-
                     b.Property<string>("SenderName")
                         .IsRequired()
                         .HasColumnType("text");
diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516142709_InitCreate.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516171210_InitCreate.cs
similarity index 99%
rename from FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516142709_InitCreate.cs
rename to FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516171210_InitCreate.cs
index 9ae566d..12e57f2 100644
--- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516142709_InitCreate.cs
+++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240516171210_InitCreate.cs
@@ -6,8 +6,10 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace FlowerShopDatabaseImplement.Migrations
 {
+    /// <inheritdoc />
     public partial class InitCreate : Migration
     {
+        /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.CreateTable(
@@ -74,7 +76,6 @@ namespace FlowerShopDatabaseImplement.Migrations
                 columns: table => new
                 {
                     MessageId = table.Column<string>(type: "text", nullable: false),
-                    Id = table.Column<int>(type: "integer", nullable: false),
                     ClientId = table.Column<int>(type: "integer", nullable: true),
                     SenderName = table.Column<string>(type: "text", nullable: false),
                     DateDelivery = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
@@ -176,6 +177,7 @@ namespace FlowerShopDatabaseImplement.Migrations
                 column: "ImplementerId");
         }
 
+        /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs
index ab27c8f..dc0728e 100644
--- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs
+++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/FlowerShopDatabaseModelSnapshot.cs
@@ -17,7 +17,7 @@ namespace FlowerShopDatabaseImplement.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.27")
+                .HasAnnotation("ProductVersion", "7.0.16")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -155,9 +155,6 @@ namespace FlowerShopDatabaseImplement.Migrations
                     b.Property<DateTime>("DateDelivery")
                         .HasColumnType("timestamp without time zone");
 
-                    b.Property<int>("Id")
-                        .HasColumnType("integer");
-
                     b.Property<string>("SenderName")
                         .IsRequired()
                         .HasColumnType("text");
diff --git a/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs
index 67d12ee..c9598a9 100644
--- a/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs
+++ b/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs
@@ -2,6 +2,7 @@
 using FlowerShopContracts.ViewModels;
 using FlowerShopDataModels.Models;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
 
 namespace FlowerShopDatabaseImplement.Models
@@ -9,7 +10,8 @@ namespace FlowerShopDatabaseImplement.Models
     [DataContract]
     public class MessageInfo : IMessageInfoModel
     {
-		[DataMember]
+		//[DataMember]
+        [NotMapped]
 		public int Id { get; set; }
 		[DataMember]
 		[Key]
diff --git a/backup.zip b/backup.zip
new file mode 100644
index 0000000000000000000000000000000000000000..efaf55b4ee58627da3ac4a4105829f47361e39c4
GIT binary patch
literal 2491
zcmZ`*2{_d29v+N1)Wk70<l0J_v1Y8PL$VZO7|YBUktjr%F}6^r7<9(Sm2I+54w7t5
z3r3Nx!OW1chvJqkF0veJI@5X1y=v}r|KIaI|Nr;=pZ9sc-}`;f@BL5+As`q40EhyH
z9#%Os*UyFA=gt1bgE$Xn{=Qy;A)0={_&`bphS=F|!%+)bUcu5Gi0vG8Sg8|171@d6
z+7mfQHd`Q}`10iB)Xc=hF&|~4LQ>00%5re@QXb426K`ZKKyGcF*swUA<ly3B8y1vB
zE{ZEEa3}|r4nZbe2MHbnar+>$nsaqkR^v@z#qgduImmOU>%EZ2Up=?t$|15^b9=-E
zC$#2j29xGuTj=bxk(RlZg6$>Z-m}u<Vdm-p)DM-oqxRbx^D4N=1L#{N_y7Vv@P}f$
zG}^il9JS8~HWE#DU{uXE)r&`I&KWpy1v(B;p}5RL)6j@wC{CvT(-<ZYhz+~~K;xZc
z#rc#@1isC*<0+7N_~x0VKR(=x_+QUh?OJvk#LmCPU>JHrQeSk!=F!PwRUFLCzpiSg
zsh@(3w>Gl=k5Lwx?WbXv#Cu%iQrO31vOItW%_Ac;{eyhE6hq@WEKd)|g9Hy&0R(@q
z0A7W=;!8I6ba=1*5?iCqii6~+S!ode+Pn^+n6&B)R9N{SggONgK*MAX$p{GxBBX-h
zJ@8a11blfpt&AO#*0fBayQzseP~eWsDURu7iGG&^ezdu;P$Fmy2mqAuJpQ%_q*rjT
zhmV(4pf~<62mYNg94K{Gn(6L!nJgcBX`%a=Xv+m=Tv{^ll39$s-aENrsfEs(C$rKI
zO2L8}=gPrk3>qIb^vKc|_FKH->Q7<r(Z^;CWSK#t$qwmaXjgxD-j}4W3)Ls1K2Xfb
zC!5Wcf=H1yNU>?D&SA~kA&GsMxmDEut({xqB117_w+x|UZ4UzCp{XpT1@YK`>@}RC
z8%Psk(D(>pZkz8Lb&mndj#_%%nz3RE3LU&H;3s7XjI}Vmy?MLV#g&%85;1o=`GRV0
zye8@cjCeZw6DpNfZ-+Y{pUuucgSkEE7Mn@B?ztv>!a?5idUA^K5w(-FtGd!1xleKx
zr#Ip(8F%GnwjPF+nYo5BY8re)4cEwqCTg--zxq-X26KedR@+xR&f%}2#xC2;{Vb`=
zRXp#)DYbmfp6E?1E}62R<Z@YAL~GV7Zu~Pb#2LBTY(21}PH?0qwNEGWh2QHn!J49+
z)LeDabA4~oI%76D`GyjW6VxEeBpE$C^;+m{fj$W8vtxSM)c?$YGLYzMuCJj)u#(vS
zOkC{9$j2`L`%0$8Ez{6C5-xjPq^b?I_1pcsrN2jz_57qv<lp3*96@#`N+wKmkE)S-
z6ANes1G8^vLW)iPkjK-Y#pC2jFYw+|{V*BjyJ+(WGwl`SQZxnbdN{Mn)!LcRZ3T9I
zADT*rAIGX_t{hh0y7P2o9hyh-kcLx<F52LU50-~sOpzCwpD2w=4LniX@GkDfVaq6p
zetJ(erGJ~tmaJ8Y1um$1fF!Ap&%Vn23^R?KCrlpAu^Rq0IDJq+8p8}u%~7tmNmA$~
z$i~%;Us#V?*Bvn%2dOK>o$R)(kqamwXfebG_BfwP(*GUbrEn^_`{flKvhEB+E}(VO
z`2G6PZ9QSh<Sea{T4kdxhr+G{AkQ4LaiPWfe=3fLtph90PH&7VC{8=#dUZ-ZT7`)0
zG`oXu>?`^uQQsrjXIsc-jb?3ufO)It1?4bk(_7jF!($Dy^Dzw%r_y_&vvv}D7?gSQ
zYWsC*`a=BvM)?Z+Pa@q0<9Jk;<CUo>UsZ$fi;n#(%zBt89c`HB!cw?oenUf1#!YVp
zE97~=he917U7gdxEcwh*u^CzA>Egl5F3;VnP4cm<L3NRy2p9LZ(xVNf9~!wf>Z{I+
zkj$VGCN3f9S_<d^5tyO2_zrY4r&ri16598VSruU!JLC@FT4BV~=%-c;255e>f;6hL
z(7rLyuC2S_eS)0RNT_{2of|0Q?TDS~AB==_xdqYFC)hL5*gj)7-Qr5SzV%zk2FH(v
zZfkpAeaLI9cdchmX^f>h+O<5mQ0KrPgfev6+*#<T48LawD{WVgKa4D=)wzUy3a(Y}
z#`sP87k|+l7xKY{Xc-^Ri;YUnPZ`&VAkI`8)+WXTZhuH+U0+T`nB)}LxV?chZ8eeD
zuRHClxqH=gijul%FO%ZSD!e!Y*B>~yZlv_>@5sPPvRDOg=Z&hZpA}sXzcJ1E<2<{p
z3?17#piy}$=aUcBFI~!A<=P!1`FYPq5mI#%=|sEP3VK`a31rlyW&G=%CQ|c4`W1vq
z%<1#^__$2gWT@WF!w36EoXU$TH-G(-K`$Lpt&Vh++$4B3!Xe-VZr{(CgDoR58IYA0
zYRk>&R!#$7Oa7&lqBFwlf=7e^05RU%j(GX+W_*YH64az90T>JS;10Ib2>}`X_d@1N
zKq~NiZ~CEkNS{Yr^AFv0nG+NMtrNppI;@dSjPZLqSSq6rIf3ht(tm#~Th3n^*MaF7
zCdP`j`dgMnCuZIPNLLomNoG@{d{~QIyPDoY^1CKTh4E1HGBeDtvH>L4@R{>D5S9h^
zzn?}e9Dd|^0hD!Q@%}rBt7-FpaGMckFH&UJSGX*-t(OTTrDSb<pW(n=3wcNTYzs5G
zorU%RKd_~F=}vj%r1f40tM2Sa=d@I9?_ZRjZIwquU)?+qhp8#6L?HwO!GQmNiQpOW
z-Sgd*f}hBr*}JR`-sg`A&d=pf;a#q-zz><sPvno$U1AxJ$RDcwZ2tV)WorxmZyNHm
e`OnKP+eGC1(}O|?@A>v`4{vz#R%IsoZT2TF#wP{<

literal 0
HcmV?d00001