Merge remote-tracking branch 'origin/release/v1.2.2'

EvilLord666 · EvilLord666 · commit 57d25dd8c431 · 2025-11-12T17:35:47.000+05:00
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ There are 2 run profiles (`Development` and `Production`) and 2 possible configs
 
 1. Running on Windows allows to use Net Directory class with network path to files && folders, therefore `SM2201` config section
    looks like:
-   ```csharp
+   ```json
    "Sm2201SpectraStoreSettings": {
       "Address": "192.168.10.212",
       "Domain": "MOSSBAUERLAB",
@@ -49,7 +49,7 @@ There are 2 run profiles (`Development` and `Production`) and 2 possible configs
    
 2. Running on any Linux requires to mount Windows shared folder using `cifs.mount`, because `Directory` in Linux doesn't
    understand Windows network Path, therefore `SM2201` config section looks like:
-   ```csharp
+   ```json
    "Sm2201SpectraStoreSettings": {
       "Address": "",
       "Domain": "MOSSBAUERLAB",
@@ -94,8 +94,7 @@ To run `Wissance.MossbauerLab.Watcher.Web` as a service it should be configured
 1. Create group - `sudo groupadd mossbauer`
 2. Create user - `labwatcher - sudo useradd -r -g mossbauer -d /usr/local/sbin/labwatcher -s /sbin/nologin labwatcher`
 3. Create labwatcher.service file with following content:
-```
-
+```bash
 [Unit]
 Description=Wissance.MossbauerLab.Watcher service
 After=syslog.target network.target
@@ -113,6 +112,15 @@ StandardError=syslog
 [Install]
 WantedBy=multi-user.target
 
+```
+Recently, we Started to build **self-contained archive into single file** except `.pdb`(debug symbols) and configs, in this 
+case after copy published file `Wissance.MossbauerLab.Watcher.Web` must be made executable `+x` (via `chmod`):
+```bash
+sudo -u labwatcher chmod +x Wissance.MossbauerLab.Watcher.Web
+````
+after that change ExecStart in service file like this:
+```bash
+ExecStart=/usr/local/sbin/labwatcher/app/Wissance.MossbauerLab.Watcher.Web --environment=Production
 ```
 4. Change directory owner to `mossbauer:labwatcher` - `sudo chown -R labwatcher:mossbauer /usr/local/sbin/labwatcher`
 5. Copy `labwatcher.service` file to `/etc/systemd/system`
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Entities/EventEntity.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Entities/EventEntity.cs
@@ -25,7 +25,7 @@ public EventEntity(EventType eventType, DateTime start, DateTime? finish)
             Finish = finish;
         }
 
-        public int Id { get; }
+        public int Id { get; set; }
         public EventType Type { get; set; }
         public DateTime Start { get; set; }
         public DateTime? Finish { get; set; }
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Entities/SpectrumEntity.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Entities/SpectrumEntity.cs
@@ -22,7 +22,7 @@ public SpectrumEntity(string name, string description, string location, DateTime
             IsArchived = isArchived;
         }
 
-        public int Id { get; }
+        public int Id { get; set; }
         public string Name { get; set; }
         public string Description { get; set; }
         public string Location { get; set; }
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Tools/MigrationsContextDbFactory.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Tools/MigrationsContextDbFactory.cs
@@ -4,7 +4,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Sqlite;
-using Wissance.WebApiToolkit.Data.Tools;
+using Wissance.WebApiToolkit.Data.Ef.Tools;
 
 namespace Wissance.MossbauerLab.Watcher.Data.Tools
 {
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Wissance.MossbauerLab.Watcher.Data.csproj b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Wissance.MossbauerLab.Watcher.Data.csproj
@@ -12,7 +12,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Wissance.WebApiToolkit" Version="1.1.2" />
+    <PackageReference Include="Wissance.WebApiToolkit.Core" Version="4.1.0" />
+    <PackageReference Include="Wissance.WebApiToolkit.Data.Ef" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Dto/SpectrumInfoDto.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Dto/SpectrumInfoDto.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Wissance.MossabuerLab.Watcher.Dto
+namespace Wissance.MossbauerLab.Watcher.Dto
 {
     public class SpectrumInfoDto
     {
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Dto/SpectrumSamplesInfoDto.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Dto/SpectrumSamplesInfoDto.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Wissance.MossabuerLab.Watcher.Dto
+namespace Wissance.MossbauerLab.Watcher.Dto
 {
     public class SpectrumSamplesInfoDto
     {
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Dto/Wissance.MossbauerLab.Watcher.Dto.csproj b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Dto/Wissance.MossbauerLab.Watcher.Dto.csproj
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Services/Notification/TelegramNotifier.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Services/Notification/TelegramNotifier.cs
@@ -53,8 +53,7 @@ private Message CreateMessageFromTemplate(IList<SpectrumReadyData> spectra)
             if (!_templateManager.Templates.ContainsKey(SpectrometerEvent.SpectrumSaved))
                 throw new InvalidDataException("Expected that key \"SpectrometerEvent.SpectrumSaved\" present in _templates, actually not");
             string template;
-            bool spectraIsEmpty = !spectra.Any();
-            if (spectraIsEmpty)
+            if (spectra.Any())
             {
                 template = _templateManager.Templates[SpectrometerEvent.SpectrumSaved].PositiveCase;
             }
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Services/Notification/Templates/tgSpectraEmpty.txt b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Services/Notification/Templates/tgSpectraEmpty.txt
@@ -1,5 +1,5 @@
-�� {currDate} �� ���� �������� �� ������ �������, �������� ��� ����� �������� �� ����� �� ��������� �������:
-* ��������, ��� ���������� ����������� � ������������ � ������ ������ �� ����������;
-* ���� ������ ������������������� ������������ / ���������� ������������ ����������;
-* ���������� ���������� �������������� ����������� ����� ������ ������� �� ��� ;
-* ���������� ���� (���������� �������/��������� ���� ��������)
+﻿На {currDate} не было получено ни одного спектра, косвенно это может говорить об одной из следующих проблем:
+* возможно, что накопление остановлено и эксперименты в данный момент не проводятся;
+* сбой работы спектрометрического оборудования / отключение управляющего компьютера;
+* длительное отключение электроэнергии превышающее время работы системы от АКБ ;
+* отсутствие сети (отключение роутера/мобильной сети интернет)
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Controllers/SpectrumController.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Controllers/SpectrumController.cs
@@ -4,15 +4,16 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Wissance.MossabuerLab.Watcher.Dto;
+using Wissance.MossbauerLab.Watcher.Dto;
 using Wissance.MossbauerLab.Watcher.Data.Entities;
 using Wissance.MossbauerLab.Watcher.Web.Managers;
-using Wissance.WebApiToolkit.Controllers;
+using Wissance.WebApiToolkit.Core.Controllers;
+using Wissance.WebApiToolkit.Core.Data;
 using Wissance.WebApiToolkit.Dto;
 
 namespace Wissance.MossbauerLab.Watcher.Web.Controllers
 {
-    public class SpectrumController : BasicReadController<SpectrumInfoDto, SpectrumEntity, int>
+    public class SpectrumController : BasicReadController<SpectrumInfoDto, SpectrumEntity, int, EmptyAdditionalFilters>
     {
         public SpectrumController(SpectrumManager manager)
         {
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Factories/SpectrumFactory.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Factories/SpectrumFactory.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Wissance.MossabuerLab.Watcher.Dto;
+using Wissance.MossbauerLab.Watcher.Dto;
 using Wissance.MossbauerLab.Watcher.Data.Entities;
 
 namespace Wissance.MossbauerLab.Watcher.Web.Factories
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Factories/SpectrumSampleFactory.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Factories/SpectrumSampleFactory.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Wissance.MossabuerLab.Watcher.Dto;
+using Wissance.MossbauerLab.Watcher.Dto;
 using Wissance.MossbauerLab.Watcher.Data.Entities;
 
 namespace Wissance.MossbauerLab.Watcher.Web.Factories
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Managers/SpectrumManager.cs b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Managers/SpectrumManager.cs
@@ -8,21 +8,21 @@
 using FluentFTP;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Wissance.MossabuerLab.Watcher.Dto;
+using Wissance.MossbauerLab.Watcher.Dto;
 using Wissance.MossbauerLab.Watcher.Data;
 using Wissance.MossbauerLab.Watcher.Data.Entities;
 using Wissance.MossbauerLab.Watcher.Services.Store;
 using Wissance.MossbauerLab.Watcher.Web.Config;
 using Wissance.MossbauerLab.Watcher.Web.Factories;
 using Wissance.WebApiToolkit.Dto;
-using Wissance.WebApiToolkit.Managers;
+using Wissance.WebApiToolkit.Ef.Managers;
 
 namespace Wissance.MossbauerLab.Watcher.Web.Managers
 {
-    public class SpectrumManager: EfModelManager<SpectrumEntity, SpectrumInfoDto, int>
+    public class SpectrumManager: EfModelManager<ModelContext, SpectrumInfoDto, SpectrumEntity, int>
     {
         public SpectrumManager(ModelContext dbContext, ILoggerFactory loggerFactory, IFileStoreService storeService, ApplicationConfig appConfig) 
-            : base(dbContext, null, SpectrumFactory.Create, loggerFactory)
+            : base(dbContext, null, SpectrumFactory.Create, null, null, loggerFactory)
         {
             _context = dbContext;
             _storeService = storeService;
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Wissance.MossbauerLab.Watcher.Web.csproj b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Wissance.MossbauerLab.Watcher.Web.csproj
@@ -6,12 +6,12 @@
 
   <ItemGroup>
     <PackageReference Include="FluentFTP" Version="46.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.1" />
     <PackageReference Include="Quartz" Version="3.4.0" />
     <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.4.0" />
     <PackageReference Include="Quartz.Extensions.Hosting" Version="3.4.0" />
@@ -21,14 +21,15 @@
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     <!--<PackageReference Include="SimpleImpersonation" Version="4.2.0" />-->
-    <PackageReference Include="Wissance.Authorization" Version="1.1.1" />
-    <PackageReference Include="Wissance.WebApiToolkit" Version="1.1.2" />
+    <PackageReference Include="Wissance.Authorization" Version="1.1.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.17" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.17" />
+    <PackageReference Include="Wissance.WebApiToolkit.Data.Ef" Version="4.1.0" />
+    <PackageReference Include="Wissance.WebApiToolkit.Ef" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Wissance.MossabuerLab.Watcher.Dto\Wissance.MossabuerLab.Watcher.Dto.csproj" />
+    <ProjectReference Include="..\Wissance.MossbauerLab.Watcher.Dto\Wissance.MossbauerLab.Watcher.Dto.csproj" />
     <ProjectReference Include="..\Wissance.MossbauerLab.Watcher.Common\Wissance.MossbauerLab.Watcher.Common.csproj" />
     <ProjectReference Include="..\Wissance.MossbauerLab.Watcher.Data\Wissance.MossbauerLab.Watcher.Data.csproj" />
     <ProjectReference Include="..\Wissance.MossbauerLab.Watcher.Services\Wissance.MossbauerLab.Watcher.Services.csproj" />
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/appsettings.Development.json b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/appsettings.Development.json
@@ -76,7 +76,7 @@
       "DefaultEventWatchSchedule": "",
       "DefaultSpectraIndexerSchedule": "30/30 * * ? * * *",
       "DefaultSpectraNotifySchedule": "0 0 10,17,22 ? * * *",
-      "DefaultFileArchSchedule": "0 0 23 1/1 * ? *"
+      "DefaultFileArchSchedule": "0 0 23 ? * * *"
     },
     "ConnStr": "Data Source=Wissance.MossbauerLab.Watcher.db;"
   } 
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/appsettings.Production.json b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/appsettings.Production.json
@@ -75,7 +75,7 @@
       "DefaultEventWatchSchedule": "",
       "DefaultSpectraIndexerSchedule": "30/30 * * ? * * *",
       "DefaultSpectraNotifySchedule": "0 0 10,17,22 ? * * *",
-      "DefaultFileArchSchedule": "0 0 23 1/1 * ? *"
+      "DefaultFileArchSchedule": "0 0 23 ? * * *"
     },
     "ConnStr": "Data Source=Wissance.MossbauerLab.Watcher.db;"
   }
diff --git a/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.sln b/Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wissance.MossbauerLab.Watch
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wissance.MossbauerLab.Watcher.Services.Tests", "Wissance.MossbauerLab.Watcher.Tests\Wissance.MossbauerLab.Watcher.Services.Tests.csproj", "{26A8E4AC-4E00-4AAC-B4CC-7F4566BCA999}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wissance.MossabuerLab.Watcher.Dto", "Wissance.MossabuerLab.Watcher.Dto\Wissance.MossabuerLab.Watcher.Dto.csproj", "{BD960648-ED4A-4949-897C-9AD6CA5ABE44}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wissance.MossbauerLab.Watcher.Dto", "Wissance.MossbauerLab.Watcher.Dto\Wissance.MossbauerLab.Watcher.Dto.csproj", "{BD960648-ED4A-4949-897C-9AD6CA5ABE44}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public EventEntity(EventType eventType, DateTime start, DateTime? finish)`
`25`	`25`	`Finish = finish;`
`26`	`26`	`}`
`27`	`27`
`28`		`- public int Id { get; }`
	`28`	`+ public int Id { get; set; }`
`29`	`29`	`public EventType Type { get; set; }`
`30`	`30`	`public DateTime Start { get; set; }`
`31`	`31`	`public DateTime? Finish { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public SpectrumEntity(string name, string description, string location, DateTime`
`22`	`22`	`IsArchived = isArchived;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public int Id { get; }`
	`25`	`+ public int Id { get; set; }`
`26`	`26`	`public string Name { get; set; }`
`27`	`27`	`public string Description { get; set; }`
`28`	`28`	`public string Location { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Microsoft.EntityFrameworkCore;`
`5`	`5`	`using Microsoft.EntityFrameworkCore.Design;`
`6`	`6`	`using Microsoft.EntityFrameworkCore.Sqlite;`
`7`		`-using Wissance.WebApiToolkit.Data.Tools;`
	`7`	`+using Wissance.WebApiToolkit.Data.Ef.Tools;`
`8`	`8`
`9`	`9`	`namespace Wissance.MossbauerLab.Watcher.Data.Tools`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Text;`
`4`	`4`
`5`		`-namespace Wissance.MossabuerLab.Watcher.Dto`
	`5`	`+namespace Wissance.MossbauerLab.Watcher.Dto`
`6`	`6`	`{`
`7`	`7`	`public class SpectrumInfoDto`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,7 @@ private Message CreateMessageFromTemplate(IList<SpectrumReadyData> spectra)`
`53`	`53`	`if (!_templateManager.Templates.ContainsKey(SpectrometerEvent.SpectrumSaved))`
`54`	`54`	`throw new InvalidDataException("Expected that key \"SpectrometerEvent.SpectrumSaved\" present in _templates, actually not");`
`55`	`55`	`string template;`
`56`		`- bool spectraIsEmpty = !spectra.Any();`
`57`		`- if (spectraIsEmpty)`
	`56`	`+ if (spectra.Any())`
`58`	`57`	`{`
`59`	`58`	`template = _templateManager.Templates[SpectrometerEvent.SpectrumSaved].PositiveCase;`
`60`	`59`	`}`