Merge branch 'master' into TimestampedValuesFilter

.docker/appsettings.json

@@ -0,0 +1,25 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "ConnectionStrings": {
+    "DefaultConnection": "Host=db:5432;Database=persistence;Username=postgres;Password=postgres;Persist Security Info=True"
+  },
+  "AllowedHosts": "*",
+  "NeedUseKeyCloak": false,
+  "KeyCloakAuthentication": {
+    "Audience": "account",
+    "Host": "http://192.168.0.10:8321/realms/Persistence"
+  },
+  "AuthUser": {
+    "username": "myuser",
+    "password": 12345,
+    "clientId": "webapi",
+    "grantType": "password",
+    "http://schemas.xmlsoap.org/ws/2005/05/identity /claims/nameidentifier": "7d9f3574-6574-4ca3-845a-0276eb4aa8f6"
+  },
+  "ClientUrl": "http://localhost:5000/"
+}

.docker/compose.yaml

@@ -0,0 +1,31 @@
+networks:
+  persistence:
+    external: false
+
+services:
+  db:    
+    image: timescale/timescaledb:latest-pg16
+    container_name: some-timescaledb-16
+    restart: always
+    environment:
+      - POSTGRES_PASSWORD=postgres
+    networks:
+      - persistence
+    ports:
+      - "5462:5432"
+    volumes:
+      - ./db:/var/lib/postgresql/data
+
+  persistence:
+    image: git.ddrilling.ru/ddrilling/persistence:latest
+    container_name: persistence
+    restart: always
+    depends_on:
+      - db
+    networks:
+      - persistence
+    ports:
+      - "1111:8080"
+    volumes:
+      - ./appsettings.json:/app/appsettings.json
+      

DD.Persistence.Test/TimestampedValuesServiceShould.cs

@@ -2,6 +2,7 @@ using DD.Persistence.Models;
 using DD.Persistence.Repositories;
 using DD.Persistence.Services;
 using NSubstitute;
+using System.Text.Json;
 
 namespace DD.Persistence.Test;
 public class TimestampedValuesServiceShould
@@ -44,10 +45,10 @@ public class TimestampedValuesServiceShould
         {
             var values = new Dictionary<string, object>()
             {
-                { "A", i },
+                { "A", GetJsonFromObject(i) },
-                { "B", i * 1.1 },
+                { "B", GetJsonFromObject(i * 1.1) },
-                { "C", $"Any{i}" },
+                { "C", GetJsonFromObject($"Any{i}") },
-                { "D", DateTimeOffset.Now },
+                { "D", GetJsonFromObject(DateTimeOffset.Now) }
             };
 
             yield return new TimestampedValuesDto()
@@ -57,4 +58,11 @@ public class TimestampedValuesServiceShould
             };
         }
     }
+
+    private static JsonElement GetJsonFromObject(object value)
+    {
+        var jsonString = JsonSerializer.Serialize(value);
+        var doc = JsonDocument.Parse(jsonString);
+        return doc.RootElement;
+    }
 }

README.md

@@ -1 +1,10 @@
 # Persistence
+## Инструкция по развертыванию persistence в docker
+1. Необходимо скопировать себе локально папку **.docker**, которая находится внутри проекта **persistence**
+
+2. Авторизоваться в gitea-registry при помощи командры: `docker login -u пользователь -p пароль https://git.ddrilling.ru`
+
+3. Из папки **.docker** запустить команду:
+ `docker-compose up`
+ 
+4. При успешном старте persistence необходимо откорректировать ссылку в браузере: `[host]:[port]/swagger/index.html`