Merge pull request #52 from Informatievlaanderen/feat/or-1213_basic_c…

…reate_vereniging Feat/or 1213 basic create vereniging
Informatievlaanderen · Oct 13, 2022 · 287c98d · 287c98d
2 parents 20dc478 + 0f71a8e
commit 287c98d
Show file tree

Hide file tree

Showing 138 changed files with 1,437 additions and 3,639 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,10 +26,19 @@ jobs:
       acm:
         image: ghcr.io/informatievlaanderen/identity-server-fake:033d00a
         ports:
-          - "5051:80"
+          - 5051:80
         volumes:
           - ${{ github.workspace }}/identityserver:/home/identityserver
 
+      db:
+        image: postgres
+        env:
+          POSTGRES_USER: root
+          POSTGRES_PASSWORD: root
+          POSTGRES_DB: verenigingsregister
+        ports:
+          - 5432:5432
+
     outputs:
       version: ${{ steps.set-version.outputs.version }}
 

diff --git a/.github/workflows/pre-merge-tests.yml b/.github/workflows/pre-merge-tests.yml
@@ -26,10 +26,19 @@ jobs:
       acm:
         image: ghcr.io/informatievlaanderen/identity-server-fake:033d00a
         ports:
-          - "5051:80"
+          - 5051:80
         volumes:
           - ${{ github.workspace }}/identityserver:/home/identityserver
 
+      db:
+        image: postgres
+        env:
+          POSTGRES_USER: root
+          POSTGRES_PASSWORD: root
+          POSTGRES_DB: verenigingsregister
+        ports:
+          - 5432:5432
+
     steps:
     - name: Checkout Code
       uses: actions/checkout@v3

diff --git a/AssociationRegistry.sln b/AssociationRegistry.sln
@@ -43,10 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssociationRegistry.Public.Api", "src\AssociationRegistry.Public.Api\AssociationRegistry.Public.Api.csproj", "{EC780706-D1C5-46DA-A9EA-1691E3C5052A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{FA18A1E7-4ED1-4FA0-8A25-877A7207BEFD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer", "src\IdentityServer\IdentityServer.csproj", "{B83E79CF-359E-47DA-91C7-42C091A1B5E5}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "identityserver", "identityserver", "{D4AE63B8-9A67-43E5-865B-8E40BD1335CD}"
 	ProjectSection(SolutionItems) = preProject
 		identityserver\acm.json = identityserver\acm.json
@@ -58,6 +54,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "minio", "minio", "{A5715AC1
 		minio\data.json = minio\data.json
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssociationRegistry.Admin.Api", "src\AssociationRegistry.Admin.Api\AssociationRegistry.Admin.Api.csproj", "{DAF6443B-10E9-4847-9E1F-DBE275E8C750}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,19 +77,19 @@ Global
 		{EC780706-D1C5-46DA-A9EA-1691E3C5052A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC780706-D1C5-46DA-A9EA-1691E3C5052A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC780706-D1C5-46DA-A9EA-1691E3C5052A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B83E79CF-359E-47DA-91C7-42C091A1B5E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B83E79CF-359E-47DA-91C7-42C091A1B5E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B83E79CF-359E-47DA-91C7-42C091A1B5E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B83E79CF-359E-47DA-91C7-42C091A1B5E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAF6443B-10E9-4847-9E1F-DBE275E8C750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAF6443B-10E9-4847-9E1F-DBE275E8C750}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAF6443B-10E9-4847-9E1F-DBE275E8C750}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAF6443B-10E9-4847-9E1F-DBE275E8C750}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{3BD77833-6175-4440-903D-88F9B07C6FE6} = {1157AB42-EACF-454D-92D5-DBA9FF3D0E24}
 		{B5A6597C-4BCF-4680-B2EB-23AB7182F64E} = {C812C887-6495-405A-8B99-4F686D243126}
 		{75DFC6A3-90CB-4041-B122-8546DCD4D7F6} = {C9AFE263-FC5F-4243-BC1F-737B0CCB6DE6}
 		{11DA6C2C-FBC0-4537-A4F8-2C7F546BB8CA} = {75DFC6A3-90CB-4041-B122-8546DCD4D7F6}
 		{EC780706-D1C5-46DA-A9EA-1691E3C5052A} = {1157AB42-EACF-454D-92D5-DBA9FF3D0E24}
-		{B83E79CF-359E-47DA-91C7-42C091A1B5E5} = {FA18A1E7-4ED1-4FA0-8A25-877A7207BEFD}
 		{D4AE63B8-9A67-43E5-865B-8E40BD1335CD} = {C9AFE263-FC5F-4243-BC1F-737B0CCB6DE6}
 		{A5715AC1-4220-431A-B298-BCA9D857870B} = {C9AFE263-FC5F-4243-BC1F-737B0CCB6DE6}
+		{DAF6443B-10E9-4847-9E1F-DBE275E8C750} = {1157AB42-EACF-454D-92D5-DBA9FF3D0E24}
 	EndGlobalSection
 EndGlobal
diff --git a/AssociationRegistry.sln.DotSettings b/AssociationRegistry.sln.DotSettings
@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ACM/@EntryIndexedValue">ACM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_aaBb" /&gt;</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=SolutionInfo_002Ecs/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ecss/@EntryIndexedValue">True</s:Boolean>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,5 +18,21 @@ services:
        - ./identityserver:/home/identityserver
      ports:
        - "5051:80"
+
+   db:
+     container_name: pg_container
+     image: postgres
+     restart: always
+     environment:
+       POSTGRES_USER: root
+       POSTGRES_PASSWORD: root
+       POSTGRES_DB: verenigingsregister
+     ports:
+       - "5432:5432"
+     volumes:
+       - pg-data:/var/lib/postgresql/data
+
 volumes:
   minio-data:
+  pg-data:
+  pg-admin-data:
diff --git a/identityserver/acm.json b/identityserver/acm.json
@@ -9,7 +9,6 @@
     }
   ],
   "apiScopes": [
-    "vo_info",
     "dv_verenigingsregister_hoofdvertegenwoordigers"
   ],
   "apiResources": [
@@ -19,30 +18,33 @@
         "a_very=Secr3t*Key"
       ],
       "scopes": [
-        "vo_info",
         "dv_verenigingsregister_hoofdvertegenwoordigers"
       ]
-    },
+    }
+  ],
+  "clients": [
     {
-      "name": "acmClient",
-      "apiSecrets": [
-        "secret"
+      "clientId": "association-registry-local-dev",
+      "clientSecrets": [
+        "a_very=Secr3t*Key"
       ],
-      "scopes": [
+      "allowedGrantTypes": "code",
+      "allowedScopes":[
+        "standardscopes.openid",
+        "standardscopes.profile",
         "vo_info",
         "dv_verenigingsregister_hoofdvertegenwoordigers"
-      ]
-    }
-  ],
-  "clients": [
+      ],
+      "alwaysSendClientClaims": true,
+      "alwaysIncludeUserClaimsInIdToken": true
+    },
     {
       "clientId": "acmClient",
       "clientSecrets": [
         "secret"
       ],
       "allowedGrantTypes": "clientCredentials",
       "allowedScopes":[
-        "vo_info",
         "dv_verenigingsregister_hoofdvertegenwoordigers"
       ],
       "accessTokenLifetime": -1,

diff --git a/identityserver/acm.json.doesntwork.bak b/identityserver/acm.json.doesntwork.bak
diff --git a/paket.dependencies b/paket.dependencies
@@ -70,6 +70,13 @@ nuget Structurizr.Core 0.9.7
 nuget Structurizr.Client 0.9.7
 nuget Structurizr.AdrTools 0.9.3
 
+// MARTEN
+nuget Marten 5.10.1
+
+// MediatR
+nuget MediatR 11.0.0
+nuget MediatR.Extensions.Microsoft.DependencyInjection 11.0.0
+
 // TEST STUFF
 nuget Microsoft.AspNetCore.Mvc.Testing 6.0.4
 nuget Microsoft.AspNetCore.TestHost 6.0.4