Обновление Сервиса

ProfitGroup.SampleNotifyService/Core/Application/Extensions.cs → ProfitGroup.NotifyService/Core/Application/Extensions.cs

@@ -2,12 +2,12 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.EntityFrameworkCore;
 using NLog.Extensions.Logging;
-using ProfitGroup.SampleNotifyService.Core.Auth;
-using ProfitGroup.SampleNotifyService.Core.Handlers;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
-using ProfitGroup.SampleNotifyService.Services;
+using ProfitGroup.NotifyService.Core.Auth;
+using ProfitGroup.NotifyService.Core.Handlers;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Services;
 
-namespace ProfitGroup.SampleNotifyService.Core.Application
+namespace ProfitGroup.NotifyService.Core.Application
 {
     public static class Extensions
     {
@@ -39,7 +39,7 @@ namespace ProfitGroup.SampleNotifyService.Core.Application
                 (options => options.UseSqlServer(builder.Configuration.GetConnectionString("RnDConnection")));
 
             builder.Services.AddTransient<Handlers.RouteHandler>();
-            builder.Services.AddTransient<INotifyService, NotifyService>();
+            builder.Services.AddTransient<INotifyService, Services.NotifyService>();
 
             builder.Services.AddAuthorization();
 

ProfitGroup.SampleNotifyService/Core/Auth/BasicAuthenticationHandler.cs → ProfitGroup.NotifyService/Core/Auth/BasicAuthenticationHandler.cs

@@ -13,7 +13,7 @@ namespace ProfitGroup.SampleNotifyService.Core.Auth
 
         public BasicAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
         {
-            this._logger = logger.CreateLogger<BasicAuthenticationHandler>();
+            _logger = logger.CreateLogger<BasicAuthenticationHandler>();
         }
 
         protected override Task<AuthenticateResult> HandleAuthenticateAsync()
@@ -32,10 +32,10 @@ namespace ProfitGroup.SampleNotifyService.Core.Auth
                 var username = credentials[0];
                 var password = credentials[1];
 
-                _logger.LogInformation($"Login: {username}, Password: {password}");
-
                 if (IsValidUser(username, password))
                 {
+                    _logger.LogInformation("Успешная авторизация");
+                    
                     var claims = new[] { new Claim(ClaimTypes.Name, username) };
                     var identity = new ClaimsIdentity(claims, Scheme.Name);
                     var principal = new ClaimsPrincipal(identity);
@@ -43,11 +43,10 @@ namespace ProfitGroup.SampleNotifyService.Core.Auth
 
                     return Task.FromResult(AuthenticateResult.Success(ticket));
                 }
-                else
-                {
+
+                _logger.LogInformation($"Произошла ошибка при авторизации. Указан неверный логин или пароль");
                 return Task.FromResult(AuthenticateResult.Fail("Incorrect login or password"));
             }
-            }
             catch (Exception ex)
             {
                 return Task.FromResult(AuthenticateResult.Fail("Error: " + ex.Message));
@@ -56,11 +55,13 @@ namespace ProfitGroup.SampleNotifyService.Core.Auth
 
         private bool IsValidUser(string username, string password)
         {
-#if DEBUG
-            return username == "S4test" && password == "ST6aAFw10";
-#endif
+            // ToDo: Сменить пароль при переносе решения
+            
+            // APP02
+            return username == "S4test" && password == "lMxeTqMIH04R8mCE";
             
-            return username == "S4test" && password == "ST6aAFw10";
+            // Productive
+            // return username == "S4test" && password == "lMxeTqMIH04R8mCE";
         }
     }
 }

ProfitGroup.SampleNotifyService/Core/Configs/Config.cs → ProfitGroup.NotifyService/Core/Configs/Config.cs

-using ProfitGroup.SampleNotifyService.Models;
+using ProfitGroup.NotifyService.Models;
 
-namespace ProfitGroup.SampleNotifyService.Core.Configs
+namespace ProfitGroup.NotifyService.Core.Configs
 {
     public class Config
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/ProfITS4MtLogConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/ProfITS4MtLogConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class ProfITS4MtLogConfiguration : IEntityTypeConfiguration<ProfITS4MtLog>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/ProfITS4PrLogConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/ProfITS4PrLogConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class ProfITS4PrLogConfiguration : IEntityTypeConfiguration<ProfITS4PrLog>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtAuConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtAuConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtAuConfiguration : IEntityTypeConfiguration<RndtAu>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtBomHeaderConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtBomHeaderConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtBomHeaderConfiguration : IEntityTypeConfiguration<RndtBomHeader>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtScConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtScConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtScConfiguration : IEntityTypeConfiguration<RndtSc>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtScIcConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtScIcConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtScIcConfiguration : IEntityTypeConfiguration<RndtScIc>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtScIiConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtScIiConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtScIiConfiguration : IEntityTypeConfiguration<RndtScIi>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtSpAuConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtSpAuConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtSpAuConfiguration : IEntityTypeConfiguration<RndtSpAu>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtSpConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtSpConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtSpConfiguration : IEntityTypeConfiguration<RndtSp>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtSpIcConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtSpIcConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtSpIcConfiguration : IEntityTypeConfiguration<RndtSpIc>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/Configurations/RndtSpIiConfiguration.cs → ProfitGroup.NotifyService/Core/Data/Entities/Configurations/RndtSpIiConfiguration.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 using System.Collections.Generic;
 using System;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations
 {
     public partial class RndtSpIiConfiguration : IEntityTypeConfiguration<RndtSpIi>
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/ProfITS4MtLog.cs → ProfitGroup.NotifyService/Core/Data/Entities/ProfITS4MtLog.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class ProfITS4MtLog
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/ProfITS4PrLog.cs → ProfitGroup.NotifyService/Core/Data/Entities/ProfITS4PrLog.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class ProfITS4PrLog
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RDnLDatabaseContext.cs → ProfitGroup.NotifyService/Core/Data/Entities/RDnLDatabaseContext.cs

 // <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities.Configurations;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities.Configurations;
 using System.Collections.Generic;
 using System;
 #nullable disable
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RDnLDatabaseContext : DbContext
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtAu.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtAu.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtAu
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtBomHeader.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtBomHeader.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtBomHeader
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtSc.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtSc.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtSc
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtScIc.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtScIc.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtScIc
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtScIi.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtScIi.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtScIi
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtSp.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtSp.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtSp
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtSpAu.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtSpAu.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtSpAu
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtSpIc.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtSpIc.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtSpIc
     {

ProfitGroup.SampleNotifyService/Core/Data/Entities/RndtSpIi.cs → ProfitGroup.NotifyService/Core/Data/Entities/RndtSpIi.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProfitGroup.SampleNotifyService.Data.Core.Data.Entities
+namespace ProfitGroup.NotifyService.Data.Core.Data.Entities
 {
     public partial class RndtSpIi
     {

ProfitGroup.SampleNotifyService/Core/Handlers/BodyParser.cs → ProfitGroup.NotifyService/Core/Handlers/BodyParser.cs

 using System.Text;
 
-namespace ProfitGroup.SampleNotifyService.Core.Handlers
+namespace ProfitGroup.NotifyService.Core.Handlers
 {
     public static class BodyParser
     {

ProfitGroup.SampleNotifyService/Core/Handlers/ContentDeserializer.cs → ProfitGroup.NotifyService/Core/Handlers/ContentDeserializer.cs

 using System.Xml.Serialization;
 
-namespace ProfitGroup.SampleNotifyService.Core.Handlers
+namespace ProfitGroup.NotifyService.Core.Handlers
 {
     public static class ContentDeserializer
     {

ProfitGroup.SampleNotifyService/Core/Handlers/RequestScopedLoggerMiddleware.cs → ProfitGroup.NotifyService/Core/Handlers/RequestScopedLoggerMiddleware.cs

-namespace ProfitGroup.SampleNotifyService.Core.Handlers;
+namespace ProfitGroup.NotifyService.Core.Handlers;
 
 public class RequestScopedLoggerMiddleware
 {

ProfitGroup.SampleNotifyService/Core/Handlers/RouteHandler.cs → ProfitGroup.NotifyService/Core/Handlers/RouteHandler.cs

-using ProfitGroup.SampleNotifyService.Core.Configs;
-using ProfitGroup.SampleNotifyService.Models;
-using ProfitGroup.SampleNotifyService.Services;
-using System.Text;
+using System.Text;
 using System.Xml.Serialization;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Core.Configs;
+using ProfitGroup.NotifyService.Models;
+using ProfitGroup.NotifyService.Services;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 
-namespace ProfitGroup.SampleNotifyService.Core.Handlers
+namespace ProfitGroup.NotifyService.Core.Handlers
 {
     public class RouteHandler
     {
@@ -73,7 +73,7 @@ namespace ProfitGroup.SampleNotifyService.Core.Handlers
         {
             var confirmation = model.Body.MTConfirmation.Confirmation;
 
-            var isSuccess = await _notifyService.SaveParameterLog(confirmation.ID, confirmation.Version, confirmation.StatusCode, confirmation.StatusText);
+            var isSuccess = await _notifyService.SaveParameterLog(confirmation.ID, Convert.ToInt32(confirmation.Version), confirmation.StatusCode, confirmation.StatusText);
 
             if (!isSuccess)
             {
@@ -92,7 +92,7 @@ namespace ProfitGroup.SampleNotifyService.Core.Handlers
         {
             var confirmation = model.Body.MTConfirmation.Confirmation;
 
-            var isSuccess = await _notifyService.SaveMethodLog(confirmation.ID, confirmation.Version, confirmation.StatusCode, confirmation.StatusText);
+            var isSuccess = await _notifyService.SaveMethodLog(confirmation.ID, Convert.ToInt32(confirmation.Version), confirmation.StatusCode, confirmation.StatusText);
 
             if (!isSuccess)
             {
@@ -121,7 +121,7 @@ namespace ProfitGroup.SampleNotifyService.Core.Handlers
                 return Results.NotFound(errorText);
             }
 
-            var infoCard = await _notifyService.GetSampleInfoCardAsync(confirmation.ID);
+            var infoCard = await _notifyService.GetSampleInfoCardAsync((int)sample.SC);
 
             if (infoCard == null)
             {
@@ -160,10 +160,10 @@ namespace ProfitGroup.SampleNotifyService.Core.Handlers
             {
                 var errorText = $"Полученое неверное значение локации. Полученное значение: \"{locate}\"";
                 _logger.LogError(errorText);
-                return Results.BadRequest($"");
+                return Results.BadRequest(errorText);
             }
 
-            var specification = await _notifyService.GetSpecificationAsync(confirmation.ID, confirmation.Version);
+            var specification = await _notifyService.GetSpecificationAsync(confirmation.ID, Convert.ToInt32(confirmation.Version));
 
             if (specification == null)
             {
@@ -174,7 +174,7 @@ namespace ProfitGroup.SampleNotifyService.Core.Handlers
             }
 
             var infoCard =
-                await _notifyService.GetSpecificationInfoCardAsync(confirmation.ID, confirmation.Version, locate);
+                await _notifyService.GetSpecificationInfoCardAsync((int)specification.SP, Convert.ToInt32(confirmation.Version), locate);
 
             if (infoCard == null)
             {

ProfitGroup.SampleNotifyService/Models/AttributeSaveAction.cs → ProfitGroup.NotifyService/Models/AttributeSaveAction.cs

-namespace ProfitGroup.SampleNotifyService.Models
+namespace ProfitGroup.NotifyService.Models
 {
     public enum AttributeSaveAction
     {

ProfitGroup.SampleNotifyService/Models/ConfirmationModel.cs → ProfitGroup.NotifyService/Models/ConfirmationModel.cs

 using System.Xml.Serialization;
 
-namespace ProfitGroup.SampleNotifyService.Models
+namespace ProfitGroup.NotifyService.Models
 {
     [XmlRoot(ElementName = "Confirmation", Namespace = "")]
     public class Confirmation
@@ -16,7 +16,7 @@ namespace ProfitGroup.SampleNotifyService.Models
         public int ID { get; set; }
 
         [XmlAttribute(AttributeName = "Version", Namespace = "")]
-        public int Version { get; set; }
+        public string Version { get; set; }
 
         [XmlAttribute(AttributeName = "StatusCode", Namespace = "")]
         public string StatusCode { get; set; }

ProfitGroup.SampleNotifyService/Models/ObjectTypes.cs → ProfitGroup.NotifyService/Models/ObjectTypes.cs

-namespace ProfitGroup.SampleNotifyService.Models
+namespace ProfitGroup.NotifyService.Models
 {
     public enum ObjectTypes
     {

ProfitGroup.SampleNotifyService/ProfitGroup.SampleNotifyService.csproj → ProfitGroup.NotifyService/ProfitGroup.NotifyService.csproj

@@ -16,7 +16,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.4" />
-    <PackageReference Include="NLog.Web" Version="5.3.5" />
+    <PackageReference Include="NLog.Web" Version="5.3.3" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>

ProfitGroup.SampleNotifyService/Program.cs → ProfitGroup.NotifyService/Program.cs

-using ProfitGroup.SampleNotifyService.Core.Application;
+using ProfitGroup.NotifyService.Core.Application;
 
 WebApplication
     .CreateBuilder(args)

ProfitGroup.SampleNotifyService/Services/INotifyService.cs → ProfitGroup.NotifyService/Services/INotifyService.cs

-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 
-namespace ProfitGroup.SampleNotifyService.Services;
+namespace ProfitGroup.NotifyService.Services;
 
 public interface INotifyService
 {

ProfitGroup.SampleNotifyService/Services/NotifyService.cs → ProfitGroup.NotifyService/Services/NotifyService.cs

 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
-using ProfitGroup.SampleNotifyService.Core.Configs;
-using ProfitGroup.SampleNotifyService.Data.Core.Data.Entities;
+using ProfitGroup.NotifyService.Core.Configs;
+using ProfitGroup.NotifyService.Data.Core.Data.Entities;
 
-namespace ProfitGroup.SampleNotifyService.Services;
+namespace ProfitGroup.NotifyService.Services;
 
 public class NotifyService : INotifyService
 {
@@ -234,9 +234,9 @@ public class NotifyService : INotifyService
             };
 
             await _context.Database.ExecuteSqlRawAsync(
-                "UPDATE ProfITS4MtLog " +
-                "SET S4Status = @StatusCode, S4StatusText = @StatusText, S4StatusDate = @StatusDate " +
-                "WHERE MT = @MethodId AND MT_VERSION = @MethodVersion", parameters);
+                "UPDATE [RndSuite].[ProfITS4MtLog] " +
+                "SET [S4Status] = @StatusCode, [S4StatusText] = @StatusText, [S4StatusDate] = @StatusDate " +
+                "WHERE [MT] = @MethodId AND [MT_VERSION] = @MethodVersion", parameters);
             // await _context.SaveChangesAsync();
             return true;
         }
@@ -275,9 +275,9 @@ public class NotifyService : INotifyService
             };
 
             var affectedRows = await _context.Database.ExecuteSqlRawAsync(
-                "UPDATE ProfITS4PrLog " +
-                "SET S4Status = @StatusCode, S4StatusText = @StatusText, S4StatusDate = @StatusDate " +
-                "WHERE PR = @ParameterId AND PR_VERSION = @ParameterVersion", parameters);
+                "UPDATE [RndSuite].[ProfITS4PrLog] " +
+                "SET [S4Status] = @StatusCode, [S4StatusText] = @StatusText, [S4StatusDate] = @StatusDate " +
+                "WHERE [PR] = @ParameterId AND [PR_VERSION] = @ParameterVersion", parameters);
             
             // await _context.SaveChangesAsync();
             return true;

ProfitGroup.SampleService/Models/Entities/RndtPack.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace ProfitGroup.SampleService.Models.Entities
+{
+    public partial class Rndtpack
+    {
+        public Nullable<int> lo { get; set; }
+        public string control { get; set; }
+        public string pack { get; set; }
+        public string pack_KSSS { get; set; }
+        public string pack_en { get; set; }
+        public string pack_cn { get; set; }
+        public string pack_au { get; set; }
+        public string pack_id { get; set; }
+        public int id { get; set; }
+    }
+
+    public class RndtpackMapObject
+    {
+        public decimal Id { get; set; }
+        public string Pack { get; set; }
+        public string PackKSSS { get; set; }
+    }
+}
\ No newline at end of file

ProfitGroup.SampleService/Models/StringWriterUTF8.cs

+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web;
+
+namespace ProfitGroup.SampleService.Models
+{
+    public class StringWriterUTF8 : StringWriter
+    {
+
+        public override Encoding Encoding => Encoding.UTF8;
+
+    }
+}
\ No newline at end of file