0
0

Compare commits

..

No commits in common. "f23552a0001d1dfdfac5514dda1e3397dcb31831" and "3ab838e27f488088d32eb9a1bd239521185a131d" have entirely different histories.

6 changed files with 10 additions and 10 deletions

View File

@ -40,7 +40,7 @@ namespace RhSolutions.Api.Controllers
.Select(g => new Product(g.Key)
{
Name = g.First().Name,
DeprecatedSkus = g.SelectMany(p => p.DeprecatedSkus).Distinct().ToList(),
DeprecatedSkus = g.SelectMany(p => p.DeprecatedSkus).ToList(),
ProductLines = g.SelectMany(p => p.ProductLines).Distinct().ToList(),
IsOnWarehouse = g.Any(p => p.IsOnWarehouse == true),
ProductMeasure = g.First().ProductMeasure,

View File

@ -2,7 +2,7 @@ version: '3'
services:
rhsolutions-api:
image: gitea.cebotari.ru/chebser/rhsolutions-api:latest
build: ..
container_name: rhsolutions-api
ports:
- 5000:5000
@ -16,10 +16,10 @@ services:
- rhsolutions-db
restart: unless-stopped
rhsolutions-db:
image: gitea.cebotari.ru/chebser/rhsolutions-db:latest
container_name: rhsolutions-db
ports:
- 5432:5432
build: ./Database
environment:
- POSTGRES_USER=chebser
- POSTGRES_PASSWORD=Rehau-987

View File

@ -15,7 +15,7 @@
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
<PackageReference Include="Rhsolutions.ProductSku" Version="1.0.0" />
<PackageReference Include="Rhsolutions.ProductSku" Version="0.2.13" />
</ItemGroup>
</Project>

View File

@ -18,6 +18,7 @@ namespace RhSolutions.Api.Services
List<Product> products = new();
using (var wb = new XLWorkbook(memoryStream))
{
Dictionary<ProductSku, Product> collected = new();
var table = GetTable(wb);
var rows = table.DataRange.Rows();
foreach (var row in rows)

View File

@ -0,0 +1,5 @@
{
"sdk": {
"version": "6.0.311"
}
}

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="Cebotari gitea" value="https://gitea.cebotari.ru/api/packages/chebser/nuget/index.json" />
</packageSources>
</configuration>