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 @@
-
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -17,11 +22,13 @@
+
+
\ 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 @@
enable
-
- True
-
-
-
- False
-
-
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
@@ -28,21 +20,6 @@
-
-
- True
- True
- Resources.resx
-
-
-
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
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
{
+ ///
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("DateDelivery")
.HasColumnType("timestamp without time zone");
- b.Property("Id")
- .HasColumnType("integer");
-
b.Property("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
{
+ ///
public partial class InitCreate : Migration
{
+ ///
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
@@ -74,7 +76,6 @@ namespace FlowerShopDatabaseImplement.Migrations
columns: table => new
{
MessageId = table.Column(type: "text", nullable: false),
- Id = table.Column(type: "integer", nullable: false),
ClientId = table.Column(type: "integer", nullable: true),
SenderName = table.Column(type: "text", nullable: false),
DateDelivery = table.Column(type: "timestamp without time zone", nullable: false),
@@ -176,6 +177,7 @@ namespace FlowerShopDatabaseImplement.Migrations
column: "ImplementerId");
}
+ ///
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("DateDelivery")
.HasColumnType("timestamp without time zone");
- b.Property("Id")
- .HasColumnType("integer");
-
b.Property("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 0000000..efaf55b
Binary files /dev/null and b/backup.zip differ