chebser/RhSolutions-Api
0
0
Fork 0
Code Packages Wiki

Compare commits

base: chebser:3ab838e27f488088d32eb9a1bd239521185a131d
Branches Tags
chebser:master
chebser:feat/formfiles
chebser:net8.0
chebser:grpc
...
compare: chebser:f23552a0001d1dfdfac5514dda1e3397dcb31831
Branches Tags
chebser:master
chebser:feat/formfiles
chebser:net8.0
chebser:grpc

6 Commits
3ab838e27f ... f23552a000

Author SHA1 Message Date
Sergey Chebotar
f23552a000 ProductSku package update 2023-05-12 07:19:16 +03:00
Sergey Chebotar
deae03785a Distinct DeprecatedSkus on merging during file post 2023-05-12 07:18:27 +03:00
Sergey Chebotar
1002b7a3b9 Switch build to images in docker compose 2023-05-11 19:14:10 +03:00
Sergey Chebotar
7dc8fd45d4 Dictionary delete 2023-05-11 19:13:14 +03:00
Sergey Chebotar
3cf031f95b Add nuget config 2023-05-11 08:31:02 +03:00
Sergey Chebotar
64b885e6b3 Delete global.json 2023-05-11 08:04:41 +03:00
6 changed files with 10 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
RhSolutions.Api/Controllers/ProductsController.cs
View File

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

4
RhSolutions.Api/Deploy/docker-compose.yml
View File

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

2
RhSolutions.Api/RhSolutions.Api.csproj
View File

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

1
RhSolutions.Api/Services/ClosedXMLParser.cs
View File

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

5
RhSolutions.Api/global.json
View File

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

6
RhSolutions.Api/nuget.config Normal file
View File

@ -0,0 +1,6 @@
<?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>