diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 77aa861..a6d074a 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -44,7 +44,7 @@ jobs: -reports:./coverage_data/*/coverage.cobertura.xml \ -targetdir:coverage_report \ -reporttypes:"Html;MarkdownSummaryGithub" \ - -assemblyfilters:-DannyGoodacre.Tests.Core + -assemblyfilters:"-DannyGoodacre.Testing;-DannyGoodacre.Cqrs.Testing" - name: Add Artifact Link to Summary File run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0df27e6..7693400 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,11 +21,19 @@ jobs: - name: Pack run: | - dotnet pack src/DannyGoodacre.Core/DannyGoodacre.Core.csproj \ + dotnet pack src/DannyGoodacre.Primitives/DannyGoodacre.Primitives.csproj \ --configuration Release \ --output ${{ github.workspace }}/nupkg - dotnet pack src/DannyGoodacre.Testing.Core/DannyGoodacre.Testing.Core.csproj \ + dotnet pack src/DannyGoodacre.Cqrs/DannyGoodacre.Cqrs.csproj \ + --configuration Release \ + --output ${{ github.workspace }}/nupkg + + dotnet pack src/DannyGoodacre.Testing/DannyGoodacre.Testing.csproj \ + --configuration Release \ + --output ${{ github.workspace }}/nupkg + + dotnet pack src/DannyGoodacre.Cqrs.Testing/DannyGoodacre.Cqrs.Testing.csproj \ --configuration Release \ --output ${{ github.workspace }}/nupkg diff --git a/DannyGoodacre.Core.sln b/DannyGoodacre.Core.sln deleted file mode 100644 index f88b767..0000000 --- a/DannyGoodacre.Core.sln +++ /dev/null @@ -1,37 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2EF13EA6-1CE3-43AA-A1D1-33BC3A4836B0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{43EBC69F-DAD1-455C-B636-CD7C837F5F66}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DannyGoodacre.Core", "src\DannyGoodacre.Core\DannyGoodacre.Core.csproj", "{F59872B5-4009-489C-AC5D-68CA5740851C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DannyGoodacre.Core.Tests", "tests\DannyGoodacre.Core.Tests\DannyGoodacre.Core.Tests.csproj", "{1DA2DDCD-3239-4FCE-B590-89D2F068E3B4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DannyGoodacre.Testing.Core", "src\DannyGoodacre.Testing.Core\DannyGoodacre.Testing.Core.csproj", "{798665CA-C5A6-48DD-9A2D-6A28918993B6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F59872B5-4009-489C-AC5D-68CA5740851C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F59872B5-4009-489C-AC5D-68CA5740851C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F59872B5-4009-489C-AC5D-68CA5740851C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F59872B5-4009-489C-AC5D-68CA5740851C}.Release|Any CPU.Build.0 = Release|Any CPU - {1DA2DDCD-3239-4FCE-B590-89D2F068E3B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DA2DDCD-3239-4FCE-B590-89D2F068E3B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DA2DDCD-3239-4FCE-B590-89D2F068E3B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DA2DDCD-3239-4FCE-B590-89D2F068E3B4}.Release|Any CPU.Build.0 = Release|Any CPU - {798665CA-C5A6-48DD-9A2D-6A28918993B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {798665CA-C5A6-48DD-9A2D-6A28918993B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {798665CA-C5A6-48DD-9A2D-6A28918993B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {798665CA-C5A6-48DD-9A2D-6A28918993B6}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {F59872B5-4009-489C-AC5D-68CA5740851C} = {2EF13EA6-1CE3-43AA-A1D1-33BC3A4836B0} - {1DA2DDCD-3239-4FCE-B590-89D2F068E3B4} = {43EBC69F-DAD1-455C-B636-CD7C837F5F66} - {798665CA-C5A6-48DD-9A2D-6A28918993B6} = {2EF13EA6-1CE3-43AA-A1D1-33BC3A4836B0} - EndGlobalSection -EndGlobal diff --git a/DannyGoodacre.Core.slnx b/DannyGoodacre.Core.slnx new file mode 100644 index 0000000..b905ab3 --- /dev/null +++ b/DannyGoodacre.Core.slnx @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/LICENSE b/LICENSE index edb4988..0a04128 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,165 @@ -GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - - Preamble - -The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - -A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - -The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - -An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - -The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - -0. Definitions. - -"This License" refers to version 3 of the GNU Affero General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based -on the Program. - -To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -1. Source Code. - -The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - -A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - -The Corresponding Source for a work in source code form is that -same work. - -2. Basic Permissions. - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - -4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. - -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - -a) The work must carry prominent notices stating that you modified -it, and giving a relevant date. - -b) The work must carry prominent notices stating that it is -released under this License and any conditions added under section -7. This requirement modifies the requirement in section 4 to -"keep intact all notices". - -c) You must license the entire work, as a whole, under this -License to anyone who comes into possession of a copy. This -License will therefore apply, along with any applicable section 7 -additional terms, to the whole of the work, and all its parts, -regardless of how they are packaged. This License gives no -permission to license the work in any other way, but it does not -invalidate such permission if you have separately received it. - -d) If the work has interactive user interfaces, each must display -Appropriate Legal Notices; however, if the Program has interactive -interfaces that do not display Appropriate Legal Notices, your -work need not make them do so. - -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - -6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - -a) Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by the -Corresponding Source fixed on a durable physical medium -customarily used for software interchange. - -b) Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by a -written offer, valid for at least three years and valid for as -long as you offer spare parts or customer support for that product -model, to give anyone who possesses the object code either (1) a -copy of the Corresponding Source for all the software in the -product that is covered by this License, on a durable physical -medium customarily used for software interchange, for a price no -more than your reasonable cost of physically performing this -conveying of source, or (2) access to copy the -Corresponding Source from a network server at no charge. - -c) Convey individual copies of the object code with a copy of the -written offer to provide the Corresponding Source. This -alternative is allowed only occasionally and noncommercially, and -only if you received the object code with such an offer, in accord -with subsection 6b. - -d) Convey the object code by offering access from a designated -place (gratis or for a charge), and offer equivalent access to the -Corresponding Source in the same way through the same place at no -further charge. You need not require recipients to copy the -Corresponding Source along with the object code. If the place to -copy the object code is a network server, the Corresponding Source -may be on a different server (operated by you or a third party) -that supports equivalent copying facilities, provided you maintain -clear directions next to the object code saying where to find the -Corresponding Source. Regardless of what server hosts the -Corresponding Source, you remain obligated to ensure that it is -available for as long as needed to satisfy these requirements. - -e) Convey the object code using peer-to-peer transmission, provided -you inform other peers where the object code and Corresponding -Source of the work are being offered to the general public at no -charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - -7. Additional Terms. - -"Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the -terms of sections 15 and 16 of this License; or - -b) Requiring preservation of specified reasonable legal notices or -author attributions in that material or in the Appropriate Legal -Notices displayed by works containing it; or - -c) Prohibiting misrepresentation of the origin of that material, or -requiring that modified versions of such material be marked in -reasonable ways as different from the original version; or - -d) Limiting the use for publicity purposes of names of licensors or -authors of the material; or - -e) Declining to grant rights under trademark law for use of some -trade names, trademarks, or service marks; or - -f) Requiring indemnification of licensors and authors of that -material by anyone who conveys the material (or modified versions of -it) with contractual assumptions of liability to the recipient, for -any liability that these contractual assumptions directly impose on -those licensors and authors. - -All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - -8. Termination. - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - -11. Patents. - -A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - -A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - -13. Remote Network Interaction; Use with the GNU General Public License. - -Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - -14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - -15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published -by the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - -You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. \ No newline at end of file + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/README.md b/README.md index 14703fd..28fdc09 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,25 @@ # DannyGoodacre.Core +A collection of libraries used across my .NET projects. + +## DannyGoodacre.Cqrs + A lightweight framework implementing the [Command Query Separation](https://martinfowler.com/bliki/CommandQuerySeparation.html) pattern in .NET, providing a standardized way to handle application logic and maintain state integrity with a unified, result-oriented flow. See the [docs](./docs/) for a detailed guide to the various classes provided. +## DannyGoodacre.Primitives + +Result and Result\ classes for robust result handling and a validation state for standardized error responses. + +## DannyGoodacre.Testing + +A base class for testing using [NUnit](https://learn.microsoft.com/en-us/dotnet/core/testing/unit-testing-csharp-with-nunit) and [Moq](https://github.com/devlooped/moq), providing assertion methods tailored for `Result` types and an automated teardown mechanism invoking `VerifyAllAndNoOtherCalls` to ensure mock integrity. + +## DannyGoodacre.Cqrs.Testing + +Base classes for testing CQRS handlers defined using `DannyGoodacre.Cqrs`. + ## TL;DR ### The Result Pattern diff --git a/src/DannyGoodacre.Core/DannyGoodacre.Core.csproj b/src/DannyGoodacre.Core/DannyGoodacre.Core.csproj deleted file mode 100644 index e4cc6e5..0000000 --- a/src/DannyGoodacre.Core/DannyGoodacre.Core.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net10.0 - DannyGoodacre.Core - 0.5.0 - Danny Goodacre - A lightweight CQRS and clean architecture foundation library, including a result pattern and state management. - https://github.com/dannygoodacre/DannyGoodacre.Core - MIT - enable - enable - - - - - - - - - - - diff --git a/src/DannyGoodacre.Core/Extensions/ServiceCollectionExtensions.cs b/src/DannyGoodacre.Core/Extensions/ServiceCollectionExtensions.cs deleted file mode 100644 index b4afe34..0000000 --- a/src/DannyGoodacre.Core/Extensions/ServiceCollectionExtensions.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Reflection; -using DannyGoodacre.Core.Extensions; -using Microsoft.Extensions.DependencyInjection; - -// ReSharper disable once CheckNamespace -namespace DannyGoodacre.Core; - -public static class ServiceCollectionExtensions -{ - extension(IServiceCollection services) - { - public IServiceCollection AddCommandHandlers(params Assembly[] assemblies) - { - IEnumerable handlerTypes = assemblies - .SelectMany(x => x.GetTypes()) - .Where(x => x is { IsAbstract: false, IsClass: true } && x.IsCommandHandler()); - - foreach (Type handlerType in handlerTypes) - { - _ = services.AddScoped(handlerType); - - IEnumerable interfaces = handlerType.GetHandlerInterfaces(); - - foreach (Type serviceType in interfaces) - { - services.AddScoped(serviceType, handlerType); - } - } - - return services; - } - - public IServiceCollection AddQueryHandlers(params Assembly[] assemblies) - { - IEnumerable handlerTypes = assemblies - .SelectMany(x => x.GetTypes()) - .Where(x => x is { IsAbstract: false, IsClass: true } && x.IsQueryHandler()); - - foreach (Type handlerType in handlerTypes) - { - services.AddScoped(handlerType); - - IEnumerable interfaces = handlerType.GetHandlerInterfaces(); - - foreach (Type serviceType in interfaces) - { - services.AddScoped(serviceType, handlerType); - } - } - - return services; - } - } -} diff --git a/src/DannyGoodacre.Testing.Core/CommandHandlerTestBase.cs b/src/DannyGoodacre.Cqrs.Testing/CommandHandlerTestBase.cs similarity index 94% rename from src/DannyGoodacre.Testing.Core/CommandHandlerTestBase.cs rename to src/DannyGoodacre.Cqrs.Testing/CommandHandlerTestBase.cs index 925296c..893a0db 100644 --- a/src/DannyGoodacre.Testing.Core/CommandHandlerTestBase.cs +++ b/src/DannyGoodacre.Cqrs.Testing/CommandHandlerTestBase.cs @@ -1,6 +1,10 @@ +using DannyGoodacre.Primitives; +using DannyGoodacre.Testing; using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; -namespace DannyGoodacre.Testing.Core; +namespace DannyGoodacre.Cqrs.Testing; public abstract class CommandHandlerTestBase : CommandHandlerTestCore diff --git a/src/DannyGoodacre.Cqrs.Testing/DannyGoodacre.Cqrs.Testing.csproj b/src/DannyGoodacre.Cqrs.Testing/DannyGoodacre.Cqrs.Testing.csproj new file mode 100644 index 0000000..daf99ae --- /dev/null +++ b/src/DannyGoodacre.Cqrs.Testing/DannyGoodacre.Cqrs.Testing.csproj @@ -0,0 +1,27 @@ + + + + net10.0 + DannyGoodacre.Cqrs.Testing + 0.6.0 + Danny Goodacre + Testing abstractions and base classes for verifying implementations of DannyGoodacre.Cqrs. + https://github.com/dannygoodacre/DannyGoodacre.Core + LGPL-3.0-or-later + enable + enable + + + + + + + + + + + + + + + diff --git a/src/DannyGoodacre.Testing.Core/QueryHandlerTestBase.cs b/src/DannyGoodacre.Cqrs.Testing/QueryHandlerTestBase.cs similarity index 77% rename from src/DannyGoodacre.Testing.Core/QueryHandlerTestBase.cs rename to src/DannyGoodacre.Cqrs.Testing/QueryHandlerTestBase.cs index cbbebf0..8f68b5f 100644 --- a/src/DannyGoodacre.Testing.Core/QueryHandlerTestBase.cs +++ b/src/DannyGoodacre.Cqrs.Testing/QueryHandlerTestBase.cs @@ -1,6 +1,10 @@ +using DannyGoodacre.Primitives; +using DannyGoodacre.Testing; using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; -namespace DannyGoodacre.Testing.Core; +namespace DannyGoodacre.Cqrs.Testing; public abstract class QueryHandlerTestBase : TestBase where TQueryHandler : class @@ -24,17 +28,7 @@ public void BaseSetUp() LoggerMock .Setup(x => x.IsEnabled( - It.Is(y => y == LogLevel.Information))) - .Returns(true); - - LoggerMock - .Setup(x => x.IsEnabled( - It.Is(y => y == LogLevel.Error))) - .Returns(true); - - LoggerMock - .Setup(x => x.IsEnabled( - It.Is(y => y == LogLevel.Critical))) + It.IsAny())) .Returns(true); } diff --git a/src/DannyGoodacre.Testing.Core/StateCommandHandlerTestBase.cs b/src/DannyGoodacre.Cqrs.Testing/StateCommandHandlerTestBase.cs similarity index 91% rename from src/DannyGoodacre.Testing.Core/StateCommandHandlerTestBase.cs rename to src/DannyGoodacre.Cqrs.Testing/StateCommandHandlerTestBase.cs index 60af568..a7dbd89 100644 --- a/src/DannyGoodacre.Testing.Core/StateCommandHandlerTestBase.cs +++ b/src/DannyGoodacre.Cqrs.Testing/StateCommandHandlerTestBase.cs @@ -1,7 +1,10 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; +using DannyGoodacre.Testing; using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; -namespace DannyGoodacre.Testing.Core; +namespace DannyGoodacre.Cqrs.Testing; public abstract class StateCommandHandlerTestBase : StateCommandHandlerTestCore diff --git a/src/DannyGoodacre.Testing.Core/TransactionCommandHandlerTestBase.cs b/src/DannyGoodacre.Cqrs.Testing/TransactionCommandHandlerTestBase.cs similarity index 96% rename from src/DannyGoodacre.Testing.Core/TransactionCommandHandlerTestBase.cs rename to src/DannyGoodacre.Cqrs.Testing/TransactionCommandHandlerTestBase.cs index 72b56d8..a9770f7 100644 --- a/src/DannyGoodacre.Testing.Core/TransactionCommandHandlerTestBase.cs +++ b/src/DannyGoodacre.Cqrs.Testing/TransactionCommandHandlerTestBase.cs @@ -1,7 +1,10 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; +using DannyGoodacre.Testing; using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; -namespace DannyGoodacre.Testing.Core; +namespace DannyGoodacre.Cqrs.Testing; public abstract class TransactionCommandHandlerTestBase : TransactionCommandHandlerTestCore diff --git a/src/DannyGoodacre.Core/CommandQuery/Abstractions/ICommand.cs b/src/DannyGoodacre.Cqrs/Abstractions/ICommand.cs similarity index 56% rename from src/DannyGoodacre.Core/CommandQuery/Abstractions/ICommand.cs rename to src/DannyGoodacre.Cqrs/Abstractions/ICommand.cs index 97cb15d..7d9254b 100644 --- a/src/DannyGoodacre.Core/CommandQuery/Abstractions/ICommand.cs +++ b/src/DannyGoodacre.Cqrs/Abstractions/ICommand.cs @@ -1,4 +1,4 @@ -namespace DannyGoodacre.Core.CommandQuery.Abstractions; +namespace DannyGoodacre.Cqrs; /// /// A command. diff --git a/src/DannyGoodacre.Core/CommandQuery/Abstractions/IQuery.cs b/src/DannyGoodacre.Cqrs/Abstractions/IQuery.cs similarity index 54% rename from src/DannyGoodacre.Core/CommandQuery/Abstractions/IQuery.cs rename to src/DannyGoodacre.Cqrs/Abstractions/IQuery.cs index a2adcf6..dc205ed 100644 --- a/src/DannyGoodacre.Core/CommandQuery/Abstractions/IQuery.cs +++ b/src/DannyGoodacre.Cqrs/Abstractions/IQuery.cs @@ -1,4 +1,4 @@ -namespace DannyGoodacre.Core.CommandQuery.Abstractions; +namespace DannyGoodacre.Cqrs; /// /// A query. diff --git a/src/DannyGoodacre.Core/CommandQuery/Abstractions/IStateUnit.cs b/src/DannyGoodacre.Cqrs/Abstractions/IStateUnit.cs similarity index 90% rename from src/DannyGoodacre.Core/CommandQuery/Abstractions/IStateUnit.cs rename to src/DannyGoodacre.Cqrs/Abstractions/IStateUnit.cs index 9ea4e5a..65f400a 100644 --- a/src/DannyGoodacre.Core/CommandQuery/Abstractions/IStateUnit.cs +++ b/src/DannyGoodacre.Cqrs/Abstractions/IStateUnit.cs @@ -1,4 +1,4 @@ -namespace DannyGoodacre.Core.CommandQuery.Abstractions; +namespace DannyGoodacre.Cqrs; /// /// Defines an abstraction for persisting accumulated changes to the application state. @@ -11,5 +11,4 @@ public interface IStateUnit /// A to observe while performing the operation. /// The number of state entries written. Task SaveChangesAsync(CancellationToken cancellationToken = default); - } diff --git a/src/DannyGoodacre.Core/CommandQuery/Abstractions/ITransaction.cs b/src/DannyGoodacre.Cqrs/Abstractions/ITransaction.cs similarity index 93% rename from src/DannyGoodacre.Core/CommandQuery/Abstractions/ITransaction.cs rename to src/DannyGoodacre.Cqrs/Abstractions/ITransaction.cs index b239cbb..63a518a 100644 --- a/src/DannyGoodacre.Core/CommandQuery/Abstractions/ITransaction.cs +++ b/src/DannyGoodacre.Cqrs/Abstractions/ITransaction.cs @@ -1,4 +1,4 @@ -namespace DannyGoodacre.Core.CommandQuery.Abstractions; +namespace DannyGoodacre.Cqrs; /// /// Defines an abstraction for an active transaction boundary. diff --git a/src/DannyGoodacre.Core/CommandQuery/Abstractions/ITransactionUnit.cs b/src/DannyGoodacre.Cqrs/Abstractions/ITransactionUnit.cs similarity index 79% rename from src/DannyGoodacre.Core/CommandQuery/Abstractions/ITransactionUnit.cs rename to src/DannyGoodacre.Cqrs/Abstractions/ITransactionUnit.cs index af15fc6..f0d0cff 100644 --- a/src/DannyGoodacre.Core/CommandQuery/Abstractions/ITransactionUnit.cs +++ b/src/DannyGoodacre.Cqrs/Abstractions/ITransactionUnit.cs @@ -1,7 +1,7 @@ -namespace DannyGoodacre.Core.CommandQuery.Abstractions; +namespace DannyGoodacre.Cqrs; /// -/// Extends the state unit to support explicit transaction management. +/// Defines an abstraction extending the state unit to support explicit transaction management. /// public interface ITransactionUnit : IStateUnit { diff --git a/src/DannyGoodacre.Core/CommandQuery/CommandHandler.cs b/src/DannyGoodacre.Cqrs/CommandHandler.cs similarity index 93% rename from src/DannyGoodacre.Core/CommandQuery/CommandHandler.cs rename to src/DannyGoodacre.Cqrs/CommandHandler.cs index 297cdcf..d163519 100644 --- a/src/DannyGoodacre.Core/CommandQuery/CommandHandler.cs +++ b/src/DannyGoodacre.Cqrs/CommandHandler.cs @@ -1,7 +1,7 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; using Microsoft.Extensions.Logging; -namespace DannyGoodacre.Core.CommandQuery; +namespace DannyGoodacre.Cqrs; /// /// A standardized workflow for validating and performing actions with side effects, without diff --git a/src/DannyGoodacre.Core/CommandQuery/CommandHandlerBase.cs b/src/DannyGoodacre.Cqrs/CommandHandlerBase.cs similarity index 92% rename from src/DannyGoodacre.Core/CommandQuery/CommandHandlerBase.cs rename to src/DannyGoodacre.Cqrs/CommandHandlerBase.cs index 56ed4e8..099aa2f 100644 --- a/src/DannyGoodacre.Core/CommandQuery/CommandHandlerBase.cs +++ b/src/DannyGoodacre.Cqrs/CommandHandlerBase.cs @@ -1,7 +1,7 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; using Microsoft.Extensions.Logging; -namespace DannyGoodacre.Core.CommandQuery; +namespace DannyGoodacre.Cqrs; public abstract partial class CommandHandlerBase where TCommand : ICommand @@ -12,22 +12,25 @@ internal CommandHandlerBase(ILogger logger) Logger = logger; } - protected ILogger Logger { get; } - /// /// The display name of the command. /// protected abstract string CommandName { get; } + /// + /// The instance for structured reporting. + /// + protected ILogger Logger { get; } + /// /// Validate the command before execution. /// /// A to populate with the operation's outcome. - /// The command request to validate. + /// The command to validate. protected virtual void Validate(ValidationState validationState, TCommand command) { } /// - /// The core command logic. + /// The internal command logic. /// /// The valid command to process. /// A to observe while performing the operation. @@ -36,15 +39,12 @@ protected virtual void Validate(ValidationState validationState, TCommand comman /// protected abstract Task InternalExecuteAsync(TCommand command, CancellationToken cancellationToken = default); - protected private abstract TResult MapResult(Result result); - /// /// Execute the command by validating it first and, if valid, execute the internal logic. /// /// The command to validate and process. /// A to observe while performing the operation. /// A indicating the outcome of the operation. - // ReSharper disable once MemberCanBeProtected.Global public async virtual Task ExecuteAsync(TCommand command, CancellationToken cancellationToken = default) { var validationState = new ValidationState(); @@ -83,6 +83,8 @@ public async virtual Task ExecuteAsync(TCommand command, CancellationTo } } + protected private abstract TResult MapResult(Result result); + [LoggerMessage(LogLevel.Error, "Command '{Command}' failed validation: {ValidationState}")] private static partial void LogFailedValidation(ILogger logger, string command, ValidationState validationState); diff --git a/src/DannyGoodacre.Cqrs/DannyGoodacre.Cqrs.csproj b/src/DannyGoodacre.Cqrs/DannyGoodacre.Cqrs.csproj new file mode 100644 index 0000000..6a39e5b --- /dev/null +++ b/src/DannyGoodacre.Cqrs/DannyGoodacre.Cqrs.csproj @@ -0,0 +1,27 @@ + + + + net10.0 + DannyGoodacre.Cqrs + 0.6.0 + Danny Goodacre + A lightweight CQRS and clean architecture foundation library including state and transaction control. + https://github.com/dannygoodacre/DannyGoodacre.Core + LGPL-3.0-or-later + enable + enable + + + + + + + + + + + + + + + diff --git a/src/DannyGoodacre.Cqrs/Extensions/ServiceCollectionExtensions.cs b/src/DannyGoodacre.Cqrs/Extensions/ServiceCollectionExtensions.cs new file mode 100644 index 0000000..178f2a1 --- /dev/null +++ b/src/DannyGoodacre.Cqrs/Extensions/ServiceCollectionExtensions.cs @@ -0,0 +1,47 @@ +using System.Reflection; +using Microsoft.Extensions.DependencyInjection; + +namespace DannyGoodacre.Cqrs; + +public static class ServiceCollectionExtensions +{ + extension(IServiceCollection services) + { + /// + /// Scan the specified assemblies for concrete command handler implementations and register them as scoped services. + /// + /// A list of assemblies to scan for command handler implementations. + /// The instance. + public IServiceCollection AddCommandHandlers(params Assembly[] assemblies) + => services.AddHandlers(x => x is { IsAbstract: false, IsClass: true } && x.IsCommandHandler(), assemblies); + + /// + /// Scan the specified assemblies for concrete query handler implementations and register them as scoped services. + /// + /// A list of assemblies to scan for query handler implementations. + /// The instance. + public IServiceCollection AddQueryHandlers(params Assembly[] assemblies) + => services.AddHandlers(x => x is { IsAbstract: false, IsClass: true } && x.IsQueryHandler(), assemblies); + + private IServiceCollection AddHandlers(Func predicate, params Assembly[] assemblies) + { + IEnumerable handlerTypes = assemblies + .SelectMany(x => x.GetTypes()) + .Where(predicate); + + foreach (Type handlerType in handlerTypes) + { + services.AddScoped(handlerType); + + IEnumerable interfaces = handlerType.GetHandlerInterfaces(); + + foreach (Type serviceType in interfaces) + { + services.AddScoped(serviceType, handlerType); + } + } + + return services; + } + } +} diff --git a/src/DannyGoodacre.Core/Extensions/TypeExtensions.cs b/src/DannyGoodacre.Cqrs/Extensions/TypeExtensions.cs similarity index 90% rename from src/DannyGoodacre.Core/Extensions/TypeExtensions.cs rename to src/DannyGoodacre.Cqrs/Extensions/TypeExtensions.cs index 1589ba6..fe018d8 100644 --- a/src/DannyGoodacre.Core/Extensions/TypeExtensions.cs +++ b/src/DannyGoodacre.Cqrs/Extensions/TypeExtensions.cs @@ -1,6 +1,4 @@ -using DannyGoodacre.Core.CommandQuery; - -namespace DannyGoodacre.Core.Extensions; +namespace DannyGoodacre.Cqrs; internal static class TypeExtensions { @@ -50,7 +48,7 @@ public bool IsQueryHandler() return false; } - public IEnumerable GetHandlerInterfaces() + internal IEnumerable GetHandlerInterfaces() => type.GetInterfaces() .Where(x => x != typeof(IDisposable) && x != typeof(IAsyncDisposable)); } diff --git a/src/DannyGoodacre.Core/CommandQuery/QueryHandler.cs b/src/DannyGoodacre.Cqrs/QueryHandler.cs similarity index 86% rename from src/DannyGoodacre.Core/CommandQuery/QueryHandler.cs rename to src/DannyGoodacre.Cqrs/QueryHandler.cs index c0f2385..e1653ba 100644 --- a/src/DannyGoodacre.Core/CommandQuery/QueryHandler.cs +++ b/src/DannyGoodacre.Cqrs/QueryHandler.cs @@ -1,13 +1,19 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; using Microsoft.Extensions.Logging; -namespace DannyGoodacre.Core.CommandQuery; +namespace DannyGoodacre.Cqrs; public abstract partial class QueryHandler(ILogger logger) where TQuery : IQuery { + /// + /// The display name of the command. + /// protected abstract string QueryName { get; } + /// + /// The instance for structured reporting. + /// // ReSharper disable once MemberCanBePrivate.Global protected ILogger Logger { get; } = logger; @@ -15,7 +21,7 @@ public abstract partial class QueryHandler(ILogger logger) /// Validate the query before execution. /// /// A to populate with the operation's outcome. - /// The query request to validate. + /// The query to validate. protected virtual void Validate(ValidationState validationState, TQuery queryRequest) { } /// @@ -32,7 +38,6 @@ protected virtual void Validate(ValidationState validationState, TQuery queryReq /// The query to validate and process. /// A to observe while performing the operation. /// A indicating the outcome of the operation. - // ReSharper disable once MemberCanBeProtected.Global public async Task> ExecuteAsync(TQuery query, CancellationToken cancellationToken = default) { var validationState = new ValidationState(); @@ -63,11 +68,11 @@ public async Task> ExecuteAsync(TQuery query, CancellationToken return Result.Canceled(); } - catch (Exception e) + catch (Exception ex) { - LogCriticalFailure(Logger, e, QueryName); + LogCriticalFailure(Logger, ex, QueryName); - return Result.InternalError(e.Message); + return Result.InternalError(ex.Message); } } @@ -81,5 +86,5 @@ public async Task> ExecuteAsync(TQuery query, CancellationToken private static partial void LogCanceledDuringExecution(ILogger logger, string query); [LoggerMessage(LogLevel.Critical, "Query '{Query}' failed.")] - private static partial void LogCriticalFailure(ILogger logger, Exception ex, string query); + private static partial void LogCriticalFailure(ILogger logger, Exception exception, string query); } diff --git a/src/DannyGoodacre.Core/CommandQuery/StateCommandHandler.cs b/src/DannyGoodacre.Cqrs/StateCommandHandler.cs similarity index 93% rename from src/DannyGoodacre.Core/CommandQuery/StateCommandHandler.cs rename to src/DannyGoodacre.Cqrs/StateCommandHandler.cs index 5528a95..6c3a2e4 100644 --- a/src/DannyGoodacre.Core/CommandQuery/StateCommandHandler.cs +++ b/src/DannyGoodacre.Cqrs/StateCommandHandler.cs @@ -1,7 +1,7 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; using Microsoft.Extensions.Logging; -namespace DannyGoodacre.Core.CommandQuery; +namespace DannyGoodacre.Cqrs; /// /// A standardized workflow for validating and performing actions that persist changes to the diff --git a/src/DannyGoodacre.Core/CommandQuery/StateCommandHandlerBase.cs b/src/DannyGoodacre.Cqrs/StateCommandHandlerBase.cs similarity index 94% rename from src/DannyGoodacre.Core/CommandQuery/StateCommandHandlerBase.cs rename to src/DannyGoodacre.Cqrs/StateCommandHandlerBase.cs index 5319132..80da3fb 100644 --- a/src/DannyGoodacre.Core/CommandQuery/StateCommandHandlerBase.cs +++ b/src/DannyGoodacre.Cqrs/StateCommandHandlerBase.cs @@ -1,7 +1,7 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; using Microsoft.Extensions.Logging; -namespace DannyGoodacre.Core.CommandQuery; +namespace DannyGoodacre.Cqrs; public abstract partial class StateCommandHandlerBase : CommandHandlerBase diff --git a/src/DannyGoodacre.Core/CommandQuery/TransactionCommandHandler.cs b/src/DannyGoodacre.Cqrs/TransactionCommandHandler.cs similarity index 94% rename from src/DannyGoodacre.Core/CommandQuery/TransactionCommandHandler.cs rename to src/DannyGoodacre.Cqrs/TransactionCommandHandler.cs index ee482cf..3ca10b0 100644 --- a/src/DannyGoodacre.Core/CommandQuery/TransactionCommandHandler.cs +++ b/src/DannyGoodacre.Cqrs/TransactionCommandHandler.cs @@ -1,7 +1,7 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; using Microsoft.Extensions.Logging; -namespace DannyGoodacre.Core.CommandQuery; +namespace DannyGoodacre.Cqrs; /// /// A standardized workflow for validating and performing actions that persist changes to the diff --git a/src/DannyGoodacre.Core/CommandQuery/TransactionCommandHandlerBase.cs b/src/DannyGoodacre.Cqrs/TransactionCommandHandlerBase.cs similarity index 81% rename from src/DannyGoodacre.Core/CommandQuery/TransactionCommandHandlerBase.cs rename to src/DannyGoodacre.Cqrs/TransactionCommandHandlerBase.cs index 20a3ea7..b464bf0 100644 --- a/src/DannyGoodacre.Core/CommandQuery/TransactionCommandHandlerBase.cs +++ b/src/DannyGoodacre.Cqrs/TransactionCommandHandlerBase.cs @@ -1,7 +1,7 @@ -using DannyGoodacre.Core.CommandQuery.Abstractions; +using DannyGoodacre.Primitives; using Microsoft.Extensions.Logging; -namespace DannyGoodacre.Core.CommandQuery; +namespace DannyGoodacre.Cqrs; public abstract partial class TransactionCommandHandlerBase : CommandHandlerBase @@ -14,16 +14,23 @@ internal TransactionCommandHandlerBase(ILogger logger, ITransactionUnit transact TransactionUnit = transactionUnit; } - private ITransactionUnit TransactionUnit { get; } + /// + /// The transaction provider for the lifecycle of this command. + /// + /// + /// This is used in derived classes to perform additional data persistence and transaction control. + /// + // ReSharper disable once MemberCanBePrivate.Global + protected ITransactionUnit TransactionUnit { get; } /// - /// The number of state entries expected to be persisted upon completion. + /// The number of state entries expected to be persisted upon completion of the command. /// /// /// Defaults to -1 to disable validation. /// /// - /// This is compared against the result of . + /// This is compared against the result of . /// protected virtual int ExpectedChanges { get; set; } = -1; @@ -50,7 +57,7 @@ public async override Task ExecuteAsync(TCommand command, CancellationT LogUnexpectedNumberOfChanges(Logger, CommandName, ExpectedChanges, actualChanges); - return MapResult(Result.InternalError("State integrity check failed.")); + return MapResult(Result.InternalError("Attempted to persist an unexpected number of changes.")); } await transaction.CommitAsync(cancellationToken); diff --git a/src/DannyGoodacre.Primitives/DannyGoodacre.Primitives.csproj b/src/DannyGoodacre.Primitives/DannyGoodacre.Primitives.csproj new file mode 100644 index 0000000..4c0ac93 --- /dev/null +++ b/src/DannyGoodacre.Primitives/DannyGoodacre.Primitives.csproj @@ -0,0 +1,15 @@ + + + + net10.0 + DannyGoodacre.Primitives + 0.6.0 + Danny Goodacre + A lightweight primitives library providing Result types and a structured validation state for method responses. + https://github.com/dannygoodacre/DannyGoodacre.Core + LGPL-3.0-or-later + enable + enable + + + diff --git a/src/DannyGoodacre.Core/Result.T.cs b/src/DannyGoodacre.Primitives/Result.T.cs similarity index 94% rename from src/DannyGoodacre.Core/Result.T.cs rename to src/DannyGoodacre.Primitives/Result.T.cs index ae68049..c26000f 100644 --- a/src/DannyGoodacre.Core/Result.T.cs +++ b/src/DannyGoodacre.Primitives/Result.T.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace DannyGoodacre.Core; +namespace DannyGoodacre.Primitives; /// /// The outcome of an operation with a value, encapsulating its status, error, and validation state. @@ -14,7 +14,7 @@ public class Result : Result private Result() { } - internal Result(Result result) : base(result) { } + public Result(Result result) : base(result) { } public static Result Success(T value) => new() diff --git a/src/DannyGoodacre.Core/Result.cs b/src/DannyGoodacre.Primitives/Result.cs similarity index 93% rename from src/DannyGoodacre.Core/Result.cs rename to src/DannyGoodacre.Primitives/Result.cs index e019824..72edf78 100644 --- a/src/DannyGoodacre.Core/Result.cs +++ b/src/DannyGoodacre.Primitives/Result.cs @@ -1,4 +1,4 @@ -namespace DannyGoodacre.Core; +namespace DannyGoodacre.Primitives; /// /// The outcome of an operation, encapsulating its status, error, and validation state. @@ -64,8 +64,8 @@ public static Result InternalError(string error) Error = error }; - public static Result InternalError(Exception exception) => - new() + public static Result InternalError(Exception exception) + => new() { Status = Status.InternalError, Exception = exception diff --git a/src/DannyGoodacre.Core/Status.cs b/src/DannyGoodacre.Primitives/Status.cs similarity index 76% rename from src/DannyGoodacre.Core/Status.cs rename to src/DannyGoodacre.Primitives/Status.cs index 58974f4..36da595 100644 --- a/src/DannyGoodacre.Core/Status.cs +++ b/src/DannyGoodacre.Primitives/Status.cs @@ -1,4 +1,4 @@ -namespace DannyGoodacre.Core; +namespace DannyGoodacre.Primitives; public enum Status { diff --git a/src/DannyGoodacre.Core/ValidationState.cs b/src/DannyGoodacre.Primitives/ValidationState.cs similarity index 96% rename from src/DannyGoodacre.Core/ValidationState.cs rename to src/DannyGoodacre.Primitives/ValidationState.cs index ebf0d4c..a015a22 100644 --- a/src/DannyGoodacre.Core/ValidationState.cs +++ b/src/DannyGoodacre.Primitives/ValidationState.cs @@ -1,6 +1,6 @@ using System.Text; -namespace DannyGoodacre.Core; +namespace DannyGoodacre.Primitives; public class ValidationState { diff --git a/src/DannyGoodacre.Testing.Core/DannyGoodacre.Testing.Core.csproj b/src/DannyGoodacre.Testing.Core/DannyGoodacre.Testing.Core.csproj deleted file mode 100644 index 64efd85..0000000 --- a/src/DannyGoodacre.Testing.Core/DannyGoodacre.Testing.Core.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - net10.0 - DannyGoodacre.Testing.Core - 0.5.0 - Danny Goodacre - A lightweight testing foundation library. - https://github.com/dannygoodacre/DannyGoodacre.Core - MIT - enable - enable - - - - - - - - - - - - - - - - - - - - diff --git a/src/DannyGoodacre.Testing/DannyGoodacre.Testing.csproj b/src/DannyGoodacre.Testing/DannyGoodacre.Testing.csproj new file mode 100644 index 0000000..d70955c --- /dev/null +++ b/src/DannyGoodacre.Testing/DannyGoodacre.Testing.csproj @@ -0,0 +1,25 @@ + + + + net10.0 + DannyGoodacre.Testing + 0.6.0 + Danny Goodacre + A lightweight testing foundation library. + https://github.com/dannygoodacre/DannyGoodacre.Core + LGPL-3.0-or-later + enable + enable + + + + + + + + + + + + + diff --git a/src/DannyGoodacre.Testing.Core/LoggerExtensions.cs b/src/DannyGoodacre.Testing/LoggerExtensions.cs similarity index 71% rename from src/DannyGoodacre.Testing.Core/LoggerExtensions.cs rename to src/DannyGoodacre.Testing/LoggerExtensions.cs index 7fcff46..e3f579c 100644 --- a/src/DannyGoodacre.Testing.Core/LoggerExtensions.cs +++ b/src/DannyGoodacre.Testing/LoggerExtensions.cs @@ -1,16 +1,17 @@ using Microsoft.Extensions.Logging; +using Moq; -namespace DannyGoodacre.Testing.Core; +namespace DannyGoodacre.Testing; public static class LoggerExtensions { public static void Setup(this Mock> loggerMock, - LogLevel level, - string message, - bool verifyContainsMessage = false, - Exception? exception = null, - bool verifyContainsExceptionMessage = false, - int times = 1) + LogLevel level, + string message, + bool verifyContainsMessage = false, + Exception? exception = null, + bool verifyContainsExceptionMessage = false, + int times = 1) { Func state = verifyContainsMessage ? (v, _) => v.ToString()!.Contains(message) diff --git a/src/DannyGoodacre.Testing.Core/TestBase.cs b/src/DannyGoodacre.Testing/TestBase.cs similarity index 95% rename from src/DannyGoodacre.Testing.Core/TestBase.cs rename to src/DannyGoodacre.Testing/TestBase.cs index bf5496e..cc372c5 100644 --- a/src/DannyGoodacre.Testing.Core/TestBase.cs +++ b/src/DannyGoodacre.Testing/TestBase.cs @@ -1,6 +1,9 @@ using System.Reflection; +using DannyGoodacre.Primitives; +using Moq; +using NUnit.Framework; -namespace DannyGoodacre.Testing.Core; +namespace DannyGoodacre.Testing; public abstract class TestBase { @@ -73,7 +76,7 @@ protected static void AssertDomainError(Result result, string error) } } - protected static void AssertCancelled(Result result) + protected static void AssertCanceled(Result result) { using (Assert.EnterMultipleScope()) { @@ -82,7 +85,7 @@ protected static void AssertCancelled(Result result) } } - protected static void AssertCancelled(Result result) + protected static void AssertCanceled(Result result) { using (Assert.EnterMultipleScope()) { diff --git a/tests/DannyGoodacre.Core.Tests/DannyGoodacre.Core.Tests.csproj b/tests/DannyGoodacre.Core.Tests/DannyGoodacre.Core.Tests.csproj deleted file mode 100644 index 1a4b7bb..0000000 --- a/tests/DannyGoodacre.Core.Tests/DannyGoodacre.Core.Tests.csproj +++ /dev/null @@ -1,38 +0,0 @@ - - - - net10.0 - enable - enable - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/DannyGoodacre.Core.Tests/CommandQuery/CommandHandlerTests.cs b/tests/DannyGoodacre.Cqrs.Tests/CommandHandlerTests.cs similarity index 85% rename from tests/DannyGoodacre.Core.Tests/CommandQuery/CommandHandlerTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/CommandHandlerTests.cs index a8d1763..0543236 100644 --- a/tests/DannyGoodacre.Core.Tests/CommandQuery/CommandHandlerTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/CommandHandlerTests.cs @@ -1,4 +1,9 @@ -namespace DannyGoodacre.Core.Tests.CommandQuery; +using DannyGoodacre.Cqrs.Testing; +using DannyGoodacre.Primitives; +using Microsoft.Extensions.Logging; +using NUnit.Framework; + +namespace DannyGoodacre.Cqrs.Tests; [TestFixture] public sealed class CommandHandlerTests : CommandHandlerTestBase @@ -14,9 +19,6 @@ protected override void Validate(ValidationState validationState, TestCommand co protected override Task InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _testInternalExecuteAsync(command, cancellationToken); - - public Task TestExecuteAsync(TestCommand command, CancellationToken cancellationToken) - => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test Command Handler"; @@ -29,7 +31,7 @@ public Task TestExecuteAsync(TestCommand command, CancellationToken canc protected override string CommandName => TestName; - protected override Task Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); + protected override Task Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); [SetUp] public void SetUp() @@ -63,7 +65,7 @@ public async Task ExecuteAsync_WhenValidationFails_ShouldReturnInvalid() } [Test] - public async Task ExecuteAsync_WhenCancelledBefore_ShouldReturnCanceled() + public async Task ExecuteAsync_WhenCanceledBefore_ShouldReturnCanceled() { // Arrange var cancellationTokenSource = new CancellationTokenSource(); @@ -79,7 +81,7 @@ public async Task ExecuteAsync_WhenCancelledBefore_ShouldReturnCanceled() var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] @@ -93,7 +95,7 @@ public async Task ExecuteAsync_WhenSuccessful_ShouldReturnSuccess() } [Test] - public async Task ExecuteAsync_WhenCancelledDuring_ShouldReturnCanceled() + public async Task ExecuteAsync_WhenCanceledDuring_ShouldReturnCanceled() { // Arrange _testInternalExecuteAsync = (_, _) => throw new OperationCanceledException(); @@ -104,7 +106,7 @@ public async Task ExecuteAsync_WhenCancelledDuring_ShouldReturnCanceled() var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] diff --git a/tests/DannyGoodacre.Core.Tests/CommandQuery/CommandHandlerWithReturnValueTests.cs b/tests/DannyGoodacre.Cqrs.Tests/CommandHandlerWithReturnValueTests.cs similarity index 90% rename from tests/DannyGoodacre.Core.Tests/CommandQuery/CommandHandlerWithReturnValueTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/CommandHandlerWithReturnValueTests.cs index f46020c..b39851e 100644 --- a/tests/DannyGoodacre.Core.Tests/CommandQuery/CommandHandlerWithReturnValueTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/CommandHandlerWithReturnValueTests.cs @@ -1,4 +1,9 @@ -namespace DannyGoodacre.Core.Tests.CommandQuery; +using DannyGoodacre.Cqrs.Testing; +using DannyGoodacre.Primitives; +using Microsoft.Extensions.Logging; +using NUnit.Framework; + +namespace DannyGoodacre.Cqrs.Tests; [TestFixture] public sealed class CommandHandlerWithReturnValueTests : CommandHandlerTestBase @@ -65,7 +70,7 @@ public async Task ExecuteAsync_WhenValidationFails_ShouldReturnInvalid() } [Test] - public async Task ExecuteAsync_WhenCancelledBefore_ShouldReturnCanceled() + public async Task ExecuteAsync_WhenCanceledBefore_ShouldReturnCanceled() { // Arrange var cancellationTokenSource = new CancellationTokenSource(); @@ -81,7 +86,7 @@ public async Task ExecuteAsync_WhenCancelledBefore_ShouldReturnCanceled() var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] @@ -95,7 +100,7 @@ public async Task ExecuteAsync_WhenSuccessful_ShouldReturnSuccess() } [Test] - public async Task ExecuteAsync_WhenCancelledDuring_ShouldReturnCanceled() + public async Task ExecuteAsync_WhenCanceledDuring_ShouldReturnCanceled() { // Arrange _testInternalExecuteAsync = (_, _) => throw new OperationCanceledException(); @@ -106,7 +111,7 @@ public async Task ExecuteAsync_WhenCancelledDuring_ShouldReturnCanceled() var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] diff --git a/tests/DannyGoodacre.Cqrs.Tests/DannyGoodacre.Cqrs.Tests.csproj b/tests/DannyGoodacre.Cqrs.Tests/DannyGoodacre.Cqrs.Tests.csproj new file mode 100644 index 0000000..65d5bcb --- /dev/null +++ b/tests/DannyGoodacre.Cqrs.Tests/DannyGoodacre.Cqrs.Tests.csproj @@ -0,0 +1,29 @@ + + + + net10.0 + enable + enable + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + diff --git a/tests/DannyGoodacre.Core.Tests/Extensions/ServiceCollectionExtensionsTests.cs b/tests/DannyGoodacre.Cqrs.Tests/Extensions/ServiceCollectionExtensionsTests.cs similarity index 98% rename from tests/DannyGoodacre.Core.Tests/Extensions/ServiceCollectionExtensionsTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/Extensions/ServiceCollectionExtensionsTests.cs index df5382e..def6406 100644 --- a/tests/DannyGoodacre.Core.Tests/Extensions/ServiceCollectionExtensionsTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/Extensions/ServiceCollectionExtensionsTests.cs @@ -1,7 +1,11 @@ using System.Reflection; +using DannyGoodacre.Primitives; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; -namespace DannyGoodacre.Core.Tests.Extensions; +namespace DannyGoodacre.Cqrs.Extensions.Tests; [TestFixture] public sealed class ServiceCollectionExtensionsTests diff --git a/tests/DannyGoodacre.Core.Tests/Extensions/TypeExtensionsTests.cs b/tests/DannyGoodacre.Cqrs.Tests/Extensions/TypeExtensionsTests.cs similarity index 93% rename from tests/DannyGoodacre.Core.Tests/Extensions/TypeExtensionsTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/Extensions/TypeExtensionsTests.cs index a130063..3b0c127 100644 --- a/tests/DannyGoodacre.Core.Tests/Extensions/TypeExtensionsTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/Extensions/TypeExtensionsTests.cs @@ -1,6 +1,8 @@ -using DannyGoodacre.Core.Extensions; +using DannyGoodacre.Primitives; +using Microsoft.Extensions.Logging; +using NUnit.Framework; -namespace DannyGoodacre.Core.Tests.Extensions; +namespace DannyGoodacre.Cqrs.Extensions.Tests; [TestFixture] public sealed class TypeExtensionsTests diff --git a/tests/DannyGoodacre.Core.Tests/CommandQuery/QueryHandlerTests.cs b/tests/DannyGoodacre.Cqrs.Tests/QueryHandlerTests.cs similarity index 85% rename from tests/DannyGoodacre.Core.Tests/CommandQuery/QueryHandlerTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/QueryHandlerTests.cs index 0468278..7d24a62 100644 --- a/tests/DannyGoodacre.Core.Tests/CommandQuery/QueryHandlerTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/QueryHandlerTests.cs @@ -1,4 +1,9 @@ -namespace DannyGoodacre.Core.Tests.CommandQuery; +using DannyGoodacre.Cqrs.Testing; +using DannyGoodacre.Primitives; +using Microsoft.Extensions.Logging; +using NUnit.Framework; + +namespace DannyGoodacre.Cqrs.Tests; [TestFixture] public class QueryHandlerTests : QueryHandlerTestBase @@ -14,9 +19,6 @@ protected override void Validate(ValidationState validationState, TestQuery quer protected override Task> InternalExecuteAsync(TestQuery query, CancellationToken cancellationToken) => _testInternalExecuteAsync(query, cancellationToken); - - public Task> TestExecuteAsync(TestQuery command, CancellationToken cancellationToken) - => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test Query Handler"; @@ -31,7 +33,7 @@ public Task> TestExecuteAsync(TestQuery command, CancellationToken c protected override string QueryName => TestName; - protected override Task> Act() => QueryHandler.TestExecuteAsync(_testQuery, CancellationToken); + protected override Task> Act() => QueryHandler.ExecuteAsync(_testQuery, CancellationToken); [SetUp] public void SetUp() @@ -65,7 +67,7 @@ public async Task ExecuteAsync_WhenValidationFails_ShouldReturnInvalid() } [Test] - public async Task ExecuteAsync_WhenCancelledBefore_ShouldReturnCanceled() + public async Task ExecuteAsync_WhenCanceledBefore_ShouldReturnCanceled() { // Arrange var cancellationTokenSource = new CancellationTokenSource(); @@ -81,7 +83,7 @@ public async Task ExecuteAsync_WhenCancelledBefore_ShouldReturnCanceled() var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] @@ -95,7 +97,7 @@ public async Task ExecuteAsync_WhenSuccessful_ShouldReturnSuccess() } [Test] - public async Task ExecuteAsync_WhenCancelledDuring_ShouldReturnCanceled() + public async Task ExecuteAsync_WhenCanceledDuring_ShouldReturnCanceled() { // Arrange _testInternalExecuteAsync = (_, _) => throw new OperationCanceledException(); @@ -106,7 +108,7 @@ public async Task ExecuteAsync_WhenCancelledDuring_ShouldReturnCanceled() var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] diff --git a/tests/DannyGoodacre.Core.Tests/CommandQuery/StateCommandHandlerTests.cs b/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerTests.cs similarity index 88% rename from tests/DannyGoodacre.Core.Tests/CommandQuery/StateCommandHandlerTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerTests.cs index 91fb20d..fe567ef 100644 --- a/tests/DannyGoodacre.Core.Tests/CommandQuery/StateCommandHandlerTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerTests.cs @@ -1,4 +1,10 @@ -namespace DannyGoodacre.Core.Tests.CommandQuery; +using DannyGoodacre.Cqrs.Testing; +using DannyGoodacre.Primitives; +using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; + +namespace DannyGoodacre.Cqrs.Tests; [TestFixture] public sealed class StateCommandHandlerTests : StateCommandHandlerTestBase @@ -14,9 +20,6 @@ protected override void Validate(ValidationState validationState, TestCommand co protected override Task InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _testInternalExecuteAsync(command, cancellationToken); - - public Task TestExecuteAsync(TestCommand command, CancellationToken cancellationToken) - => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test State Command Handler"; @@ -29,7 +32,7 @@ public Task TestExecuteAsync(TestCommand command, CancellationToken canc protected override string CommandName => TestName; - protected override Task Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); + protected override Task Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); [SetUp] public void SetUp() @@ -72,7 +75,7 @@ public async Task ExecuteAsync_WhenCanceledWhilePersistingChanges_ShouldReturnCa var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] diff --git a/tests/DannyGoodacre.Core.Tests/CommandQuery/StateCommandHandlerWithReturnValueTests.cs b/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerWithReturnValueTests.cs similarity index 91% rename from tests/DannyGoodacre.Core.Tests/CommandQuery/StateCommandHandlerWithReturnValueTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerWithReturnValueTests.cs index 198a8e3..ec94bfd 100644 --- a/tests/DannyGoodacre.Core.Tests/CommandQuery/StateCommandHandlerWithReturnValueTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerWithReturnValueTests.cs @@ -1,4 +1,10 @@ -namespace DannyGoodacre.Core.Tests.CommandQuery; +using DannyGoodacre.Cqrs.Testing; +using DannyGoodacre.Primitives; +using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; + +namespace DannyGoodacre.Cqrs.Tests; [TestFixture] public sealed class StateCommandHandlerWithReturnValueTests : StateCommandHandlerTestBase @@ -14,9 +20,6 @@ protected override void Validate(ValidationState validationState, TestCommand co protected override Task> InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _testInternalExecuteAsync(command, cancellationToken); - - public Task> TestExecuteAsync(TestCommand command, CancellationToken cancellationToken) - => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test State Command Handler"; @@ -31,7 +34,7 @@ public Task> TestExecuteAsync(TestCommand command, CancellationToken protected override string CommandName => TestName; - protected override Task> Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); + protected override Task> Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); [SetUp] public void SetUp() @@ -74,7 +77,7 @@ public async Task ExecuteAsync_WhenCanceledWhilePersistingChanges_ShouldReturnCa var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] diff --git a/tests/DannyGoodacre.Core.Tests/CommandQuery/TransactionCommandHandlerTests.cs b/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerTests.cs similarity index 90% rename from tests/DannyGoodacre.Core.Tests/CommandQuery/TransactionCommandHandlerTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerTests.cs index 47711e7..54f93b0 100644 --- a/tests/DannyGoodacre.Core.Tests/CommandQuery/TransactionCommandHandlerTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerTests.cs @@ -1,4 +1,10 @@ -namespace DannyGoodacre.Core.Tests.CommandQuery; +using DannyGoodacre.Cqrs.Testing; +using DannyGoodacre.Primitives; +using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; + +namespace DannyGoodacre.Cqrs.Tests; [TestFixture] public sealed class TransactionCommandHandlerTests : TransactionCommandHandlerTestBase @@ -14,9 +20,6 @@ public sealed class TestTransactionCommandHandler(ILogger logger, ITransactionUn protected override Task InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _internalExecuteAsync(command, cancellationToken); - - public Task TestExecuteAsync(TestCommand command, CancellationToken cancellationToken) - => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test Transaction Command Handler"; @@ -31,7 +34,7 @@ public Task TestExecuteAsync(TestCommand command, CancellationToken canc protected override string CommandName => TestName; - protected override Task Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); + protected override Task Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); protected override int TestActualChanges => _testActualChanges; @@ -80,8 +83,7 @@ public async Task ExecuteAsync_WhenSuccessfulAndInvalidNumberOfChanges_ShouldRol var result = await Act(); // Assert - AssertInternalError(result, "State integrity check failed."); - + AssertInternalError(result, "Attempted to persist an unexpected number of changes."); } [Test] @@ -115,7 +117,7 @@ public async Task ExecuteAsync_WhenSuccessfulAndNotValidatingChanges_ShouldCommi } [Test] - public async Task ExecuteAsync_WhenSuccessfulAndCanceled_ShouldRollbackAndReturnCancelled() + public async Task ExecuteAsync_WhenSuccessfulAndCanceled_ShouldRollbackAndReturnCanceled() { // Arrange TransactionUnitMock @@ -132,7 +134,7 @@ public async Task ExecuteAsync_WhenSuccessfulAndCanceled_ShouldRollbackAndReturn var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] diff --git a/tests/DannyGoodacre.Core.Tests/CommandQuery/TransactionCommandHandlerWithReturnValueTests.cs b/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerWithReturnValueTests.cs similarity index 91% rename from tests/DannyGoodacre.Core.Tests/CommandQuery/TransactionCommandHandlerWithReturnValueTests.cs rename to tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerWithReturnValueTests.cs index d72910d..c296322 100644 --- a/tests/DannyGoodacre.Core.Tests/CommandQuery/TransactionCommandHandlerWithReturnValueTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerWithReturnValueTests.cs @@ -1,4 +1,10 @@ -namespace DannyGoodacre.Core.Tests.CommandQuery; +using DannyGoodacre.Cqrs.Testing; +using DannyGoodacre.Primitives; +using Microsoft.Extensions.Logging; +using Moq; +using NUnit.Framework; + +namespace DannyGoodacre.Cqrs.Tests; [TestFixture] public sealed class TransactionCommandHandlerWithReturnValueTests : TransactionCommandHandlerTestBase @@ -14,9 +20,6 @@ public sealed class TestTransactionCommandHandler(ILogger logger, ITransactionUn protected override Task> InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _internalExecuteAsync(command, cancellationToken); - - public Task> TestExecuteAsync(TestCommand command, CancellationToken cancellationToken) - => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test Transaction Command Handler"; @@ -33,7 +36,7 @@ public Task> TestExecuteAsync(TestCommand command, CancellationToken protected override string CommandName => TestName; - protected override Task> Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); + protected override Task> Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); protected override int TestActualChanges => _testActualChanges; @@ -82,8 +85,7 @@ public async Task ExecuteAsync_WhenSuccessfulAndInvalidNumberOfChanges_ShouldRol var result = await Act(); // Assert - AssertInternalError(result, "State integrity check failed."); - + AssertInternalError(result, "Attempted to persist an unexpected number of changes."); } [Test] @@ -117,7 +119,7 @@ public async Task ExecuteAsync_WhenSuccessfulAndNotValidatingChanges_ShouldCommi } [Test] - public async Task ExecuteAsync_WhenSuccessfulAndCanceled_ShouldRollbackAndReturnCancelled() + public async Task ExecuteAsync_WhenSuccessfulAndCanceled_ShouldRollbackAndReturnCanceled() { // Arrange TransactionUnitMock @@ -134,7 +136,7 @@ public async Task ExecuteAsync_WhenSuccessfulAndCanceled_ShouldRollbackAndReturn var result = await Act(); // Assert - AssertCancelled(result); + AssertCanceled(result); } [Test] diff --git a/tests/DannyGoodacre.Primitives.Tests/DannyGoodacre.Primitives.Tests.csproj b/tests/DannyGoodacre.Primitives.Tests/DannyGoodacre.Primitives.Tests.csproj new file mode 100644 index 0000000..9ccdee3 --- /dev/null +++ b/tests/DannyGoodacre.Primitives.Tests/DannyGoodacre.Primitives.Tests.csproj @@ -0,0 +1,23 @@ + + + + net10.0 + enable + enable + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + diff --git a/tests/DannyGoodacre.Core.Tests/ResultTests.cs b/tests/DannyGoodacre.Primitives.Tests/ResultTests.cs similarity index 97% rename from tests/DannyGoodacre.Core.Tests/ResultTests.cs rename to tests/DannyGoodacre.Primitives.Tests/ResultTests.cs index 3ab7215..c6d796a 100644 --- a/tests/DannyGoodacre.Core.Tests/ResultTests.cs +++ b/tests/DannyGoodacre.Primitives.Tests/ResultTests.cs @@ -1,4 +1,7 @@ -namespace DannyGoodacre.Core.Tests; +using DannyGoodacre.Testing; +using NUnit.Framework; + +namespace DannyGoodacre.Primitives.Tests; [TestFixture] public sealed class ResultTests : TestBase diff --git a/tests/DannyGoodacre.Core.Tests/ResultValueTests.cs b/tests/DannyGoodacre.Primitives.Tests/ResultWithValueTests.cs similarity index 95% rename from tests/DannyGoodacre.Core.Tests/ResultValueTests.cs rename to tests/DannyGoodacre.Primitives.Tests/ResultWithValueTests.cs index d4272c1..56cc2f1 100644 --- a/tests/DannyGoodacre.Core.Tests/ResultValueTests.cs +++ b/tests/DannyGoodacre.Primitives.Tests/ResultWithValueTests.cs @@ -1,9 +1,11 @@ -namespace DannyGoodacre.Core.Tests; +using NUnit.Framework; + +namespace DannyGoodacre.Primitives.Tests; [TestFixture] -public sealed class ResultValueTests +public sealed class ResultWithValueTests { -[Test] + [Test] public void IsSuccess_WhenSuccessful_ReturnsTrue() { // Act @@ -61,7 +63,6 @@ public void Invalid() // Assert using (Assert.EnterMultipleScope()) { - Assert.That(result.Status, Is.EqualTo(Status.Invalid)); Assert.That(result.ValidationState, Is.EqualTo(validationState)); } @@ -95,7 +96,7 @@ public void NotFound() } [Test] - public void Cancelled() + public void Canceled() { // Act var result = Result.Canceled(); diff --git a/tests/DannyGoodacre.Core.Tests/ValidationStateTests.cs b/tests/DannyGoodacre.Primitives.Tests/ValidationStateTests.cs similarity index 97% rename from tests/DannyGoodacre.Core.Tests/ValidationStateTests.cs rename to tests/DannyGoodacre.Primitives.Tests/ValidationStateTests.cs index 2b29eb0..cbc9f00 100644 --- a/tests/DannyGoodacre.Core.Tests/ValidationStateTests.cs +++ b/tests/DannyGoodacre.Primitives.Tests/ValidationStateTests.cs @@ -1,4 +1,7 @@ -namespace DannyGoodacre.Core.Tests; +using DannyGoodacre.Testing; +using NUnit.Framework; + +namespace DannyGoodacre.Primitives.Tests; [TestFixture] public sealed class ValidationStateTests : TestBase