Merge branch 'Test_IRC_Net8' into Uat_IRC_Net8

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -122,7 +122,7 @@ namespace IRaCIS.Api.Controllers
         {
             var token = _tokenService.GetToken(new UserTokenInfo()
             {
-                UserRoleId = Guid.NewGuid(),
+                IdentityUserId = Guid.NewGuid(),
                 UserName = "Share001",
                 UserTypeEnum = UserTypeEnum.ShareImage,
 

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -660,7 +660,7 @@ namespace IRaCIS.Core.Application.Service
                     trialInfo.ResearchProgramNo,
                     trialInfo.TrialCode,
                     sysUserInfo.IsFirstAdd ? sysUserInfo.EMail : sysUserInfo.UserName,
-                    $"{userType.UserTypeShortName} ({userType.UserTypeName})",
+                    userType.UserTypeName,
                     sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                     );
 

IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs

@@ -104,7 +104,7 @@ namespace IRaCIS.Core.Application.Services
                 StudyId = imageShare.StudyId,
                 Token = _tokenService.GetToken(new UserTokenInfo()
                 {
-                    UserRoleId = Guid.NewGuid(),
+                    IdentityUserId = Guid.NewGuid(),
                     FullName = "Share001",
                     UserName = "Share001",
                     UserTypeEnum = UserTypeEnum.ShareImage,

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -672,6 +672,7 @@ namespace IRaCIS.Core.Application.Contracts
                 TrialSiteSurveyId = currentEntity!.Id,
                 Token = _tokenService.GetToken(new UserTokenInfo()
                 {
+                    IdentityUserId=Guid.NewGuid(),
                     UserRoleId = Guid.NewGuid(),
                     UserName = "SiteSurvey",
                     UserTypeEnum = UserTypeEnum.Undefined,