Merge pull request #67 from TunNetCom/ModifyDatabase

Modify Database

src/AzureDevopsService/AzureDevopsService.Application/AzureDevopsExternalResourceService/WorkItem/WorkItemExternalService.cs

@@ -37,7 +37,7 @@ public async Task<OneOf<WiqlResponses, WiqlBadRequestResponce>> GetWorkItemByUse
         return new WiqlBadRequestResponce()
         {
             Email = resource.Email,
-            ErrorCode = (int?)workItemResponse.StatusCode,
+            ErrorCode = (int)workItemResponse.StatusCode,
             Message = AzureResponseMessage.WorkItemError,
             Path = resource.Path,
         };

src/AzureDevopsService/AzureDevopsService.Application/Featurs/MessageBroker/Producer/ProfileUser/ProfileUserCommandHandler.cs

@@ -14,7 +14,6 @@ public async Task Handle(ProfileUserCommand request, CancellationToken cancellat
         OneOf<UserProfile, CustomProblemDetailsResponce> adminInfoResponse = await _userProfileApiClient.GetAdminInfo(request.BaseRequest);
         if (adminInfoResponse.IsT0)
         {
-
             OneOf<UserAccount, CustomProblemDetailsResponce> organizationResponce = await _userProfileApiClient.GeUserOrganizations(
                 new GetUserOrganizationRequest
                 {

src/TimeLogService/TimeLogService.DataBase/TimeLogService.Database.sqlproj

@@ -68,6 +68,8 @@
     <Build Include="dbo\Tables\User.sql" />
     <Build Include="dbo\Tables\AionTimeSubscription.sql" />
     <Build Include="dbo\Tables\AionTimeSubscriptionHistory.sql" />
+    <Build Include="dbo\Tables\UserPath.sql" />
+    <Build Include="dbo\Tables\UserPathOrganizations.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="TimeLogService.Database.publish.xml" />

src/TimeLogService/TimeLogService.DataBase/dbo/Tables/Organization.sql

@@ -1,17 +1,11 @@
 CREATE TABLE [dbo].[Organization]
 (
 	[Id] INT  IDENTITY (1, 1) PRIMARY KEY NOT NULL,
-    [UserId] NVARCHAR(100) not null,
 	[Name] Varchar(255) not null, 
     [AccountId] NVARCHAR(100) NOT NULL unique, 
     [AccountUri] VARCHAR(200) NOT NULL,
-    [IsAionTimeApproved] BIT NOT NULL 
-
-	CONSTRAINT FKUserOrganization 
-        FOREIGN KEY (UserId) 
-        REFERENCES [dbo].[User] (UserId) 
-        ON DELETE CASCADE
-        ON UPDATE CASCADE, 
+    [IsAionTimeApproved] BIT NOT NULL,
+    [CreationDate] datetime not null
 )
 
 GO

src/TimeLogService/TimeLogService.DataBase/dbo/Tables/User.sql

@@ -1,10 +1,5 @@
 CREATE TABLE [dbo].[User]
 (
 	[Id] INT  IDENTITY (1, 1) PRIMARY KEY NOT NULL,
-    [UserId] NVARCHAR(100) NOT NULL UNIQUE, 
-    [EmailAddress] VARCHAR(50) NOT NULL, 
-    [PublicAlias] NVARCHAR(100) NOT NULL, 
-    [CoreRevision] INT NOT NULL, 
-    [TimeStamp] DATETIME NOT NULL, 
-    [Revision] INT NOT NULL
+    [EmailAddress] VARCHAR(50) NOT NULL UNIQUE, 
 )

src/TimeLogService/TimeLogService.DataBase/dbo/Tables/UserPath.sql

@@ -0,0 +1,12 @@
+CREATE TABLE [dbo].[UserPath]
+(
+	[Id] INT NOT NULL PRIMARY KEY, 
+    [UserId] INT NOT NULL,
+    [PathType] NVARCHAR(150) NOT NULL,
+
+    CONSTRAINT FK_UserPath_Uesr 
+        FOREIGN KEY (UserId) 
+        REFERENCES [dbo].[User] (Id) 
+        ON DELETE CASCADE
+        ON UPDATE CASCADE 
+)

src/TimeLogService/TimeLogService.DataBase/dbo/Tables/UserPathOrganizations.sql

@@ -0,0 +1,8 @@
+CREATE TABLE [dbo].[UserPathOrganizations] (
+    [PathId] INT NOT NULL,
+    [OrganizationId] INT NOT NULL,
+    [CreationDate] DATETIME
+    PRIMARY KEY ([PathId], [OrganizationId]) NOT NULL,
+    FOREIGN KEY ([PathId]) REFERENCES [dbo].[UserPath]([Id]),
+    FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization]([Id])
+);