[Snyk] Security upgrade Newtonsoft.Json from 12.0.3 to 13.0.1

README.md

@@ -52,7 +52,7 @@
   | Project  | Configuration File | Configuration Key |
   | -------- | ------------------ | ----------------- |
   | ClassifiedAds.Migrator | [appsettings.json](/src/ClassifiedAds.Projects/ClassifiedAds.Migrator/appsettings.json) | ConnectionStrings:ClassifiedAds |
-  | ClassifiedAds.BackgroundServices | [appsettings.json](/src/ClassifiedAds.Projects/ClassifiedAds.BackgroundServices/appsettings.json) | ConnectionStrings:ClassifiedAds |
+  | ClassifiedAds.BackgroundServer | [appsettings.json](/src/ClassifiedAds.Projects/ClassifiedAds.BackgroundServer/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.GRPC | [appsettings.json](/src/ClassifiedAds.Projects/ClassifiedAds.GRPC/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.IdentityServer | [appsettings.json](/src/ClassifiedAds.Projects/ClassifiedAds.IdentityServer/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.NotificationServer | [appsettings.json](/src/ClassifiedAds.Projects/ClassifiedAds.NotificationServer/appsettings.json) | |
@@ -152,7 +152,9 @@
       "Password": "guest",
       "ExchangeName": "amq.direct",
       "RoutingKey_FileUploaded": "classifiedadds_fileuploaded",
-      "RoutingKey_FileDeleted": "classifiedadds_filedeleted"
+      "RoutingKey_FileDeleted": "classifiedadds_filedeleted",
+      "QueueName_FileUploaded": "classifiedadds_fileuploaded",
+      "QueueName_FileDeleted": "classifiedadds_filedeleted"
     },
   }
   ```
@@ -193,8 +195,82 @@
   }
   ```
 
-## How to Login on Identity Server:
-- Option 1: Use default created account:
-  + User Name: [email protected]
-  + Password: v*7Un8b4rcN@<-RN
-- Option 2: Register new account at https://localhost:44367/Account/Register
+## Set Startup Projects
+![alt text](/docs/imgs/startup-projects.png)
+
+## Run or Debug the Solution
+- Web MVC Home Page: https://localhost:44364/
+
+  ![alt text](/docs/imgs/web-mvc-home-page.png)
+
+- Navigate to Health Checks UI https://localhost:44364/healthchecks-ui#/healthchecks and make sure everything is green.
+
+  ![alt text](/docs/imgs/health-checks-ui.png)
+
+- Login on Identity Server:
+  + Option 1: Use default created account:
+    + User Name: [email protected]
+    + Password: v*7Un8b4rcN@<-RN
+  + Option 2: Register new account at https://localhost:44367/Account/Register
+
+- Open Blazor Home Page at: https://localhost:44331
+
+  ![alt text](/docs/imgs/blazor-home-page.png)
+
+## How to Run on Docker Containers:
+- Add Migrations if you haven't done on previous steps:
+  + Install **dotnet-ef** cli:
+    ```
+    dotnet tool install --global dotnet-ef --version="3.1"
+    ```
+  + Navigate to [ClassifiedAds.Migrator](/src/ClassifiedAds.Projects/ClassifiedAds.Migrator/) and run these commands:
+    ```
+    dotnet ef migrations add Init --context AdsDbContext -o Migrations/AdsDb
+    dotnet ef migrations add Init --context ConfigurationDbContext -o Migrations/ConfigurationDb
+    dotnet ef migrations add Init --context PersistedGrantDbContext -o Migrations/PersistedGrantDb
+    ```
+- Make sure Line Ending for these files is Unix (LF):
+  | Project  | File |
+  | -------- | ---- |
+  | ClassifiedAds.Migrator | [docker-entrypoint.sh](/src/ClassifiedAds.Projects/ClassifiedAds.Migrator/docker-entrypoint.sh) |
+  | ClassifiedAds.BackgroundServer | [docker-entrypoint.sh](/src/ClassifiedAds.Projects/ClassifiedAds.BackgroundServer/docker-entrypoint.sh) |
+  | ClassifiedAds.WebMVC | [docker-entrypoint.sh](/src/ClassifiedAds.Projects/ClassifiedAds.WebMVC/docker-entrypoint.sh) |
+
+  Otherwise you might encounter:
+  ```
+  exec user process caused "no such file or directory"
+  ```
+  Tip: Open Notepad++ -> Edit -> EOL Conversion -> Unix (LF)
+- Navigate to [ClassifiedAds.Projects](/src/ClassifiedAds.Projects/) and run:
+  ```
+  docker-compose build
+  docker-compose up
+  ```
+- Open Web MVC Home Page at: http://host.docker.internal:9003
+
+  ![alt text](/docs/imgs/web-mvc-home-page.png)
+
+- Navigate to Health Checks UI http://host.docker.internal:9003/healthchecks-ui#/healthchecks and make sure everything is green.
+
+  ![alt text](/docs/imgs/health-checks-ui-container.png)
+
+- Login on Identity Server:
+  + Use default created account: [email protected] / v*7Un8b4rcN@<-RN
+  + Register new account at http://host.docker.internal:9000/Account/Register
+
+- Open Blazor Home Page at: http://host.docker.internal:9008
+
+  ![alt text](/docs/imgs/blazor-home-page.png)
+
+## Application URLs:
+| Project  | Launch URL | Docker Container URL| Docker Container URL|
+| -------- | ---------- | ------------------- | ------------------- |
+| BackgroundServer | https://localhost:44318 | http://localhost:9004 | http://host.docker.internal:9004 |
+| Blazor | https://localhost:44331 | http://localhost:9008 | http://host.docker.internal:9008 |
+| GRPC | https://localhost:5001 | https://localhost:9005 | https://host.docker.internal:9005 |
+| IdentityServer | https://localhost:44367 | http://localhost:9000 | http://host.docker.internal:9000 |
+| NotificationServer | https://localhost:44390 | http://localhost:9001 | http://host.docker.internal:9001 |
+| WebAPI | https://localhost:44312 | http://localhost:9002 | http://host.docker.internal:9002 |
+| WebMVC | https://localhost:44364 | http://localhost:9003 | http://host.docker.internal:9003 |
+| GraphQL | [https://localhost:44392](https://localhost:44392/ui/playground) | [http://localhost:9006](http://localhost:9006/ui/playground) | [http://host.docker.internal:9006](http://host.docker.internal:9006/ui/playground) |
+| Ocelot | [https://localhost:44340](https://localhost:44340/ocelot/products) | [http://localhost:9007](http://localhost:9007/ocelot/products) | [http://host.docker.internal:9007](http://host.docker.internal:9007/ocelot/products) |

docs/Selenium/README.md

@@ -0,0 +1,7 @@
+[SeleniumHQ](https://www.seleniumhq.org/)
+
+[SeleniumHQ GitHub](https://github.com/SeleniumHQ)
+
+[Chrome Driver](http://chromedriver.storage.googleapis.com/index.html)
+
+[Automated Business Readable Web Tests with Selenium and SpecFlow | Jason Roberts | Pluralsight](https://app.pluralsight.com/library/courses/selenium-specflow-automated-business-readable-web-tests/table-of-contents)

docs/imgs/onion-architecture.drawio

@@ -1 +1 @@
-<mxfile host="www.draw.io" modified="2020-01-25T08:15:59.957Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" etag="sJHA_i0oIfQalDtvdThM" version="12.5.6"><diagram id="X8Ldh0YJBJTgAtryyvzB" name="Page-1">7Vpdc6M2FP01frQHEGD86I91mpntdKdpN5tHBQRoKxAj5Njur68E4lPEdhrb69lNHhx0JUA65x7dA/YILJPdHYNZ/DsNEBlZRrAbgdXIsjzXE58ysC8DtmuUgYjhoAyZTeAB/4tUsBq2wQHKOwM5pYTjrBv0aZoin3dikDG67Q4LKeneNYMR0gIPPiR69BEHPFbLcowm/hvCUVzd2TRUTwKrwSqQxzCg21YIfBqBJaOUl0fJbomIxK7CpTxv/UpvPTGGUn7KCY/3xnL1eZ483e2+fp1++9O1Z6sxcNTk+L5aMQoEAKqZ0lT8WzC6SQMkr2OIFmU8phFNIflMaSaCpgh+R5zvFX1ww6kIxTwhqhftMP/WOn5qHa926rpFY181Us728hRjYkyr9lPRtqtmc2bR6pz6BTGcII5YHQzmMh1E0ycwz7FfBteYVJPMOaP/1CwLfhYhTblak+mq9pISygqkgFH8ibhOhWInpxvmowP4K3VwyCLED/EEyoGSnNYdFNN3iIq1sr0YwBCBHL90sxcqEUT1uCZPxIFKlbekjXvzadPNGecXzBlrdls5M/3ImdvPGe+mckbN5gWSjbqTnkOECC8gU2cbY44eMlgAsRVupJsYMM9KgxDinUywRSgoaaEcej7y/ZqfVs+z59jOQfxfEONodxAw1TtTK1B2CChzsG28hVM5iLjlK+rg2SE2PQ3Ss2nQaGlQ6emACmvhqK2gUY3sD2AeF3My3yHZQmhqocNS/P8Sm50osbMrTJ36hWIx5TrRTLubaZbXy6ByouqsXhLV03hHXs2uut036XV8w++l0uG8+ylS5F07RP0Ac/3CfWzT+GDyTUzOrlhO1+u1tVyep2j29zJPr5r2UNW0L1c1jR8BZb98tX2jfSaoewbFHHAoYAhrcDmsgYb1PMsI9oViaCo6HhB7wT7KNQbEmnkX6q63U9tEG24VggRHqWj6Aknp7RcSQXFHMlcdCQ4C8hq33b3wCqxZbo81A2isme4Aa9bFSLM10v7OBZKWcS8RDSVevy5dXpcuR9eYaV2TrXoJDVt/oZzfqqIY5aX2wcp2jlDmnmlfdLqU2aY5UIOuSZmlUXafhgwKPjY+37BblVeLO2BeiTzbA13yrB9Nnl7SVjSBWFYz9RXKz2AmrJ5vMweMmzVkJqyLmQlLr0s18h8+QvMRQ5Xpqj7Cco6YvyUd2Ooa4MzjiukJxJ3OF7P1AL5D+HeFJf7OVG16PABzwIUP8WBfjAdX4+EPhiMsnvBbz8vzkeXCROKbPudZgYVLpHSwOIhKDXH5ze1czsZaf0dhyNA+gwSxhE58moigEL94bF4bU/HBYzSmqWB6DJkvaSxK21iAy8dmcY3y+uKwvsUty/eEl/zdNHt/LlV7buU1XT2VXHBVSetv9Vc6afrbmjZ/MczkuGQXyV8dTEJCt34skmISQA6f4auF8hStD5BTa/vc5DjTnq2cDrAzQI57MXL0d0RrTPQd9sie2idIUIL9SUD9TVKAdXNEuPa0u+POBirfkFUxL2ZVgG4SH9Fz41MOeMQKfp/QTXCCZ+xvczfHDjheD2uv0mZn+nZyRLP5UU75bUjzyybw6T8=</diagram></mxfile>
+<mxfile host="www.draw.io" modified="2020-01-26T16:18:30.740Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" etag="SBqKUMroKtMDfXQfKo37" version="12.5.8"><diagram id="X8Ldh0YJBJTgAtryyvzB" name="Page-1">7Vpbc5s4GP01fnSGu/GjL3U2M93ZzqbbNI8KCFBXIEbIsb2/fiUQFyFiO+NLPW38YKNPEkjnfJcDeGQv0u09BXnyJwkhHllGuB3Zy5Fl+Z7Pv4VhVxkc06wMMUVhZeoYHtF/UBoNaV2jEBbKQEYIZihXjQHJMhgwxQYoJRt1WESwetUcxFAzPAYA69YnFLJEbss1WvsfEMVJfWXTkD0pqAdLQ5GAkGw6JvvTyF5QQlh1lG4XEAvsalyqeas3epuFUZixYyY8PRiL5edZ+ny//fZt8v1vz5kux7YrF8d29Y5hyAGQzYxk/GdOyToLoTiPwVuEsoTEJAP4MyE5N5rc+AMytpP0gTUj3JSwFMteuEXse+f4uXO83Mrzlo1d3cgY3Ykpxp0xqdvPZdupm+3MsqVM/QIpSiGDtDGGM+EOvBlgUBQoqIwrhOtFFoySfxuWOT/ziGRM7sn0ZHtBMKElUrZRfrhdp0KyU5A1DeAe/GV0MEBjyPbxZFcDBTmdK0im7yHhe6U7PoBCDBh6Vb0XyCCIm3Gtn/AD6SrvcRvv5t1G9Rn3N/QZa3pbPjP58Jnb9xn/pnxGruYV4LW8ku5DGHMtIFxnkyAGH3NQArHhakR1DFDklUCI0FY42DzilHRQjvwABkHDT6fnxXcddy/+r5AyuN0LmOydyh1IOWRLcbBptYVbK4ikoysa49khNn0N0rPFoNGJQRlPe6KwCRyZCtqoEf0hKJJyTeYJIVsGmtyoHormSSE2PTLEzh5hcuoXgviSG0czHdXTLL/nQdVC5ayeEzXLOMGvpldN9617HU74PVfa73e/hIuclCGaG5jrF+5DSeODyXcxOb1iOV2tVtZicZ6i2c9lvl41naGq6Vyuaho/A8p++erqRudMUPcEijmgUOwhrO3LYW1rWM/yHKOARwzJeMcjpK8ogIXGAN8zU6FWtZ1ME124pQlgFGe8GXAkhbafCwT5FfFMdqQoDPFb3Kq58AqsWV6PNcPWWDO9Adasi5HmaKT9U3AkLeNBIBoJvH5funyVLlePMdO6JlvNFlq2vsKC3WpEUcKq2LeXjnuAMu9MedFVKWueYys16JqUWRplD1lEAedjHbA1vdXw6nBnm1ciz/FtlTzrZ5Onl7QlSQES1Uy+QvkVxITV023mgHCzhsSEdTExYel1qUH+Q0doOmKoMl1VR1juAfG3IAOprgXOPBwxvQDxJrP5dDWA7xD+amDxz5mqTY8H2xxQ4UM8OBfjwdN4+IuiGPE7/M798mxkeSAV+GYvRV5i4WEROogfxFUMMfHmdiZWY61+wCiicJcDDGlK7gKSciMPfn7bvDIm/IslcEwyzvQY0EDQWJa2MQeXjc3yHNX5+WFziVsO3yMe8qtudrov1Tm31pqe7kqefdWQ1p/qL3XS9LckXf4SkItx6TYW/zq4izDZBAl3irsQMPAC3iyUx8T6ADlNbGsPkPnpURZ/rZ5xnekdgTvpac3JAGUDjHkXY0x/cLRCWE+7BxJtnzXOEwruQhKs0xKsM7NzOhGeM1HT8HSgHA7pF/Ni+sXWleMTfGnFyx7hWMMfYLIOjxCS/dx3c+zYh4tkI2C67EzeTw5vtv/UqV6RtH93sj/9Dw==</diagram></mxfile>

docs/imgs/the-clean-architecture.drawio

@@ -1 +1 @@
-<mxfile host="www.draw.io" modified="2020-01-25T08:18:39.824Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" etag="tErgLp99ecTqMIeexCR2" version="12.5.6"><diagram id="X8Ldh0YJBJTgAtryyvzB" name="Page-1">3Vrbcto6FP0aHmFs+RLzGOyQZKZnmtNMm+SpI2wBaozFyCJAv/5ItnyVAyQ1xqd5yFhbliyttbXXlsTAcFe7WwrXy39IgMIB0ILdwPAGADi2w/8Lwz41mLaWGhYUB6lJLwyP+DeSxuy1DQ5QXHmRERIyvK4afRJFyGcVG6SUbKuvzUlY/eoaLpBiePRhqFqfcMCWclqWVtjvEF4ssy/rmqxZwexlaYiXMCDbksm4GRguJYSlT6udi0KBXYZL2m76Tm0+MIoidkqDp3vN9b5cr15udz9+XD1/s82xN5TsvMFwIycsB8v2GQK8Fw42L0y2S8zQ4xr6ombL6ea2JVuFvKTzRxivUwbmeIf4RydzHIYuCQlNOjICiJy5z+0xo+QVlWps30GzOa9R5ySn+YYoQ7uSSc7xFpEVYnTPX5G1lpG2kP5mSPS3BXlmRtGyRFxuhNJhFnnPBab8QcL6AYjHXUJsIScwmyB2wMyw7XYg1rUqxo6KsdGEsXE2jLNo0QnIc8dHvvDjOYnYo/yAnpXTCKY3kjBzLJNHjnZIqDm63uDpoIkFcD4WDIUFl0NCSRgiGiuE8ImyKvJVwCISoRr60gRDvIh40efwIW6fCNgwD9rXsmKFgyB8j2pKNlEgiPW0E0hsg6qrGlWaSpVuN1J1JqbyORRMeZOeEkQJgwwT0Yq7/GHCWgpw45qGgCYR6ZIuoND1/b7/dBn6sQXWEl+GXSPMsC5MmBoJbyKGGUZqGGxNl6bTKXDdbkIaqKUAekMOoDepj3429QGmukhi7s1Ac2HcgHs/lssl5Me6uPzYClVfKV7gCIqmMdlQAdj1QAzADgVLmD8sUrqY2PldiwGA6Swki5EfIhj5fONJRz5Zcesm4qbhjMz4M9B0MViNb3SmIj+ZsiUaJi2GkPqCHp9tKBolbiA/xt/Kv9dntykFUVEuhQIt+VPc6899ybQrrpTv5kuudKWPz+NKD3cr97e7/u6ypffzX2esxdAaNiQy6A37vV3vl5BHXRvX8k+jM3lsJE1NZ57QrP+EdZV+Gk4tYIML82Wp2cyOA5uG63uB8Rz2d8ldQGKNcYcS20iZqrC3kKEt3PeVpQusM93UK6yBsXPZdXalkPZAUZyA+z+grbvtHnCqq63hPOVcvN2uvegXA98wDTQHe3fuXnvOkpASOVWQCGVLsiA8Xn4hZC2B+YUY20tk4IaRKpccHbp/lu2TwosojKys6O3Kld4+LwXX4tqDF3ly7L+mpikWE0peSJ0ku8sAhxjJEvF3/VWmFQzSBWKHkjTZIQoqly0qwRSF3JveUGUYrdNlKXSJgWVOKxfJZzjbYfZcen4pPRd0icK+zN1zmfKXCqtHOZaDPUSxkDh/Q98Sb0zDBKQs68APYRxjPzPLXtRokpwvaJpz8PS6PYfR2naYpCmfNNyXXlgTHLG41PODMBSBxr6qbncMU6s5X9pj4Yr50D7vnapyT0NOFdDIfJDcc4oD9RPU4PQozzUG/4azpCvBr4SF92tNBpbHLSGcoXAC/ddFEtjKlyHJn7oDzZ3lyA700AJVFCG/5pWDHZRvUpuUYsgDpu6ACon5NcXHfEdxjqEJRlUdAvpIr3VD5vOYe3o9Yn3MTQ4tpaZc4YgaHTlm/PiVYuuHDE4tLzMbsmnQIPDmuQTeOEUx+qD5RTgvJEFXJOHPVD8LzsejOLiU7B8cd+P15N+2ZsymO8ZzrZmDSV/1PH6QHsdnR60zmh20ft2w9UaE1we+clplI7+vf/8+vm02bKN64tZpBDu4Fk9k4z76e8nodGk0yonKxRGMPyUmHW4Es5Sqx5LQSITZsa4XUv5SruuJrp9M4sW28wfHfXJo4yky9BlpV/N7ENiafqfSVmDjxeKnqukepvi9r3HzHw==</diagram></mxfile>
+<mxfile host="www.draw.io" modified="2020-01-26T16:16:02.348Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" etag="qGw_Gf9ssJR-oZCe8xaf" version="12.5.8"><diagram id="X8Ldh0YJBJTgAtryyvzB" name="Page-1">3Vpdc+IqGP41Xuok5KPxssbadmbPbM92dtte7WCCyjYGh2DV/fUHEvIJVduN0bO96ISXQOB5Xt7nBexZ/nJ7S+Fq8Q8JUdQDRrjtWeMeAJ7r8f/CsMsMtmtkhjnFYWYyS8Mj/o2kMX9tjUOU1F5khEQMr+rGgMQxCljNBiklm/prMxLVv7qCc6QYHgMYqdYnHLKFnJZjlPY7hOeL/MumIWuWMH9ZGpIFDMmmYrJuepZPCWHZ03Lro0hgl+OStZu8U1sMjKKYHdPg6d7wx1+uly+32x8/rp6/ufZw3JfsvMFoLScsB8t2OQK8Fw42L4w2C8zQ4woGombD6ea2BVtGvGTyR5isMgZmeIv4R0czHEU+iQhNO7JCiLxZwO0Jo+QVVWrcwEPTGa9R5ySn+YYoQ9uKSc7xFpElYnTHX5G1jpW1kP5mSfQ3JXl2TtGiQlxhhNJh5kXPJab8QcL6AYiHXULsIC+0dRB7YGq5bjsQm0YdY0/F2NJhbJ0M4zxadALyzAtQIPx4RmL2KD9g5uUsgplaEqaeY/PI0Q4JDUc3NZ4OdCyA07FgKSz4HBJKogjRRCGET5TVka8DFpMYNdCXJhjhecyLAYcPcftIwIZ50L6WFUschtF7VFOyjkNB7Ng4gsQ2qLpqUGWoVJmulqoTMVXMoWRqPLpQgihhkGEiWnGX309YSwFu2NAQoBORLukCCl3f7y+fLss8tMBa4styG4RZzpkJUyPhTcwww0gNg63p0mQyAb7fTUgDjRTA1OQApk59zJOpD7DVRcJhBYYPEw3sl7FazqE+ztnVx1WY+krxHMdQNE3ImgrArntiAG4kWML8YZ7RxcTG71oMAEymEZkPggjBOOD7TjoIyJJb1zE39adkyp+BYYrBGnyfMxHpyYQtUD9t0Yc0EPQEbE3RIHUD+TH+VvG9S3abSgwV5UokMNI/xb3+3Jdst+ZKxWa+4kpX5vA0rvRwt/R/+6vvPluMf/7rDY0EOn1NHoPecHCx6/0c6mgaw0b6aXWmjlrS1GzmCU0vn7Cusk/LawRscGa+HDWZ2XJgs3B9LzCewctdcmeQWGvYocRqKVMV9hYytIG7S2XpDOvMtM0aa2DonXedXSmkPVCUpOD+D2jrbrcHvPpq0xynnIq329U4/sXAN0xDw8PjO39nPOdJSIWcOkiEsgWZEx4vvxCyksD8QoztJDJwzUidS44O3T3L9mnhRRQGTl4cb6uV411RCq/FrQcv8uQ4eM1MEywmlL6QOUl+lQH2MZIn4u/6q0wrGKRzxPYlabJDFNbuWlSCKYq4N72h2jBap8tR6BIDy51WLpLPcLbF7Lny/FJ5LukShV2Vu+cq5S81Vg9yLAe7j2IhccGavqXemIUJSFneQRDBJMFBbpa9qNEkPV4wDG/v4XV7DmO07TBpUz5puKu8sCI4Zkml5wdhKAONe1Xf7li20XC+rMfSFYuhfd47VeWeRJwqYJBZL73mFOfpR6jB8VGeawz+DadpV4JfCQvv1xn1nDG3RHCKohEMXudpYKvehaR/6g60cJYDO9B9C1RRhOKWVw62V71I1SlFnwdM0wM1Eotbio/5juIcfRsM6joEzIHZ6IbMZgn39GbE+pib7FtKulzhgBodOGX8+I1i64cMXiMvszXZNNAIvH0qgbeOUYxL0PwynJeSYCqS8Geqnwfnw1EcnEv2945bezv5t60ZW3fFeKo1szfp0x7H50etU5oftH5ds9VahNcHvnJaZaO4rn//Or5tNlyrfuLWaQTbuxaPZOM+/nvJ6HRpaOVE5eIAxp8Skw43gnlKdcGSoCXC7ljXSyl/qdZdiK4fTeLZtvN7x310aOMpMgwYaVfzLyCw6X6m0lZg48Xyl6rZHqb8ua918x8=</diagram></mxfile>

src/ClassifiedAds.Projects/ClassifiedAds.ApplicationServices/ServiceCollectionExtensions.cs → src/ClassifiedAds.Projects/ClassifiedAds.Application/ApplicationServicesExtensions.cs

@@ -1,21 +1,22 @@
-using ClassifiedAds.ApplicationServices;
-using ClassifiedAds.ApplicationServices.Commands;
-using ClassifiedAds.ApplicationServices.Decorators;
-using ClassifiedAds.ApplicationServices.Queries;
+using ClassifiedAds.Application;
+using ClassifiedAds.Application.Commands;
+using ClassifiedAds.Application.Decorators;
+using ClassifiedAds.Application.Queries;
+using ClassifiedAds.Domain.Events;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
-    public static class ApplicationServicesServiceCollectionExtensions
+    public static class ApplicationServicesExtensions
     {
         public static IServiceCollection AddMessageHandlers(this IServiceCollection services)
         {
             services.AddScoped<Dispatcher>();
 
-            List<Type> handlerTypes = typeof(ICommand).Assembly.GetTypes()
+            List<Type> handlerTypes = Assembly.GetExecutingAssembly().GetTypes()
                 .Where(x => x.GetInterfaces().Any(y => IsHandlerInterface(y)))
                 .Where(x => x.Name.EndsWith("Handler"))
                 .ToList();
@@ -25,9 +26,30 @@ public static IServiceCollection AddMessageHandlers(this IServiceCollection serv
                 AddHandler(services, type);
             }
 
+            services.AddEventHandlers();
+
             return services;
         }
 
+        public static IServiceCollection AddEventHandlers(this IServiceCollection services)
+        {
+            var types = Assembly.GetExecutingAssembly().GetTypes()
+                    .Where(x => x.GetInterfaces().Any(y => y.IsGenericType && y.GetGenericTypeDefinition() == typeof(IDomainEventHandler<>)))
+                    .ToList();
+
+            foreach (Type type in types)
+            {
+                services.AddTransient(type);
+            }
+
+            return services;
+        }
+
+        public static void RegisterDomainEventHandlers(this IServiceProvider serviceProvider)
+        {
+            DomainEvents.RegisterHandlers(Assembly.GetExecutingAssembly(), serviceProvider);
+        }
+
         private static void AddHandler(IServiceCollection services, Type type)
         {
             object[] attributes = type.GetCustomAttributes(false);
@@ -90,11 +112,15 @@ private static object GetParameter(ParameterInfo parameterInfo, object current,
             Type parameterType = parameterInfo.ParameterType;
 
             if (IsHandlerInterface(parameterType))
+            {
                 return current;
+            }
 
             object service = provider.GetService(parameterType);
             if (service != null)
+            {
                 return service;
+            }
 
             throw new ArgumentException($"Type {parameterType} not found");
         }
@@ -104,18 +130,24 @@ private static Type ToDecorator(object attribute)
             Type type = attribute.GetType();
 
             if (type == typeof(DatabaseRetryAttribute))
+            {
                 return typeof(DatabaseRetryDecorator<>);
+            }
 
             if (type == typeof(AuditLogAttribute))
+            {
                 return typeof(AuditLogDecorator<>);
+            }
 
             throw new ArgumentException(attribute.ToString());
         }
 
         private static bool IsHandlerInterface(Type type)
         {
             if (!type.IsGenericType)
+            {
                 return false;
+            }
 
             Type typeDefinition = type.GetGenericTypeDefinition();
 

src/ClassifiedAds.Projects/ClassifiedAds.ApplicationServices/ClassifiedAds.ApplicationServices.csproj → src/ClassifiedAds.Projects/ClassifiedAds.Application/ClassifiedAds.Application.csproj

@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>ClassifiedAds.ApplicationServices</RootNamespace>
-    <CodeAnalysisRuleSet>ClassifiedAds.ApplicationServices.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>ClassifiedAds.Application.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ClassifiedAds.DomainServices\ClassifiedAds.DomainServices.csproj" />
+    <ProjectReference Include="..\ClassifiedAds.Domain\ClassifiedAds.Domain.csproj" />
   </ItemGroup>
 
 </Project>

src/ClassifiedAds.Projects/ClassifiedAds.ApplicationServices/Commands/ICommand.cs → src/ClassifiedAds.Projects/ClassifiedAds.Application/Commands/ICommand.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace ClassifiedAds.ApplicationServices.Commands
+namespace ClassifiedAds.Application.Commands
 {
     public interface ICommand
     {

src/ClassifiedAds.Projects/ClassifiedAds.ApplicationServices/Commands/ICommandHandler.cs → src/ClassifiedAds.Projects/ClassifiedAds.Application/Commands/ICommandHandler.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace ClassifiedAds.ApplicationServices.Commands
+namespace ClassifiedAds.Application.Commands
 {
     public interface ICommandHandler<TCommand>
         where TCommand : ICommand

src/ClassifiedAds.Projects/ClassifiedAds.ApplicationServices/Decorators/AuditLogAttribute.cs → src/ClassifiedAds.Projects/ClassifiedAds.Application/Decorators/AuditLogAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ClassifiedAds.ApplicationServices.Decorators
+namespace ClassifiedAds.Application.Decorators
 {
     [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
     public sealed class AuditLogAttribute : Attribute

src/ClassifiedAds.Projects/ClassifiedAds.ApplicationServices/Decorators/AuditLogDecorator.cs → src/ClassifiedAds.Projects/ClassifiedAds.Application/Decorators/AuditLogDecorator.cs

@@ -1,8 +1,8 @@
 using System;
 using Newtonsoft.Json;
-using ClassifiedAds.ApplicationServices.Commands;
+using ClassifiedAds.Application.Commands;
 
-namespace ClassifiedAds.ApplicationServices.Decorators
+namespace ClassifiedAds.Application.Decorators
 {
     public class AuditLogDecorator<TCommand> : ICommandHandler<TCommand>
         where TCommand : ICommand

src/ClassifiedAds.Projects/ClassifiedAds.ApplicationServices/Decorators/AuditLoggingDecorator.cs → src/ClassifiedAds.Projects/ClassifiedAds.Application/Decorators/AuditLoggingDecorator.cs

@@ -1,8 +1,8 @@
 using System;
 using Newtonsoft.Json;
-using ClassifiedAds.ApplicationServices.Commands;
+using ClassifiedAds.Application.Commands;
 
-namespace ClassifiedAds.ApplicationServices.Decorators
+namespace ClassifiedAds.Application.Decorators
 {
     public sealed class AuditLoggingDecorator<TCommand> : ICommandHandler<TCommand>
         where TCommand : ICommand