From b04841fb1de57bc25dfbe93f81b9618e3b19f9ee Mon Sep 17 00:00:00 2001 From: RakVhalate Date: Sat, 29 Oct 2022 04:20:10 +1000 Subject: [PATCH] Added Timestamp Feature --- DBchat.cs | 21 ++++++++------------- Post.cs | 2 +- Program.cs | 3 ++- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/DBchat.cs b/DBchat.cs index d28fc36..6e2b376 100644 --- a/DBchat.cs +++ b/DBchat.cs @@ -46,7 +46,7 @@ namespace NeDvachAPI using ( var command = new NpgsqlCommand(@" SELECT * FROM ( - SELECT post_id, post + SELECT post_id, post, post_timestamp FROM dvach ORDER BY post_id DESC ) subquery @@ -65,9 +65,9 @@ namespace NeDvachAPI //); Post receivedPost = new() { - Date = DateTime.Now, Id = reader.GetInt32(0), - Text = reader.GetString(1) + Text = reader.GetString(1), + Timestamp = reader.GetString(2) }; posts.Add(receivedPost); //posts[postCount] = receivedPost; @@ -81,7 +81,6 @@ namespace NeDvachAPI public static void DbUpdate(string id, string text) { - // Build connection string using parameters from portal string connString = String.Format( "Server={0}; User Id={1}; Database={2}; Port={3}; Password={4};SSLMode=Prefer", @@ -93,8 +92,6 @@ namespace NeDvachAPI using (var conn = new NpgsqlConnection(connString)) { - - //Console.Out.WriteLine("Opening connection"); conn.Open(); using (var command = new NpgsqlCommand("UPDATE dvach " + @@ -111,10 +108,8 @@ namespace NeDvachAPI Console.WriteLine("Данные обновлены!"); Console.ReadLine(); } - public static void SendPost(Post postToSend) + public static void SendPost(Post postToSend) //добавлялка { - // Build connection string using parameters from portal - // string connString = String.Format( "Server={0}; User Id={1}; Database={2}; Port={3}; Password={4};SSLMode=Prefer", @@ -131,17 +126,17 @@ namespace NeDvachAPI conn.Open(); using (var command = new NpgsqlCommand(@" - INSERT INTO dvach " + @"(post_id, post) - VALUES (DEFAULT, @postText)", conn)) + INSERT INTO dvach " + @"(post_id, post, post_timestamp) + VALUES (DEFAULT, @postText, @postTimeStamp)", conn)) { command.Parameters.AddWithValue("postText", postToSend.Text); + command.Parameters.AddWithValue("postTimeStamp", DateTime.Now.ToString("dd/MM/yyyy HH:mm")); int nRows = command.ExecuteNonQuery(); - Console.Out.WriteLine(String.Format("Number of rows updated={0}", nRows)); + Console.Out.WriteLine("Добавлен пост"); } } - Console.WriteLine("С добавлением закончено"); } public static void DeletePost(string idToDel) //удалялка { diff --git a/Post.cs b/Post.cs index 394af79..fb47b2b 100644 --- a/Post.cs +++ b/Post.cs @@ -2,7 +2,7 @@ namespace NeDvachAPI { public class Post { - public DateTime Date { get; set; } + public string? Timestamp { get; set; } public int Id { get; set; } diff --git a/Program.cs b/Program.cs index e0644ba..237fdf6 100644 --- a/Program.cs +++ b/Program.cs @@ -12,7 +12,8 @@ builder.Services.AddCors(setup => setup.AddDefaultPolicy(policyBuilder => { - policyBuilder.WithOrigins("http://www.vdk2ch.ru:4200").WithMethods("PUT", "POST").WithHeaders("*"); + //policyBuilder.WithOrigins("http://www.vdk2ch.ru:4200").WithMethods("GET", "POST").WithHeaders("*"); + policyBuilder.WithOrigins("http://localhost:4200").WithMethods("GET", "POST").WithHeaders("*"); }); });