Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

updated CardType and Enumeration classes #1528

Merged
merged 3 commits into from
Apr 8, 2021
Merged

updated CardType and Enumeration classes #1528

merged 3 commits into from
Apr 8, 2021

Conversation

mfcallahan
Copy link
Contributor

@mfcallahan mfcallahan commented Nov 25, 2020 •
edited

PR for issue #1527

Updating the Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork.Enumeration class the and Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.CardType class to use modern C# features:

  • use nameof expression
  • use pattern matching
  • use expression bodied members consistently

A corresponding pull request for the Microsoft documentation is also pending; changes here are per suggestion by @sughosneo.

@mfcallahan mfcallahan mentioned this pull request Nov 25, 2020
Merged
@sughosneo
Copy link
Contributor

Hi @mfcallahan , thank you for submitting this PR. Will test and update.

@sughosneo
Copy link
Contributor

Hi @mfcallahan , thank you for submitting this PR. Will test and update.

Hi @mfcallahan , if you could update the PR with the changes suggested by @IEvangelist

Thanks.

IEvangelist
IEvangelist reviewed Dec 16, 2020
View reviewed changes
Copy link
Contributor

@IEvangelist IEvangelist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like these were lost somehow, adding them again here.

src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs Outdated Show resolved Hide resolved
src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs Outdated Show resolved Hide resolved
@sughosneo
Copy link
Contributor

Looks like these were lost somehow, adding them again here.

Thank you @IEvangelist

@IEvangelist
Copy link
Contributor

IEvangelist commented Dec 18, 2020 •
edited

Hi @mfcallahan - I noticed that you manually pushed the suggested changes, so I'm not sure if you were aware of this or not. But you could actually accept suggested changes from GitHub - and you could "batch" suggestions and commit them all at once. This is the preferred way as it adds the reviewer who made the suggestion a co-author in the commit history, and removes the unnecessary manual effort of revolving review comments.

For details on this feature, please see Incorporating feedback into your pull request.

@mfcallahan
Copy link
Contributor Author

Thanks for the feedback @IEvangelist, how would you like me to proceed with this PR? I can revert the manual changes and use the "Commit suggestion" option if that is preferred.

@IEvangelist
Copy link
Contributor

Thanks for the feedback @IEvangelist David Pine FTE, how would you like me to proceed with this PR? I can revert the manual changes and use the "Commit suggestion" option if that is preferred.

No, not a big deal. I was simply trying to let you know about this feature, to make things easier for future PRs.

@sughosneo sughosneo added the .NET 5.0 .NET 5.0 label Dec 21, 2020
@sughosneo sughosneo added the blocked Merging is blocked for some reason. label Jan 5, 2021
@sughosneo sughosneo removed the blocked Merging is blocked for some reason. label Mar 2, 2021
@IEvangelist
Update src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs
e817b95 
Co-authored-by: David Pine <david.pine@microsoft.com>
@sughosneo sughosneo linked an issue Apr 8, 2021 that may be closed by this pull request
Update Enumeration and CardType class #1527
Closed
sughosneo
sughosneo approved these changes Apr 8, 2021
View reviewed changes
Copy link
Contributor

@sughosneo sughosneo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested the changes after merging it locally with dev. LGTM!

@sughosneo sughosneo merged commit a71b004 into dotnet-architecture:dev Apr 8, 2021
rulyotano added a commit to rulyotano/eShopOnContainers that referenced this pull request Apr 9, 2021
@rulyotano @dsrodenas
@mvelosop @borjasanes @vishipayyallore @InstanceFactory @hetal-kapadia @william-keller @dependabot @nishanil @Sreenivas-Kalluru @alecola @Marusyk @f1nzer @n-stefan @mfcallahan @IEvangelist
Merge from the original repo (#1)
a6413a9 
* Fix ordering test settings

* catch error with interceptor

* interceptor in mobile bff

* top level statements

* Prepare to update ng version

* Update TS version

* Update peerDependencies

* Renew packageLock

* Upgrade to ng version 9

* Add record types for DTOs. Update ordering DockerFiles to dotnet 5.0 base images.

* Fixed call  error when filter item is applied

* Upgrade node version 10.3 to docker

* fix namespace top level statement

* net5

* record types

* customer basket items setteable

* Fix MarketingUrl Port on AppSettings

* Update nuget packages for Ordering service.

* Fix CampaignDetailFunctionEnabled required when conf isReady

* Delete Package lock to update ng version

* new PackageLock to update to ng version10

* new PackageLock to update to ng version10

* Change Grpc client creation from a per request approach to a client factory one.

* migrate catalog api

* Updated to ng version10

* Upgrade to 12 node version

* grpc improvements

* Top-level statements. Change ordering net standard projects to dotnet 5.

* Update logging nuge package dependency.

* update net 5

* net 5 webapps

* update nuget packages

* Migrate Payment.API to dotnet 5

* dockerfiles and update nugets

* fix docker file image

* update nugets

* fix functional tests

* remove marketing and locations

* update mvc references

* update dockerfiles without location & api csprojs

* remove campaings from SPA

* remove helm deploy marketing locations and builds

* delete marketing and locations references

* WIP

* apigws workflow

* paths filter

* fix workflow filter path

* event name

* copy with ps

* test basket api workflow

* remove uses

* fix path filter

* add test branch

* test registry

* test login with cmd

* test cmd

* test docker login

* test echo

* echo username

* test login

* revert login

* test login registry endpoint hub.docker.com

* Test login without registry variable

* Test login registry empty

* Fix varible usage in bash

* upgrade nuget packages

* Fix docker-compose build args

* Fix docker-compose push args order

* Add checkout

* consolidate packages

* Fix variables

* Add login before build

* Fix indentation.

* Linux version

* fix Breaking change net 5 missing method
app.UseDatabaseErrorPage()
dotnet/efcore#22687

* Add docker-machine env eval

* integration events updated to record types

* remove old grpc caller

* Docker-machine env dev

* sudo

* Remove repeated step.

* Swamy/remove unused using and refactor the code (dotnet-architecture#1555)

* Removed Unused Using and Reorganized the Using

* Removed unused using, Reorganized using, moved the class to separate file, removed commented code in Catalog.API

* Revert "Removed unused using, Reorganized using, moved the class to separate file, removed commented code in Catalog.API"

This reverts commit 34241c4.

* Removed unused using and reorganized the using inside "Services" folder

* Removed Unused using and reoganized the using

* Refactor Webhooks.API

* Removed unused using and reorganized using inside Catalog.API

* Refactoring

* Removed unsed using

* Added line break just to differentiate between the messages

* Removed unused usings

* Simple Refactoring

* Get git branch name

* Fix get branch step

* Uncomment steps

* add registry

* Fix login

* fix cookie policy

* update nuget in catalog unit tests

* TAG REGISTRY

* Fixed Issue dotnet-architecture#1410 (dotnet-architecture#1560)

Added IdentityUrlExternal to src\Services\Ordering\Ordering.FunctionalTests\appsettings.json; sorted the properties

* remove mobile project

* Update env variables.

* export variable

* Test variable asignation

* Fix export commnad

* Fix exporting variables when sudo is used

* Remove comments

* Enable push image

* Fix docker-file path for push step.

* Add TAG variable to push step.

* Update registry path

* Change docker login step.

* remove load test references

* Try sudo docker login in push step.

* Update registry value.

* Change login method

* Refactor yaml

* Remove debug traces

* test docker hub host

* modify registry host url

* host url

* test docker io

* build on pr

* test windows build

* test login windows

* test branch name windows

* test windows

* test replace branch name pwsh

* test

* replace feature

* working dir and build order cmd

* work dir path

* work dir

* checkout windows

* test multiarch step

* test docker config env

* multiarch

* test WIP

* WIP

* test

* test sudo

* test docker dir

* test

* WIP

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test cp

* test

* test

* test

* test

* final

* test

* test

* test

* final version

* final basket workflow

* final version

* fix secret ref

* basket catalog identity ordering workflows

* added github workflows

* remove azure pipelines

* test builds on branch

* Small Refactoring (dotnet-architecture#1558)

* final workflows

* Updated to aspnet 5 dockerfiles.development for azds

* fix restores on docker.develop images

* revert host setting

* missing identityurlexternal in helm config

* Small-Formatting-Refactoring (dotnet-architecture#1564)

* Swamy/01jan2021-small-refactoring (dotnet-architecture#1570)

* Update Startup.cs

* Removed commented code

* Update UrlsConfig.cs

* Small Refactoring

* Removed Commented Code

* Small Refactoring

* remove windows build

* remove trigger on working branch

* Removes dotnet.myget.org NuGetPackage feed references (dotnet-architecture#1576)

* Removed Nuget package feed

* Removed unused System.ValueTuple package

* Downloadgraded Microsoft.AspNetCore.Hosting.Abstractions package

* Removed unused package

* Downgraded System.IO.Compression.ZipFile package

* Used Microsoft.AspNetCore.DataProtection.StackExchangeRedis package

* Upgrade key packages

* Upgrade healthchecks packages

* readme actions

* Upgrade identity server, fix VS F5 unauthorized_client problem

* Swamy/04 jan2021-small-refactoring (dotnet-architecture#1571)

* Small Refactoring inside IntegrationEventLogEF

* Small Refactoring inside BuildingBlocks folder

* Fixes dotnet-architecture#1581: Fixed total decimal place issue and User hover menu display/usability issue. (dotnet-architecture#1582)

* Swamy/15jan2021 small refactoring (dotnet-architecture#1580)

* Small Refactoring inside Basket Service folder

* Small Refactoring

* Incorrect ContentPage.ToolbarItems in a TabbedPage (dotnet-architecture#1348)

Incorrect ContentPage.ToolbarItems in a TabbedPage

* use identity internal network

* fix identity url in current helm version

* revert archived

* clean up solution

* Add community code changes since migration start

* Remove "obsolete" folder

* Remove main branch from action triggers

* fix envoy config in helm

* update helm chart to use sqlserver 2019

* rerun GitHub Actions

* program to top level statement

* path filter on pr SPA

* added path filter on pr

* test path filter on spa

* formatting

* Bump socket.io from 2.3.0 to 2.4.1 in /src/Web/WebSPA (dotnet-architecture#1588)

Bumps [socket.io](https://github.com/socketio/socket.io) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.4.1/CHANGELOG.md)
- [Commits](socketio/socket.io@2.3.0...2.4.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* include subfolders in filtering path

* Updated npm packages. (dotnet-architecture#1594)

* Fixes : dotnet-architecture#1599 | Applies patch to dotnet/sdk buster-slim docker image (dotnet-architecture#1601)

* Included docker file patch

* Used specific npm 6 package version

* Updated readme files (dotnet-architecture#1589)

* Updated readme files

* Updated eShop architecture diagram

* Update README.md

* marked package updated to latest ver 2.0 (dotnet-architecture#1605)

* Feature/add mobile readme (dotnet-architecture#1606)

* Readme file added for mobile client

* readme file added for mobile client

* Update src/Mobile/README.md

Co-authored-by: Sumit Ghosh <sumit.ghosh@neudesic.com>

* eshopOnContainers Architecture document updated

Co-authored-by: Sumit Ghosh <sumit.ghosh@neudesic.com>

* GracePeriodManagerTask renamed in GracePeriodManagerService (dotnet-architecture#1615)

* Service Bus persisted connection for ISubscriptionClient (dotnet-architecture#1521)

* Fix ordering-signalrhub workflow badge image (dotnet-architecture#1624)

* Bump elliptic from 6.5.3 to 6.5.4 in /src/Web/WebSPA (dotnet-architecture#1623)

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix WebSPA pager display (dotnet-architecture#1629)

* updated package version for ssri and is-svg (dotnet-architecture#1636)

* Fix WebSPA catalog filter (dotnet-architecture#1637)

* updated CardType and Enumeration classes (dotnet-architecture#1528)

* updated CardType and Enumeration classes

* Update per IEvangelist's suggestion

* Update src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs

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

Co-authored-by: Sumit Ghosh <sumit.ghosh@neudesic.com>
Co-authored-by: David Pine <david.pine@microsoft.com>

Co-authored-by: David Sanz <dsanz@plainconcepts.com>
Co-authored-by: Borja García Rodríguez <bgarcia@plainconcepts.com>
Co-authored-by: Carlos de Miguel Ferrero <cmiguel@plainconcepts.com>
Co-authored-by: Miguel Veloso <mvelosop@gmail.com>
Co-authored-by: Borja García <borjasanes@hotmail.com>
Co-authored-by: Viswanatha Swamy <vishipayyallore@yahoo.com>
Co-authored-by: InstanceFactory <InstanceFactory@users.noreply.github.com>
Co-authored-by: Sumit Ghosh <sumit.ghosh@neudesic.com>
Co-authored-by: Hetal Kapadia <31979831+hetal-kapadia@users.noreply.github.com>
Co-authored-by: william-keller <kellerwilliam2011@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nish Anil <nish@microsoft.com>
Co-authored-by: Sreenivasulu Kalluru <69580789+Sreenivas-Kalluru@users.noreply.github.com>
Co-authored-by: alecola <alessandrocolamarino@gmail.com>
Co-authored-by: Roman Marusyk <Marusyk@users.noreply.github.com>
Co-authored-by: Konstantin Chuvilyov <f1nzer@outlook.com>
Co-authored-by: n-stefan <38526229+n-stefan@users.noreply.github.com>
Co-authored-by: Matt Callahan <matthew.callahan@outlook.com>
Co-authored-by: David Pine <david.pine@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@IEvangelist IEvangelist IEvangelist left review comments

@sughosneo sughosneo sughosneo approved these changes

@AndriiPavliuk AndriiPavliuk AndriiPavliuk approved these changes

Assignees
No one assigned
Labels
.NET 5.0 .NET 5.0 Refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update Enumeration and CardType class
4 participants
@mfcallahan @sughosneo @IEvangelist @AndriiPavliuk