ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into migration/net-5

Browse Source
This commit is contained in:
Miguel Veloso 2021-01-20 17:53:09 +00:00
commit 7b3764c822
8 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Services/Basket/Basket.API/Infrastructure/Middlewares/FailingMiddleware.cs
View File

@ -12,6 +12,7 @@ namespace Basket.API.Infrastructure.Middlewares
private bool _mustFail; private bool _mustFail;
private readonly FailingOptions _options; private readonly FailingOptions _options;
private readonly ILogger _logger; private readonly ILogger _logger;
public FailingMiddleware(RequestDelegate next, ILogger<FailingMiddleware> logger, FailingOptions options) public FailingMiddleware(RequestDelegate next, ILogger<FailingMiddleware> logger, FailingOptions options)
{ {
_next = next; _next = next;
@ -19,6 +20,7 @@ namespace Basket.API.Infrastructure.Middlewares
_mustFail = false; _mustFail = false;
_logger = logger; _logger = logger;
} }
public async Task Invoke(HttpContext context) public async Task Invoke(HttpContext context)
{ {
var path = context.Request.Path; var path = context.Request.Path;

1
src/Services/Catalog/Catalog.API/CatalogSettings.cs
View File

@ -7,6 +7,7 @@
public string EventBusConnection { get; set; } public string EventBusConnection { get; set; }
public bool UseCustomizationData { get; set; } public bool UseCustomizationData { get; set; }
public bool AzureStorageEnabled { get; set; } public bool AzureStorageEnabled { get; set; }
} }
} }

1
src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs
View File

@ -19,6 +19,7 @@ namespace Catalog.API.Grpc
private readonly CatalogContext _catalogContext; private readonly CatalogContext _catalogContext;
private readonly CatalogSettings _settings; private readonly CatalogSettings _settings;
private readonly ILogger _logger; private readonly ILogger _logger;
public CatalogService(CatalogContext dbContext, IOptions<CatalogSettings> settings, ILogger<CatalogService> logger) public CatalogService(CatalogContext dbContext, IOptions<CatalogSettings> settings, ILogger<CatalogService> logger)
{ {
_settings = settings.Value; _settings = settings.Value;

1
src/Services/Catalog/Catalog.API/Proto/catalog.proto
View File

@ -10,6 +10,7 @@ package CatalogApi;
message CatalogItemRequest { message CatalogItemRequest {
int32 id = 1; int32 id = 1;
} }
message CatalogItemsRequest { message CatalogItemsRequest {
string ids = 1; string ids = 1;
int32 pageSize = 2; int32 pageSize = 2;

8
src/Services/Catalog/Catalog.API/ViewModel/PaginatedItemsViewModel.cs
View File

@ -15,10 +15,10 @@
public PaginatedItemsViewModel(int pageIndex, int pageSize, long count, IEnumerable<TEntity> data) public PaginatedItemsViewModel(int pageIndex, int pageSize, long count, IEnumerable<TEntity> data)
{ {
this.PageIndex = pageIndex; PageIndex = pageIndex;
this.PageSize = pageSize; PageSize = pageSize;
this.Count = count; Count = count;
this.Data = data; Data = data;
} }
} }
} }

6
src/Services/Ordering/Ordering.FunctionalTests/appsettings.json
View File

@ -1,12 +1,12 @@
{ {
"CheckUpdateTime": "30000",
"ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
"EventBusConnection": "localhost",
"ExternalCatalogBaseUrl": "http://localhost:5101", "ExternalCatalogBaseUrl": "http://localhost:5101",
"GracePeriodTime": "1",
"IdentityUrl": "http://localhost:5105", "IdentityUrl": "http://localhost:5105",
"IdentityUrlExternal": "http://localhost:5105", "IdentityUrlExternal": "http://localhost:5105",
"isTest": "true", "isTest": "true",
"EventBusConnection": "localhost",
"CheckUpdateTime": "30000",
"GracePeriodTime": "1",
"SubscriptionClientName": "Ordering", "SubscriptionClientName": "Ordering",
"SuppressCheckForUnhandledSecurityMetadata": true "SuppressCheckForUnhandledSecurityMetadata": true
} }

6
src/Web/WebSPA/package-lock.json generated
View File

@ -8153,9 +8153,9 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.7",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==",
"dev": true "dev": true
}, },
"inquirer": { "inquirer": {

1
src/Web/WebhookClient/Models/WebHookReceived.cs
View File

@ -5,6 +5,7 @@ namespace WebhookClient.Models
public class WebHookReceived public class WebHookReceived
{ {
public DateTime When { get; set; } public DateTime When { get; set; }
public string Data { get; set; } public string Data { get; set; }
public string Token { get; set; } public string Token { get; set; }