Olhaholiak/changed some columns types of datetime (#265)

* changed some column type of datetime * migrations * save time UtcNow
ita-social-projects · Aug 11, 2021 · 2a988fd · 2a988fd
1 parent 249eb97
commit 2a988fd
Show file tree

Hide file tree

Showing 31 changed files with 1,556 additions and 99 deletions.
diff --git a/Config/SQLQuery_insert test values.sql b/Config/SQLQuery_insert test values.sql
@@ -41,8 +41,8 @@ INSERT INTO [dbo].[AspNetUsers]
            ,[IsRegistered])
      VALUES
            ('16575ce5-38e3-4ae7-b991-4508ed488369' --Id
-           ,'2021-06-04 10:06:32.9282504'
-           ,'0001-01-01 00:00:00.0000000'
+           ,'2021-06-04 10:06:32.9282504 +00:00' --[CreatingTime]
+           ,'0001-01-01 00:00:00.0000000 +00:00' --LastLogin
            ,'Батькоперший' --last name
            ,'Іванович' --middle name
            ,'Іван' --first name
@@ -64,8 +64,8 @@ INSERT INTO [dbo].[AspNetUsers]
            ,0) --is registered
 
 		   ,('7604a851-66db-4236-9271-1f037ffe3a81' --Id
-           ,'2021-06-04 10:24:40.8990089'
-           ,'0001-01-01 00:00:00.0000000'
+           ,'2021-06-04 10:24:40.8990089 +00:00' --[CreatingTime]
+           ,'0001-01-01 00:00:00.0000000 +00:00' --LastLogin
            ,'Батькодругий' --last name
            ,'Петрович' --middle name
            ,'Петро' --first name
@@ -87,8 +87,8 @@ INSERT INTO [dbo].[AspNetUsers]
            ,0) --is registered
 
 		   ,('47802b21-2fb5-435e-9057-75c43d002cef' --Id
-           ,'2021-06-04 10:29:56.7988521'
-           ,'0001-01-01 00:00:00.0000000'
+           ,'2021-06-04 10:29:56.7988521 +00:00' --[CreatingTime]
+           ,'0001-01-01 00:00:00.0000000 +00:00' --LastLogin
            ,'Провайдерперший' --last name
            ,'Семенович' --middle name
            ,'Семен' --first name
@@ -110,8 +110,8 @@ INSERT INTO [dbo].[AspNetUsers]
            ,0) --is registered
 
 		   ,('5bff5f95-1848-4c87-9846-a567aeb407ea' --Id
-           ,'2021-06-04 10:33:26.6295481'
-           ,'0001-01-01 00:00:00.0000000'
+           ,'2021-06-04 10:33:26.6295481 +00:00' --[CreatingTime]
+           ,'0001-01-01 00:00:00.0000000 +00:00' --LastLogin
            ,'Провайдердругий' --last name
            ,'Борисович' --middle name
            ,'Борис' --first name
@@ -133,22 +133,22 @@ INSERT INTO [dbo].[AspNetUsers]
            ,0) --is registered
 GO
 
---Change roles' Ids according to your data in [AspNetRoles].
+--Roles' Ids according to your data in [AspNetRoles].
 INSERT INTO [dbo].[AspNetUserRoles]
            ([UserId]
            ,[RoleId])
      VALUES
            ('16575ce5-38e3-4ae7-b991-4508ed488369' --UserId (test1)
-           ,'3022b015-a2e4-496d-92d1-ead5b41f7dba') --roleId (parent)
+           ,(SELECT TOP (1) [Id] FROM [AspNetRoles] WHERE [Name] LIKE('parent'))) --roleId (parent)
 
 		   ,('7604a851-66db-4236-9271-1f037ffe3a81' --UserId (test2)
-           ,'3022b015-a2e4-496d-92d1-ead5b41f7dba') --roleId (parent)
+           ,(SELECT TOP (1) [Id] FROM [AspNetRoles] WHERE [Name] LIKE('parent'))) --roleId (parent)
 
 		   ,('47802b21-2fb5-435e-9057-75c43d002cef' --UserId (test3)
-           ,'a9179c0c-e1c6-4d50-b1c8-1f3266cf4bba') --roleId (provider)
+           ,(SELECT TOP (1) [Id] FROM [AspNetRoles] WHERE [Name] LIKE('provider'))) --roleId (provider)
 
 		   ,('5bff5f95-1848-4c87-9846-a567aeb407ea' --UserId (test4)
-           ,'a9179c0c-e1c6-4d50-b1c8-1f3266cf4bba') --roleId (provider)
+           ,(SELECT TOP (1) [Id] FROM [AspNetRoles] WHERE [Name] LIKE('provider'))) --roleId (provider)
 GO
 
 --====================PARENTS AND CHILDREN================================

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/Application.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/Application.cs
@@ -12,7 +12,7 @@ public class Application
         public ApplicationStatus Status { get; set; } = ApplicationStatus.Pending;
 
         [Required]
-        public DateTime CreationTime { get; set; }
+        public DateTimeOffset CreationTime { get; set; }
 
         [Required]
         [Range(1, long.MaxValue, ErrorMessage = "Workshop id should be grater than 0")]

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/BirthCertificate.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/BirthCertificate.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Text;
 
 namespace OutOfSchool.Services.Models
 {
@@ -32,6 +30,8 @@ public class BirthCertificate
         /// <summary>
         /// Gets or sets date of issue of the birth certificate.
         /// </summary>
+        [DataType(DataType.Date)]
+        [Column(TypeName = "date")]
         public DateTime SvidDate { get; set; }
 
         public virtual Child Child { get; set; }

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/ChatMessage.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/ChatMessage.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace OutOfSchool.Services.Models
@@ -20,7 +19,7 @@ public class ChatMessage
         public string Text { get; set; }
 
         [Required]
-        public DateTime CreatedTime { get; set; }
+        public DateTimeOffset CreatedTime { get; set; }
 
         [Required]
         public bool IsRead { get; set; }

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/Child.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/Child.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using OutOfSchool.Services.Enums;
 
 namespace OutOfSchool.Services.Models
@@ -25,6 +26,8 @@ public class Child
         [RegularExpression(@"[\w\-\']*", ErrorMessage = "Middle name cannot contains digits and special symbols")]
         public string MiddleName { get; set; } = string.Empty;
 
+        [DataType(DataType.Date)]
+        [Column(TypeName = "date")]
         public DateTime DateOfBirth { get; set; }
 
         public Gender Gender { get; set; }

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/Provider.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/Provider.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using OutOfSchool.Services.Enums;
 
 namespace OutOfSchool.Services.Models
@@ -54,6 +55,7 @@ public class Provider
         public string Director { get; set; } = string.Empty;
 
         [DataType(DataType.Date)]
+        [Column(TypeName = "date")]
         public DateTime DirectorDateOfBirth { get; set; } = default;
 
         [DataType(DataType.PhoneNumber)]

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/Rating.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/Rating.cs
@@ -24,7 +24,7 @@ public class Rating
         public long ParentId { get; set; }
 
         [Required]
-        public DateTime CreationTime { get; set; }
+        public DateTimeOffset CreationTime { get; set; }
 
         public virtual Parent Parent { get; set; }
     }

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/Teacher.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/Teacher.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace OutOfSchool.Services.Models
 {
@@ -27,6 +28,7 @@ public class Teacher
 
         [Required(ErrorMessage = "Date of birth is required")]
         [DataType(DataType.Date)]
+        [Column(TypeName = "date")]
         public DateTime DateOfBirth { get; set; }
 
         [Required(ErrorMessage = "Description is required")]

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/User.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/User.cs
@@ -8,10 +8,10 @@ namespace OutOfSchool.Services.Models
     public class User : IdentityUser
     {
         [DataType(DataType.DateTime)]
-        public DateTime CreatingTime { get; set; }
+        public DateTimeOffset CreatingTime { get; set; }
 
         [DataType(DataType.DateTime)]
-        public DateTime LastLogin { get; set; }
+        public DateTimeOffset LastLogin { get; set; }
 
         [Required(ErrorMessage = "LastName is required")]
         [MaxLength(30)]

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Models/Workshop.cs b/OutOfSchool/OutOfSchool.DataAccess/Models/Workshop.cs
@@ -73,6 +73,7 @@ public class Workshop
 
         [Required(ErrorMessage = "Head's date of birth is required")]
         [DataType(DataType.Date)]
+        [Column(TypeName = "date")]
         public DateTime HeadDateOfBirth { get; set; }
 
         [Required]

diff --git a/OutOfSchool/OutOfSchool.IdentityServer/Controllers/AuthController.cs b/OutOfSchool/OutOfSchool.IdentityServer/Controllers/AuthController.cs
@@ -165,7 +165,7 @@ public async Task<IActionResult> Register(RegisterViewModel model)
                MiddleName = model.MiddleName,
                Email = model.Email,
                PhoneNumber = model.PhoneNumber,
-               CreatingTime = DateTime.Now,
+               CreatingTime = DateTimeOffset.UtcNow,
                Role = model.Role,
                IsRegistered = false,
             };