multi site scan

koskedk · May 18, 2020 · 9b5a4f6 · 9b5a4f6
1 parent 86a4419
commit 9b5a4f6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/src/Dwapi.Bot.Core/Application/Indices/Commands/Handlers/RefreshIndexHandler.cs b/src/Dwapi.Bot.Core/Application/Indices/Commands/Handlers/RefreshIndexHandler.cs
@@ -47,6 +47,7 @@ public async Task<Result> Handle(RefreshIndex request, CancellationToken cancell
 
                 while (page <= pageCount)
                 {
+                    Log.Debug($"Reading {page} of {pageCount}...");
                     var mpis = await _reader.Read(page, request.BatchSize);
 
                     var pis= Mapper.Map<List<SubjectIndex>>(mpis);

diff --git a/src/Dwapi.Bot.Core/Application/Indices/Commands/RefreshIndex.cs b/src/Dwapi.Bot.Core/Application/Indices/Commands/RefreshIndex.cs
@@ -6,7 +6,6 @@ namespace Dwapi.Bot.Core.Application.Indices.Commands
     public class RefreshIndex:IRequest<Result>
     {
         public int BatchSize { get; }
-
         public RefreshIndex(int batchSize)
         {
             BatchSize = batchSize;

diff --git a/src/Dwapi.Bot.Core/Domain/Indices/Dto/RefreshIndexDto.cs b/src/Dwapi.Bot.Core/Domain/Indices/Dto/RefreshIndexDto.cs
@@ -0,0 +1,18 @@
+using Dwapi.Bot.Core.Application.Indices.Commands;
+
+namespace Dwapi.Bot.Core.Domain.Indices.Dto
+{
+    public class RefreshIndexDto
+    {
+        public int BatchSize { get; set; }
+
+        public RefreshIndexDto()
+        {
+        }
+
+        public RefreshIndex GenerateCommand()
+        {
+            return new RefreshIndex(BatchSize);
+        }
+    }
+}
diff --git a/src/Dwapi.Bot/Controllers/WorkerController.cs b/src/Dwapi.Bot/Controllers/WorkerController.cs
@@ -29,14 +29,14 @@ public WorkerController(IMediator mediator, ISubjectIndexRepository repository)
         }
 
         [HttpPost("Refresh")]
-        public async Task<ActionResult> Get(RefreshIndex command)
+        public async Task<ActionResult> Post([FromBody] RefreshIndexDto command)
         {
             if (command.BatchSize <= 0)
                 return BadRequest();
 
             try
             {
-                var results = await _mediator.Send(command);
+                var results = await _mediator.Send(command.GenerateCommand());
 
                 if (results.IsSuccess)
                     return Ok("Refreshing...");
@@ -52,7 +52,7 @@ public async Task<ActionResult> Get(RefreshIndex command)
         }
 
         [HttpPost("Scan")]
-        public async Task<ActionResult> Get(ScanDto command)
+        public async Task<ActionResult> Post([FromBody] ScanDto command)
         {
             var results = new List<Result>();
             var siteCodes = new List<int>();

diff --git a/src/Dwapi.Bot/Dwapi.Bot.csproj b/src/Dwapi.Bot/Dwapi.Bot.csproj
@@ -30,10 +30,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="logs\wwwroot\index.html">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
+      <Folder Include="logs" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Dwapi.Bot/Startup.cs b/src/Dwapi.Bot/Startup.cs
@@ -56,7 +56,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddTransient<IJaroWinklerScorer, JaroWinklerScorer>();
             services.AddTransient<IMasterPatientIndexReader>(s =>
-                new MasterPatientIndexReader(new DataSourceInfo(DbType.SQLite, mpiConnectionString)));
+                new MasterPatientIndexReader(new DataSourceInfo(DbType.MsSQL, mpiConnectionString)));
             services.AddScoped<IMatchConfigRepository, MatchConfigRepository>();
             services.AddScoped<ISubjectIndexRepository, SubjectIndexRepository>();
             services.AddMediatR(typeof(RefreshIndex).Assembly, typeof(IndexRefreshed).Assembly);