59 Commits

Author SHA1 Message Date
Sumit Ghosh
630cb35cfb
Updates to .NET 6.0 (#1786)
* Seeking feedback: Build and run on .Net 6 preview 6 (#1734)

* Updgrade build and hosting machines to .net6 latest

* Target .net 6

* ILogger is ambiguous?

* More ILogger ambiguity

* Use preview 6... seeing errors in preview 7...

* Of course the SDK version is different :)

* downgrade the last nonworking component

* Only restore the packages we need for the one off service stuck in .net 5

* Downgrade development docker files to use the preview 6 sdk

* Updates `basket-api` to .NET 6 (#1742)

* Use global usings

* Use file-scoped namespaces

* Updates docker images to preview 7

* Created a new migration plan

* Included global usings for identity project

* Updated docker file to preview version to 7

* Updated dockerfiles

* Merged conent from Startup.cs to Program.cs

* Removed Starup.cs

* Removed unnecessary files

* Revert "Removed unnecessary files"

This reverts commit 536bddcd96b54673401cedbe802520dce12b3472.

* Revert "Removed Starup.cs"

This reverts commit 46175d7aa97475d88ec46bce39ed498c7037d924.

* Revert "Merged conent from Startup.cs to Program.cs"

This reverts commit 2766ea86dfef9220fe3f0c27a37a9a6c18153078.

* Removed extra spaces

* Updated basket-api project file

* Update src/Services/Basket/Basket.API/Grpc/BasketService.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Moved the fully qualified namespace on top

* Updated relevant packages in basket.api project

* Updated relevant packages in identity.api project

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates all the services to .NET 6.0 (#1770)

* Created global using file for catalog.api

* Moved individual usings statements to globalusing

* Updated catalog.api project

* Fixed local run bug for catalog.api

* Included globalusing for payment.api

* Refactored namespace statement for payment.api

* Moved namespaces to ordering.domain project

* Included globalusing for ordering.domain project

* Included globalusings for ordering.infrastructure project

* Refactored namespaces for ordering.infrastructure project

* Updated relevant packages in ordering.infrastructure project

* Included globalusings for ordering.signalrHub project

* Moved all the namespace to globalusings

* Updated packages in ordering.signalrHub csproj file

* Refactored namespace statements in catalog.api project

* Fixed namespace name in ordering.domain

* Included global usings for ordering.api project

* Moved all usings to globalusing file

* Updated ordering.api csproj project

* Fixed bug in statup.cs

* Updated ordering.unittests.csproj file

* Included globalusings in webhooks.api project

* Moved using statements to globalusing file in webhooks.api

* Included globalusing for web.bff.shoppping aggregator project

* Moved namespaces to globalusing shopping aggregator

* Included globalusing mobile.bff.shoppping project

* Moved namespaces to globalusing file

* Included globalusing for eventbus project

* Moved namespaces to global usings for eventbus

* Included globalusing for EventBusRabbitMQ project

* Moved using statements to EventBusRabbitMQ project

* Included global using in EventBusServiceBus project

* Moved using statements to globalusing for EventBusServiceBus

* Included globalusing file for IntegrationEventLogEF project

* Move using statements to globalusing file

* Updated packages of IntegrationEventLogEF project

* Included globalusing to Devspaces.Support project

* Moved using statements to globalusing Devspaces

* Updated dependent packages for Devspaces.Support.csproj

* Fixed bug in Basket API

* Fixed bug in catalog.api

* Fixed bug Identity.API

* Included globalusing to Basket.UnitTest project

* Moved namespaces to Basket.UnitTest project

* Updated packages of Basket.UnitTest csproj

* Included globalusing for Basket.FunctionalTests project

* Included file-scoped namespaces Basket.FunctionalTests

* Updated packages of Basket.FunctionalTests.csproj file

* Updated catalog unit test project to Net 6.0

* Included global usings for Catalog.FunctionalTests

* Included file-scope namespace catalog.functionaltests

* Updated packages of catalog.functionaltest csproj

* Included MigrateDbContext method in HostExtensions

* Included globalusing for ordering.UnitTests project

* Included file-scope statement for Ordering.UnitTest project

* Included globalusing for Ordering.FunctionalTests

* Included file-scope namespace statement for using

* Updated packages in  Ordering.FunctionalTests.csproj

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.API/Startup.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.Domain/Events/OrderStatusChangedToPaidDomainEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates WebMVC to .NET 6.0 (#1773)

* Included globalusing WebMVC

* Included file scope namespaces for all files

* Updated dockerfile

* Updated packages to WebMVC

* Fixes few bugs in Net 6.0 service migration (#1774)

* Created global using file for catalog.api

* Moved individual usings statements to globalusing

* Updated catalog.api project

* Fixed local run bug for catalog.api

* Included globalusing for payment.api

* Refactored namespace statement for payment.api

* Moved namespaces to ordering.domain project

* Included globalusing for ordering.domain project

* Included globalusings for ordering.infrastructure project

* Refactored namespaces for ordering.infrastructure project

* Updated relevant packages in ordering.infrastructure project

* Included globalusings for ordering.signalrHub project

* Moved all the namespace to globalusings

* Updated packages in ordering.signalrHub csproj file

* Refactored namespace statements in catalog.api project

* Fixed namespace name in ordering.domain

* Included global usings for ordering.api project

* Moved all usings to globalusing file

* Updated ordering.api csproj project

* Fixed bug in statup.cs

* Updated ordering.unittests.csproj file

* Included globalusings in webhooks.api project

* Moved using statements to globalusing file in webhooks.api

* Included globalusing for web.bff.shoppping aggregator project

* Moved namespaces to globalusing shopping aggregator

* Included globalusing mobile.bff.shoppping project

* Moved namespaces to globalusing file

* Included globalusing for eventbus project

* Moved namespaces to global usings for eventbus

* Included globalusing for EventBusRabbitMQ project

* Moved using statements to EventBusRabbitMQ project

* Included global using in EventBusServiceBus project

* Moved using statements to globalusing for EventBusServiceBus

* Included globalusing file for IntegrationEventLogEF project

* Move using statements to globalusing file

* Updated packages of IntegrationEventLogEF project

* Included globalusing to Devspaces.Support project

* Moved using statements to globalusing Devspaces

* Updated dependent packages for Devspaces.Support.csproj

* Fixed bug in Basket API

* Fixed bug in catalog.api

* Fixed bug Identity.API

* Included globalusing to Basket.UnitTest project

* Moved namespaces to Basket.UnitTest project

* Updated packages of Basket.UnitTest csproj

* Included globalusing for Basket.FunctionalTests project

* Included file-scoped namespaces Basket.FunctionalTests

* Updated packages of Basket.FunctionalTests.csproj file

* Updated catalog unit test project to Net 6.0

* Included global usings for Catalog.FunctionalTests

* Included file-scope namespace catalog.functionaltests

* Updated packages of catalog.functionaltest csproj

* Included MigrateDbContext method in HostExtensions

* Included globalusing for ordering.UnitTests project

* Included file-scope statement for Ordering.UnitTest project

* Included globalusing for Ordering.FunctionalTests

* Included file-scope namespace statement for using

* Updated packages in  Ordering.FunctionalTests.csproj

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.API/Startup.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.Domain/Events/OrderStatusChangedToPaidDomainEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Fixed bugs in Mobile.BFF.Shopping project

* Fixed bugs in Web.Bff.Shopping aggregator project

* Fixed bugs in EventBusServiceBus project

* Fixed bug in Mobile.Bff.Shopping project

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates webhook client project to .NET 6.0 (#1777)

* Included globalusing file for webhookclient

* Included file scope namespaces for Webhookclient

* Updated packages in WebHookClient project

* Updates webspa project to Net 6.0 (#1778)

* Included globalusing in webspa project

* Included file scoped namespace for webspa project

* Updated packages in WebSPA project

* Updates the Application.FunctionalTests project to .NET 6.0 (#1781)

* Included globalusing in Application.FunctionalTests project

* Included file scoped namespace

* Renamed Azure.Messaging.ServiceBus namespace

* Updates .NET version of Dockerfile to 6.0 (#1785)

* Updatated package versions to RC2

* Updated package versions to RC2

* Updated Dockerfiles to .NET 6 RC2

* Changed docker file tag to 6.0

* Updated Program class

* Updated globalusing file

* Removed preview tag reference from Dockerfile.develop file

* Updated dotnet version to .NET 6.0

* Updated all packages to the .NET 6.0

* Removed RC tag from dockerfile

* Fixed bundleconfig json

* Updated readme files

* Fixed ingress yaml indentation

* Included globalusing for WebStatus project

* Updated WebStatus project to .NET 6.0

* Included scoped namespace

* Updated Dockerfile of WebStatus to .NET 6.0

Co-authored-by: Josh Coleman <83677148+JcolemanNR@users.noreply.github.com>
Co-authored-by: David Pine <david.pine@microsoft.com>
2021-11-15 19:02:23 +05:30
Borja García Rodríguez
2b91170662 clean up solution 2021-01-20 17:57:32 +01:00
Miguel Veloso
759624fa24
Merge pull request #934 from mohsenalikhani/patch-1
OrderController Recommendation
2019-04-01 16:58:41 +01:00
Miguel Veloso
76e1072d07 Add logging of subscription events 2019-03-04 19:08:14 +00:00
Miguel Veloso
ad7b33234f Add log traces for commands 2019-02-21 15:56:15 +00:00
Mohsen Alikhani
76118776c4
OrderController Recommendation
It's good idea to take advantage of GetOrderByIdQuery and handle by GetCustomerByIdQueryHandler
2019-02-06 20:08:22 +03:30
Erik Pique
b8969e6746 standar names and fixed response for swagger apis 2018-11-15 12:50:37 +01:00
Erik Pique
deb3d38ebe add features api 2018-11-14 16:21:50 +01:00
eiximenis
89fb5d6fc3 Solves issue #611 2018-05-22 16:20:52 +02:00
Unai Zorrilla Castro
36fb20acea Refactoring Catalog and Order status and add problem details feature from 2.1 2018-05-15 16:58:53 +02:00
Eduard Tomàs
b0d4ae5a72 All order flow goes through Purchase BFF API. Also some refactorings. 2018-02-02 12:26:47 +01:00
Ramón Tomás
4dff728d11 Replaced custom DataProtection.Redis lib with official Microsoft pkg
Removed Sessions in WebMVC app
Fixed GracePeriodMgr issues using multiple instances
2017-11-30 11:40:30 +01:00
Igor Sychev
5e13467315 no more dynamics as a return types from controllers 2017-10-28 09:29:42 +03:00
Igor Sychev
9e535930ce swagge responce types and code https://github.com/dotnet-architecture/eShopOnContainers/issues/305 2017-10-12 08:45:33 +01:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
igorsych
4790981e80 swagger/ui to swagger url fix 2017-05-23 16:39:22 +03:00
igorsych
9e75504690 Newtonsoft.Json and MediatR with fixes of all based on MediatR classes
also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.
2017-05-19 18:03:05 +03:00
Ramón Tomás
f79806e899 Created Ship order process in WebMVC app
Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app
2017-05-14 14:48:37 +02:00
Ramón Tomás
21fe9b7be4 Create checkout call in webmvc
Created Cancel call in webmvc
2017-05-11 11:51:13 +02:00
Cesar De la Torre
3e5d38dae1 Merge pull request #181 from BillWagner/use-IEnumerable-dynamic
Use IEnumerable<dynamic> instead of dynamic for collections
2017-05-05 15:53:44 -07:00
Cesar De la Torre
c247261929 Minor refactoring for the CreateOrder Web API method and the Entity base class 2017-05-04 12:29:00 -07:00
BillWagner
223dcda0cb add back the async state machine
Because of the using blocks, these one line methods need the async
modifier so that the that async state machiner is created. Otherwise, if
the method does not complete synchronously, the connection is closed
before the database has returned its results.
2017-05-04 10:36:23 -04:00
Cesar De la Torre
b1c0c72ec7 CreateOrder refactored so return code lines are more compact 2017-05-03 18:36:52 -07:00
Unai Zorrilla Castro
4ef6b63913 Review on 17/04/2017 2017-04-17 12:28:12 +02:00
dsanz
d35cefb887 Fix merge issue. 2017-03-15 15:04:13 +01:00
Ramón Tomás
1e47a3378f Merge domain events to DEV 2017-03-14 19:04:59 +01:00
Ramón Tomás
c8f0776f1f Added domain events in Ordering Api 2017-03-14 18:02:28 +01:00
DESKTOP-V1VLQ15\dsanz
f6b2335518 Fix issue with tests and Authorize attribute 2017-03-14 14:15:34 +01:00
etomas
783f115b3e Temporary fix for older clients 2017-03-03 12:10:30 +01:00
etomas
f9b15481d1 Idempotent updates based on requestid 2017-03-03 12:03:31 +01:00
etomas
67ab1159df Immutable commands - wip 2017-02-27 17:52:14 +01:00
etomas
e66b6a2402 ArgumentNullException handling using throw expressions
Solves #64
2017-02-27 10:35:31 +01:00
CESARDL
46534d5688 Minor refactoring 2017-02-13 14:03:21 -08:00
unai
e991060a51 Set adddress as value object with workaround about Id and Hashkey 2017-02-08 19:26:05 +01:00
CESARDL
8325ddbd30 Refactored: From Buyer.FullName to Buyer.IdentityGuid.
Also similar changes at the CreateOrderCommand
Plus an update to the README.md for GitHub
2017-02-07 23:03:35 -08:00
Unai Zorrilla Castro
607d1ca2fa Fix query with new model. Add missing properties into migration. Work on github issues 2017-01-27 11:38:23 +01:00
Unai Zorrilla Castro
9d2d152c2d Improve ordering int order to solve feedback 2017-01-25 17:10:08 +01:00
CESARDELATORRE
2babf6e4fe Added field "Alias" to PaymentMethod and created EF migration for that
Refactoring related to OrderCommand (instead NewOrderCommand)
Refactoring in Buyer.IdentityGuid instead of fullname variables..
2017-01-18 16:51:44 -08:00
Unai Zorrilla Castro
3c277a49de Modify AsyncRequestNames, include UnitTest project, remove unused application ordering layer 2016-12-29 11:04:55 +01:00
Carlos Cañizares Estévez
ac146f4475 Added Unit Test Project for services 2016-12-22 13:20:12 +01:00
Carlos Cañizares Estévez
d8a0d9bb66 BasketApi: Add authorizationHeader (pass bearer from Swagger Ui to authorize request...).
MVC: Solve some design feedback (filter selector in catalog)

CatalogApi: Move models from infrastructure to Model folder.
2016-12-21 11:30:11 +01:00
Carlos Cañizares Estévez
e4d3c66d27 Logout fix for Xamarin in identity 2016-12-19 17:55:48 +01:00
Carlos Cañizares Estévez
10f3e17b55 Add Swagger to Basket Api
SQL databases with the same prefix for services
Move application tier to api tier in ordering api
2016-12-19 10:20:02 +01:00
Carlos Cañizares Estévez
31753fc057 MVC: Finish Orders integration (detail), validations, some refactor ...
Orders: Detail Query, new field in OrderDetail..
Identity: Validations in Register View, ensure all claims are returned in user end point..
2016-12-17 14:41:16 +01:00
Carlos Cañizares Estévez
9e72fe7c7c Order items in ordering api 2016-12-14 18:23:57 +01:00
Carlos Cañizares Estévez
64d3919a80 Secure orders api and add bearer token in calls from MVC application to orders api. 2016-12-12 10:15:24 +01:00
Carlos Cañizares Estévez
3f21d9c357 merge dev into Dev 2016-12-09 10:23:17 +01:00
unai
cbd5682ea0 minor refactoring on reviews 2016-12-07 18:59:41 +01:00
Carlos Cañizares Estévez
42f3537441 scripts to build individual services, readme files for all services and clients, compose in all projects, fix build problems (Dependent seeds), solve some kwnon build problems in solution (identity on localhost, ...) 2016-12-07 13:57:31 +01:00
Unai
d25f1c64a9 Finished first iteration over ordering.data 2016-11-24 14:58:37 +01:00