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

Fix errors

Browse Source
This commit is contained in:
facepalm 2022-12-17 23:19:38 +04:00
parent 24e1d81465
commit 628615efe4
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
View File

@ -20,14 +20,15 @@ public class Startup
.AddUrlGroup(new Uri(Configuration["OrderingUrlHC"]), name: "orderingapi-check", tags: new string[] { "orderingapi" }) .AddUrlGroup(new Uri(Configuration["OrderingUrlHC"]), name: "orderingapi-check", tags: new string[] { "orderingapi" })
.AddUrlGroup(new Uri(Configuration["BasketUrlHC"]), name: "basketapi-check", tags: new string[] { "basketapi" }) .AddUrlGroup(new Uri(Configuration["BasketUrlHC"]), name: "basketapi-check", tags: new string[] { "basketapi" })
.AddUrlGroup(new Uri(Configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" }) .AddUrlGroup(new Uri(Configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" })
.AddUrlGroup(new Uri(Configuration["PaymentUrlHC"]), name: "paymentapi-check", tags: new string[] { "paymentapi" }); .AddUrlGroup(new Uri(Configuration["PaymentUrlHC"]), name: "paymentapi-check", tags: new string[] { "paymentapi" })
.AddUrlGroup(new Uri(Configuration["CouponUrlHC"]), name: "couponapi-check", tags: new string[] { "couponapi" });
// HC dependency is configured this way to save one build step on ACR // HC dependency is configured this way to save one build step on ACR
var couponHealthEndpoint = Configuration["CouponUrlHC"]; //var couponHealthEndpoint = Configuration["CouponUrlHC"];
if (!string.IsNullOrWhiteSpace(couponHealthEndpoint)) //if (!string.IsNullOrWhiteSpace(couponHealthEndpoint))
{ //{
healthCheckBuilder.AddUrlGroup(new Uri(couponHealthEndpoint), name: "couponapi-check", tags: new string[] { "couponapi" }); // healthCheckBuilder.AddUrlGroup(new Uri(couponHealthEndpoint), name: "couponapi-check", tags: new string[] { "couponapi" });
} //}
services.AddCustomMvc(Configuration) services.AddCustomMvc(Configuration)
.AddCustomAuthentication(Configuration) .AddCustomAuthentication(Configuration)

2
src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json
View File

@ -7,6 +7,6 @@
"grpcBasket": "http://localhost:5580", "grpcBasket": "http://localhost:5580",
"grpcCatalog": "http://localhost:81", "grpcCatalog": "http://localhost:81",
"grpcOrdering": "http://localhost:5581", "grpcOrdering": "http://localhost:5581",
"coupon": "http://localhost:55106" "coupon": "http://localhost:5106"
} }
} }

6
src/Services/Ordering/Ordering.API/Application/Queries/OrderQueries.cs
View File

@ -20,9 +20,9 @@ public class OrderQueries
@"select o.[Id] as ordernumber,o.OrderDate as date, o.Description as description, @"select o.[Id] as ordernumber,o.OrderDate as date, o.Description as description,
o.Address_City as city, o.Address_Country as country, o.Address_State as state, o.Address_Street as street, o.Address_ZipCode as zipcode, o.Address_City as city, o.Address_Country as country, o.Address_State as state, o.Address_Street as street, o.Address_ZipCode as zipcode,
os.Name as status, os.Name as status,
oi.ProductName as productname, oi.Units as units, oi.UnitPrice as unitprice, oi.PictureUrl as pictureurl oi.ProductName as productname, oi.Units as units, oi.UnitPrice as unitprice, oi.PictureUrl as pictureurl,
o.DiscountCode as coupon o.DiscountCode as coupon,
o.Discount as discount, o.Discount as discount
FROM ordering.Orders o FROM ordering.Orders o
LEFT JOIN ordering.Orderitems oi ON o.Id = oi.orderid LEFT JOIN ordering.Orderitems oi ON o.Id = oi.orderid
LEFT JOIN ordering.orderstatus os on o.OrderStatusId = os.Id LEFT JOIN ordering.orderstatus os on o.OrderStatusId = os.Id

4
src/docker-compose.override.yml
View File

@ -189,7 +189,7 @@ services:
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
- UseLoadTest=${USE_LOADTEST:-False} - UseLoadTest=${USE_LOADTEST:-False}
- PORT=80 - PORT=80
- PATH_BASE=/catalog-api - PATH_BASE=/coupon-api
- ConnectionString=mongodb://nosqldata:27017 - ConnectionString=mongodb://nosqldata:27017
ports: ports:
- "5106:80" - "5106:80"
@ -222,6 +222,7 @@ services:
- urls__grpcOrdering=http://ordering-api:81 - urls__grpcOrdering=http://ordering-api:81
- CatalogUrlHC=http://catalog-api/hc - CatalogUrlHC=http://catalog-api/hc
- OrderingUrlHC=http://ordering-api/hc - OrderingUrlHC=http://ordering-api/hc
- CouponUrlHC=http://coupon-api/hc
- IdentityUrlHC=http://identity-api/hc - IdentityUrlHC=http://identity-api/hc
- BasketUrlHC=http://basket-api/hc - BasketUrlHC=http://basket-api/hc
- PaymentUrlHC=http://payment-api/hc - PaymentUrlHC=http://payment-api/hc
@ -242,6 +243,7 @@ services:
- urls__grpcOrdering=http://ordering-api:81 - urls__grpcOrdering=http://ordering-api:81
- CatalogUrlHC=http://catalog-api/hc - CatalogUrlHC=http://catalog-api/hc
- OrderingUrlHC=http://ordering-api/hc - OrderingUrlHC=http://ordering-api/hc
- CouponUrlHC=http://coupon-api/hc
- IdentityUrlHC=http://identity-api/hc - IdentityUrlHC=http://identity-api/hc
- BasketUrlHC=http://basket-api/hc - BasketUrlHC=http://basket-api/hc
- PaymentUrlHC=http://payment-api/hc - PaymentUrlHC=http://payment-api/hc

2
src/docker-compose.prod.yml
View File

@ -119,6 +119,7 @@ services:
- IdentityUrlHC=http://identity-api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser. - IdentityUrlHC=http://identity-api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
- BasketUrlHC=http://basket-api/hc - BasketUrlHC=http://basket-api/hc
- PaymentUrlHC=http://payment-api/hc - PaymentUrlHC=http://payment-api/hc
- CouponUrlHC=http://coupon-api/hc
- UseCustomizationData=True - UseCustomizationData=True
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE} - OrchestratorType=${ORCHESTRATOR_TYPE}
@ -136,6 +137,7 @@ services:
- IdentityUrlHC=http://identity-api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser. - IdentityUrlHC=http://identity-api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
- BasketUrlHC=http://basket-api/hc - BasketUrlHC=http://basket-api/hc
- PaymentUrlHC=http://payment-api/hc - PaymentUrlHC=http://payment-api/hc
- CouponUrlHC=http://coupon-api/hc
- UseCustomizationData=True - UseCustomizationData=True
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE} - OrchestratorType=${ORCHESTRATOR_TYPE}