diff --git a/.env b/.env
index 2c0ee7f..4f83fd2 100644
--- a/.env
+++ b/.env
@@ -1,10 +1,11 @@
-NAME=dc-project
+APP_NAME=dc-project
 
 DATABASE_URL=jdbc:postgresql:dc-project
 
 APP_PORT=8080
 OPENAPI_PORT=8181
 SONARQUBE_PORT=9002
+SONARQUBE_DB_PORT=5434
 
 ELASTIC_REST=9200
 ELASTIC_NODES=9300
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0dfa848..2ce15a4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,34 +1,79 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
+        <value />
       </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <PostgresCodeStyleSettings version="2">
-      <option name="myVersion" value="2" />
+    <SqlCodeStyleSettings version="5">
       <option name="KEYWORD_CASE" value="1" />
       <option name="IDENTIFIER_CASE" value="1" />
-      <option name="TYPE_CASE" value="1" />
-      <option name="ALIAS_CASE" value="1" />
-    </PostgresCodeStyleSettings>
+      <option name="TYPE_CASE" value="4" />
+      <option name="ALIAS_CASE" value="4" />
+      <option name="BUILT_IN_CASE" value="4" />
+      <option name="QUOTE_IDENTIFIER" value="1" />
+      <option name="QUERY_EL_LINE" value="0" />
+      <option name="QUERY_IN_ONE_STRING" value="3" />
+      <option name="SUBQUERY_CONTENT" value="2" />
+      <option name="SUBQUERY_CLOSING" value="2" />
+      <option name="INSERT_OPENING" value="4" />
+      <option name="INSERT_CLOSING" value="0" />
+      <option name="INSERT_VALUES_EL_LINE" value="101" />
+      <option name="INSERT_COLLAPSE_MULTI_ROW_VALUES" value="true" />
+      <option name="SET_EL_LINE" value="1" />
+      <option name="SET_EL_WRAP" value="0" />
+      <option name="WITH_EL_LINE" value="101" />
+      <option name="WITH_EL_WRAP" value="2" />
+      <option name="SELECT_EL_LINE" value="101" />
+      <option name="SELECT_EL_COMMA" value="2" />
+      <option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
+      <option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="4" />
+      <option name="SELECT_USE_AS_WORD" value="1" />
+      <option name="FROM_EL_LINE" value="1" />
+      <option name="FROM_EL_COMMA" value="2" />
+      <option name="FROM_ALIGN_JOIN_TABLES" value="true" />
+      <option name="FROM_INDENT_JOIN" value="false" />
+      <option name="FROM_PLACE_ON" value="10" />
+      <option name="WHERE_EL_LINE" value="1" />
+      <option name="WHERE_EL_WRAP" value="3" />
+      <option name="ORDER_EL_LINE" value="101" />
+      <option name="ORDER_EL_WRAP" value="1" />
+      <option name="ORDER_EL_COMMA" value="2" />
+    </SqlCodeStyleSettings>
+    <codeStyleSettings language="SQL">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <indentOptions>
+        <option name="SMART_TABS" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 79ee123..0f7bc51 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -2,4 +2,4 @@
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </state>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 3a052ac..2b2a567 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -11,7 +11,14 @@
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://localhost:5432/test</jdbc-url>
+      <jdbc-url>jdbc:postgresql://localhost:5433/test</jdbc-url>
+    </data-source>
+    <data-source source="LOCAL" name="sonar@localhost" uuid="ee78beab-120d-4740-ad21-d4d9e2121d25">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://localhost:5433/sonar</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9377824..592fdc7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,8 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -13,7 +13,6 @@
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ad1f18e..1746d8a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,4 +10,7 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="TaskProjectConfiguration">
+    <server type="GitHub" url="https://github.com" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
new file mode 100644
index 0000000..6a6b371
--- /dev/null
+++ b/.idea/runConfigurations/All_Tests.xml
@@ -0,0 +1,37 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Tests" type="JUnit" factoryName="JUnit" singleton="false" show_console_on_std_err="true">
+    <useClassPathOnly />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="fr.dcproject.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <option name="ALTERNATIVE_JRE_PATH" value="corretto-11" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -Djdk.attach.allowAttachSelf=true" />
+    <option name="PARAMETERS" value="" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="wholeProject" />
+    </option>
+    <envs>
+      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
+    </envs>
+    <dir value="$PROJECT_DIR$" />
+    <patterns>
+      <pattern testClass="unit..*" />
+      <pattern testClass="functional..*" />
+      <pattern testClass="integration..*" />
+    </patterns>
+    <tag value="!functional" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="SQL Fixtures on DEV" run_configuration_type="ShConfigurationType" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Lint Format" run_configuration_type="GradleRunConfiguration" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Article_Tests.xml b/.idea/runConfigurations/Article_Tests.xml
deleted file mode 100644
index c3bf9d4..0000000
--- a/.idea/runConfigurations/Article_Tests.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Article Tests" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@article&quot; -Dstrict" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Auth_Tests.xml b/.idea/runConfigurations/Auth_Tests.xml
deleted file mode 100644
index 3b6663b..0000000
--- a/.idea/runConfigurations/Auth_Tests.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Auth Tests" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@auth&quot;" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build_and_start_all_Docker.xml b/.idea/runConfigurations/Build_and_start_all_Docker.xml
index e3012ae..3248709 100644
--- a/.idea/runConfigurations/Build_and_start_all_Docker.xml
+++ b/.idea/runConfigurations/Build_and_start_all_Docker.xml
@@ -2,6 +2,7 @@
   <configuration default="false" name="Build and start all Docker" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
     <deployment type="docker-compose.yml">
       <settings>
+        <option name="envFilePath" value="" />
         <option name="envVars">
           <list>
             <DockerEnvVarImpl>
@@ -11,6 +12,11 @@
           </list>
         </option>
         <option name="commandLineOptions" value="--build" />
+        <option name="secondarySourceFiles">
+          <list>
+            <option value="docker-compose-sonar.yml" />
+          </list>
+        </option>
         <option name="services">
           <list>
             <option value="app" />
@@ -23,6 +29,8 @@
           </list>
         </option>
         <option name="sourceFilePath" value="docker-compose.yml" />
+        <option name="upExitCodeFromService" value="" />
+        <option name="upTimeout" value="" />
       </settings>
     </deployment>
     <method v="2" />
diff --git a/.idea/runConfigurations/Check.xml b/.idea/runConfigurations/Check.xml
deleted file mode 100644
index eb90d35..0000000
--- a/.idea/runConfigurations/Check.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Check" type="CompoundRunConfigurationType">
-    <toRun name="Unit Tests (offline)" type="JUnit" />
-    <toRun name="Cucumber Tests (offline)" type="JUnit" />
-    <toRun name="Test All SQL" type="ShConfigurationType" />
-    <toRun name="Lint" type="GradleRunConfiguration" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Citizen_Tests.xml b/.idea/runConfigurations/Citizen_Tests.xml
deleted file mode 100644
index fbe19ae..0000000
--- a/.idea/runConfigurations/Citizen_Tests.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Citizen Tests" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@citizen&quot;" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Constitution_Tests.xml b/.idea/runConfigurations/Constitution_Tests.xml
deleted file mode 100644
index 89e53aa..0000000
--- a/.idea/runConfigurations/Constitution_Tests.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Constitution Tests" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@constitution&quot;" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Cucumber_Tests.xml b/.idea/runConfigurations/Cucumber_Tests.xml
deleted file mode 100644
index f04a1ea..0000000
--- a/.idea/runConfigurations/Cucumber_Tests.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Cucumber Tests" type="JUnit" factoryName="JUnit">
-    <output_file path="$PROJECT_DIR$/var/log/test/cucumber.out.log" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Djdk.attach.allowAttachSelf=true" />
-    <option name="PARAMETERS" value="" />
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Cucumber_Tests__offline_.xml b/.idea/runConfigurations/Cucumber_Tests__offline_.xml
deleted file mode 100644
index 5c7d3d1..0000000
--- a/.idea/runConfigurations/Cucumber_Tests__offline_.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Cucumber Tests (offline)" type="JUnit" factoryName="JUnit" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="fr.dcproject.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot; not @online&quot; -Djdk.attach.allowAttachSelf=true" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Down_Docker.xml b/.idea/runConfigurations/Down_Docker.xml
new file mode 100644
index 0000000..895be77
--- /dev/null
+++ b/.idea/runConfigurations/Down_Docker.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Down Docker" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="testComposeDownForced" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Follow_Tests.xml b/.idea/runConfigurations/Follow_Tests.xml
deleted file mode 100644
index 9e62c70..0000000
--- a/.idea/runConfigurations/Follow_Tests.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Follow Tests" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@follow&quot;" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Unit_Tests__offline_.xml b/.idea/runConfigurations/Functional_Tests.xml
similarity index 71%
rename from .idea/runConfigurations/Unit_Tests__offline_.xml
rename to .idea/runConfigurations/Functional_Tests.xml
index 159a284..511a555 100644
--- a/.idea/runConfigurations/Unit_Tests__offline_.xml
+++ b/.idea/runConfigurations/Functional_Tests.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Unit Tests (offline)" type="JUnit" factoryName="JUnit" show_console_on_std_err="true">
+  <configuration default="false" name="Functional Tests" type="JUnit" factoryName="JUnit" show_console_on_std_err="true">
     <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
     <useClassPathOnly />
     <option name="PACKAGE_NAME" value="fr.dcproject" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="tags" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.options=&quot;--tags ~@online&quot; -Djdk.attach.allowAttachSelf=true" />
+    <option name="VM_PARAMETERS" value="-ea -Djdk.attach.allowAttachSelf=true" />
     <option name="PARAMETERS" value="" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
@@ -15,7 +15,7 @@
       <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
     </envs>
     <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
+    <tag value="functional" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Voter_Tests.xml b/.idea/runConfigurations/Functional_Tests__offline_.xml
similarity index 69%
rename from .idea/runConfigurations/Voter_Tests.xml
rename to .idea/runConfigurations/Functional_Tests__offline_.xml
index b4f5040..5dae781 100644
--- a/.idea/runConfigurations/Voter_Tests.xml
+++ b/.idea/runConfigurations/Functional_Tests__offline_.xml
@@ -1,13 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Voter Tests" type="JUnit" factoryName="JUnit" show_console_on_std_err="true">
+  <configuration default="false" name="Functional Tests (offline)" type="JUnit" factoryName="JUnit" show_console_on_std_err="true">
     <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
     <useClassPathOnly />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="fr.dcproject.security.voter.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
     <option name="PACKAGE_NAME" value="fr.dcproject" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
@@ -21,7 +15,7 @@
       <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
     </envs>
     <dir value="$PROJECT_DIR$" />
-    <tag value="voter" />
+    <tag value="functional&amp;!online" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Opinion_Tests.xml b/.idea/runConfigurations/Integration_Tests.xml
similarity index 56%
rename from .idea/runConfigurations/Opinion_Tests.xml
rename to .idea/runConfigurations/Integration_Tests.xml
index 2930b4e..487e5a2 100644
--- a/.idea/runConfigurations/Opinion_Tests.xml
+++ b/.idea/runConfigurations/Integration_Tests.xml
@@ -1,13 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Opinion Tests" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
+  <configuration default="false" name="Integration Tests" type="JUnit" factoryName="JUnit" singleton="false" show_console_on_std_err="true">
     <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
     <useClassPathOnly />
+    <option name="ALTERNATIVE_JRE_PATH" value="corretto-11" />
     <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
+    <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@opinion&quot;" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -Djdk.attach.allowAttachSelf=true" />
     <option name="PARAMETERS" value="" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
@@ -16,7 +16,10 @@
       <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
     </envs>
     <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
+    <patterns>
+      <pattern testClass="integration..*" />
+    </patterns>
+    <tag value="!functional" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Lint.xml b/.idea/runConfigurations/Lint.xml
deleted file mode 100644
index e320150..0000000
--- a/.idea/runConfigurations/Lint.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Lint" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="ktlintCheck" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
-      </ENTRIES>
-    </extension>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Lint_Format.xml b/.idea/runConfigurations/Lint_Format.xml
new file mode 100644
index 0000000..32ba163
--- /dev/null
+++ b/.idea/runConfigurations/Lint_Format.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Lint Format" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="ktlintFormat" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Lint_Test_Sonar___Run.xml b/.idea/runConfigurations/Lint_Test_Sonar___Run.xml
deleted file mode 100644
index 9ba45b3..0000000
--- a/.idea/runConfigurations/Lint_Test_Sonar___Run.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Lint+Test+Sonar &amp; Run" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-        </map>
-      </option>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="run" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
-      </ENTRIES>
-    </extension>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2">
-      <option name="RunConfigurationTask" enabled="true" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Sonarqube" run_configuration_type="GradleRunConfiguration" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Lint__Test___Run.xml b/.idea/runConfigurations/Lint__Test___Run.xml
deleted file mode 100644
index 71edebc..0000000
--- a/.idea/runConfigurations/Lint__Test___Run.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Lint, Test &amp; Run" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-        </map>
-      </option>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="run" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
-      </ENTRIES>
-    </extension>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2">
-      <option name="RunConfigurationTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Mark_as__error.xml b/.idea/runConfigurations/Mark_as__error.xml
deleted file mode 100644
index b04cef0..0000000
--- a/.idea/runConfigurations/Mark_as__error.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Mark as @error" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@error&quot; -Dstrict" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Migration.xml b/.idea/runConfigurations/Migration.xml
new file mode 100644
index 0000000..3159aef
--- /dev/null
+++ b/.idea/runConfigurations/Migration.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Migration" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="migration" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Reset_DB_on_DEV.xml b/.idea/runConfigurations/Reset_DB_on_DEV.xml
index b84b8e5..15c96a7 100644
--- a/.idea/runConfigurations/Reset_DB_on_DEV.xml
+++ b/.idea/runConfigurations/Reset_DB_on_DEV.xml
@@ -6,8 +6,10 @@
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
     <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/src/main/resources/sql" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
-    <option name="INTERPRETER_PATH" value="C:/Program Files/Git/bin/bash.exe" />
+    <option name="INTERPRETER_PATH" value="$PROJECT_DIR$/../../../../Program Files/Git/bin/bash.exe" />
     <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <envs />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run_dependencies.xml b/.idea/runConfigurations/Run_dependencies.xml
index 84ae74c..d920570 100644
--- a/.idea/runConfigurations/Run_dependencies.xml
+++ b/.idea/runConfigurations/Run_dependencies.xml
@@ -2,6 +2,7 @@
   <configuration default="false" name="Run dependencies" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
     <deployment type="docker-compose.yml">
       <settings>
+        <option name="envFilePath" value="" />
         <option name="envVars">
           <list>
             <DockerEnvVarImpl>
@@ -11,6 +12,11 @@
           </list>
         </option>
         <option name="commandLineOptions" value="--build" />
+        <option name="secondarySourceFiles">
+          <list>
+            <option value="docker-compose-sonar.yml" />
+          </list>
+        </option>
         <option name="services">
           <list>
             <option value="db" />
@@ -18,9 +24,13 @@
             <option value="rabbitmq" />
             <option value="redis" />
             <option value="openapi" />
+            <option value="sonarqube" />
+            <option value="sonarqube_db" />
           </list>
         </option>
         <option name="sourceFilePath" value="docker-compose.yml" />
+        <option name="upExitCodeFromService" value="" />
+        <option name="upTimeout" value="" />
       </settings>
     </deployment>
     <method v="2" />
diff --git a/.idea/runConfigurations/Run_for_dev.xml b/.idea/runConfigurations/Run_for_dev.xml
deleted file mode 100644
index 6f3d752..0000000
--- a/.idea/runConfigurations/Run_for_dev.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run for dev" type="CompoundRunConfigurationType">
-    <toRun name="Run dependencies" type="docker-deploy" />
-    <toRun name="Run" type="GradleRunConfiguration" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/SQL_Fixtures_on_DEV.xml b/.idea/runConfigurations/SQL_Fixtures_on_DEV.xml
index 03ce960..9edcdcd 100644
--- a/.idea/runConfigurations/SQL_Fixtures_on_DEV.xml
+++ b/.idea/runConfigurations/SQL_Fixtures_on_DEV.xml
@@ -6,8 +6,10 @@
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
     <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/src/main/resources/sql/fixtures/" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
-    <option name="INTERPRETER_PATH" value="C:/Program Files/Git/bin/bash.exe" />
+    <option name="INTERPRETER_PATH" value="$PROJECT_DIR$/../../../../Program Files/Git/bin/bash.exe" />
     <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <envs />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Sonarqube.xml b/.idea/runConfigurations/Sonarqube.xml
index 108a92a..af093fa 100644
--- a/.idea/runConfigurations/Sonarqube.xml
+++ b/.idea/runConfigurations/Sonarqube.xml
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-x test" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -15,7 +15,9 @@
       </option>
       <option name="vmOptions" value="" />
     </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Sonarqube_without_test.xml b/.idea/runConfigurations/Sonarqube_without_test.xml
new file mode 100644
index 0000000..1774008
--- /dev/null
+++ b/.idea/runConfigurations/Sonarqube_without_test.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Sonarqube without test" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-x test -x ktlintKotlinScriptCheck -x ktlintTestSourceSetCheck -x ktlintMainSourceSetCheck" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="sonarqube" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_Db.xml b/.idea/runConfigurations/Start_Db.xml
deleted file mode 100644
index 67a8728..0000000
--- a/.idea/runConfigurations/Start_Db.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start Db" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="envVars">
-          <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="SEND_GRID_KEY" />
-              <option name="value" value="$SEND_GRID_KEY$" />
-            </DockerEnvVarImpl>
-          </list>
-        </option>
-        <option name="commandLineOptions" value="--build" />
-        <option name="services">
-          <list>
-            <option value="db" />
-          </list>
-        </option>
-        <option name="sourceFilePath" value="docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_Elasticsearch.xml b/.idea/runConfigurations/Start_Elasticsearch.xml
deleted file mode 100644
index 09a1592..0000000
--- a/.idea/runConfigurations/Start_Elasticsearch.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start Elasticsearch" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="commandLineOptions" value="--build" />
-        <option name="services">
-          <list>
-            <option value="elasticsearch" />
-          </list>
-        </option>
-        <option name="sourceFilePath" value="docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_RabbitMQ.xml b/.idea/runConfigurations/Start_RabbitMQ.xml
deleted file mode 100644
index f3501bf..0000000
--- a/.idea/runConfigurations/Start_RabbitMQ.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start RabbitMQ" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="envVars">
-          <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="SEND_GRID_KEY" />
-              <option name="value" value="$SEND_GRID_KEY$" />
-            </DockerEnvVarImpl>
-          </list>
-        </option>
-        <option name="commandLineOptions" value="--build" />
-        <option name="services">
-          <list>
-            <option value="rabbitmq" />
-          </list>
-        </option>
-        <option name="sourceFilePath" value="docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_Redis.xml b/.idea/runConfigurations/Start_Redis.xml
deleted file mode 100644
index 6504ca9..0000000
--- a/.idea/runConfigurations/Start_Redis.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start Redis" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="envVars">
-          <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="SEND_GRID_KEY" />
-              <option name="value" value="$SEND_GRID_KEY$" />
-            </DockerEnvVarImpl>
-          </list>
-        </option>
-        <option name="commandLineOptions" value="--build" />
-        <option name="services">
-          <list>
-            <option value="redis" />
-          </list>
-        </option>
-        <option name="sourceFilePath" value="docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
new file mode 100644
index 0000000..5b93d9f
--- /dev/null
+++ b/.idea/runConfigurations/Test.xml
@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="test" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TestSql.xml b/.idea/runConfigurations/TestSql.xml
new file mode 100644
index 0000000..8003a29
--- /dev/null
+++ b/.idea/runConfigurations/TestSql.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TestSql" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="testSql" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_All_SQL.xml b/.idea/runConfigurations/Test_All_SQL.xml
index b336211..06d1935 100644
--- a/.idea/runConfigurations/Test_All_SQL.xml
+++ b/.idea/runConfigurations/Test_All_SQL.xml
@@ -1,13 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test All SQL" type="ShConfigurationType">
+  <configuration default="false" name="Test All SQL" type="ShConfigurationType" singleton="false">
+    <option name="SCRIPT_TEXT" value="" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="$PROJECT_DIR$/src/test/sql/test.sh" />
     <option name="SCRIPT_OPTIONS" value="1" />
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
     <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/src/test/sql" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
-    <option name="INTERPRETER_PATH" value="C:/Program Files/Git/bin/bash.exe" />
+    <option name="INTERPRETER_PATH" value="$PROJECT_DIR$/../../../../Program Files/Git/bin/bash.exe" />
     <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="true" />
+    <envs />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Unit_Tests.xml b/.idea/runConfigurations/Unit_Tests.xml
index 300e5de..2b42cda 100644
--- a/.idea/runConfigurations/Unit_Tests.xml
+++ b/.idea/runConfigurations/Unit_Tests.xml
@@ -5,7 +5,7 @@
     <option name="PACKAGE_NAME" value="fr.dcproject" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
+    <option name="TEST_OBJECT" value="tags" />
     <option name="VM_PARAMETERS" value="-ea -Djdk.attach.allowAttachSelf=true" />
     <option name="PARAMETERS" value="" />
     <option name="TEST_SEARCH_SCOPE">
@@ -15,6 +15,7 @@
       <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
     </envs>
     <dir value="$PROJECT_DIR$" />
+    <tag value="unit" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Unit__functional_and_integration_tests.xml b/.idea/runConfigurations/Unit__functional_and_integration_tests.xml
new file mode 100644
index 0000000..45efb47
--- /dev/null
+++ b/.idea/runConfigurations/Unit__functional_and_integration_tests.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Unit, functional and integration tests" type="JUnit" factoryName="JUnit" singleton="false" show_console_on_std_err="true">
+    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
+    <useClassPathOnly />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <option name="ALTERNATIVE_JRE_PATH" value="corretto-11" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -Djdk.attach.allowAttachSelf=true" />
+    <option name="PARAMETERS" value="" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="wholeProject" />
+    </option>
+    <envs>
+      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
+    </envs>
+    <dir value="$PROJECT_DIR$" />
+    <patterns>
+      <pattern testClass="unit..*" />
+      <pattern testClass="functional..*" />
+      <pattern testClass="integration..*" />
+    </patterns>
+    <tag value="!functional" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Comment_Tests.xml b/.idea/runConfigurations/Unit_and_functional_tests.xml
similarity index 52%
rename from .idea/runConfigurations/Comment_Tests.xml
rename to .idea/runConfigurations/Unit_and_functional_tests.xml
index a682e5f..697c046 100644
--- a/.idea/runConfigurations/Comment_Tests.xml
+++ b/.idea/runConfigurations/Unit_and_functional_tests.xml
@@ -1,13 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Comment Tests" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
+  <configuration default="false" name="Unit and functional tests" type="JUnit" factoryName="JUnit" singleton="false" show_console_on_std_err="true">
     <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
     <useClassPathOnly />
+    <option name="ALTERNATIVE_JRE_PATH" value="corretto-11" />
     <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
+    <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@comment&quot;" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -Djdk.attach.allowAttachSelf=true" />
     <option name="PARAMETERS" value="" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
@@ -16,7 +16,11 @@
       <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
     </envs>
     <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
+    <patterns>
+      <pattern testClass="unit..*" />
+      <pattern testClass="functional..*" />
+    </patterns>
+    <tag value="!functional" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Vote_Tests.xml b/.idea/runConfigurations/Vote_Tests.xml
deleted file mode 100644
index cd00a63..0000000
--- a/.idea/runConfigurations/Vote_Tests.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Vote Tests" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@vote&quot;" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Workgroup_test.xml b/.idea/runConfigurations/Workgroup_test.xml
deleted file mode 100644
index f2ba85b..0000000
--- a/.idea/runConfigurations/Workgroup_test.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Workgroup test" type="JUnit" factoryName="JUnit" folderName="Cucumber" show_console_on_std_err="true">
-    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
-    <module name="dcproject.test" />
-    <useClassPathOnly />
-    <extension name="coverage" sample_coverage="false">
-      <pattern>
-        <option name="PATTERN" value="fr.dcproject.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@workgroup&quot;" />
-    <option name="PARAMETERS" value="" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs>
-      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-    </envs>
-    <dir value="$PROJECT_DIR$" />
-    <tag value="!online" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 0d004ac..c5c929a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,12 @@ help: ## This help.
 
 bd: build-docker
 
-build-docker: ## Build the docker image of application
+build-docker: ## Build the docker image of application (alias: bd)
 	docker build -t dc-project -f docker/app/Dockerfile .
 
 pd: publish-docker
 
-publish-docker: build-docker ## Publish docker image of application to Github
+publish-docker: build-docker ## Publish docker image of application to Github (alias: pd)
 	@git diff --quiet --exit-code || (echo "The git is DIRTY !!! You cannot publish this crap!" && exit 1)
 	@cat ./GH_TOKEN.txt | docker login docker.pkg.github.com -u ${GITHUB_USERNAME} --password-stdin
 	@docker tag dc-project docker.pkg.github.com/flecomte/dc-project/dc-project:${VERSION}
@@ -28,27 +28,32 @@ publish-docker: build-docker ## Publish docker image of application to Github
 
 rd: run-docker
 
-run-docker: ## Build and Run all docker services
+run-docker: ## Build and Run all docker services (alias: rd)
 	docker-compose up -d --build
 
+rdd: run-docker-dependencies
+
+run-docker-dependencies: ## Build and Run dependencies docker services (alias: rdd)
+	docker-compose up -d --build openapi rabbitmq redis elasticsearch db sonarqube_db sonarqube
+
 pm: publish-maven
 
-publish-maven: ## Publish JAR file to Github
+publish-maven: ## Publish JAR file to Github (alias: pm)
 	@git diff --quiet --exit-code || (echo "The git is DIRTY !!! You cannot publish this crap!" && exit 1)
 	gradlew publish
 
 f: fixtures
 
-fixtures: ## Import fixtures
+fixtures: ## Import fixtures (alias: f)
 	bash src/main/resources/sql/fixtures/fixtures.sh
 
-reset-database: ## Import fixtures
+reset-database: ## Reset database !!!
 	cd src/main/resources/sql/ ; bash resetDB.sh
 
 test-sql: ## Test sql
 	cd src/test/sql/ ; bash test.sh 1
 
-v: vertion
+v: version
 
-vertion: ## Show current version
+version: ## Show current version (alias: v)
 	@echo ${VERSION}
diff --git a/build.gradle.kts b/build.gradle.kts
index 14a4ff0..4aa8aeb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,15 +1,20 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.typesafe.config.ConfigFactory
+import fr.postgresjson.connexion.Connection
+import fr.postgresjson.connexion.Requester
+import fr.postgresjson.migration.Migrations
+import io.gitlab.arturbosch.detekt.Detekt
+import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.owasp.dependencycheck.reporting.ReportGenerator
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.slf4j.LoggerFactory
 
-val ktor_version: String by project
-val kotlin_version: String by project
-val coroutinesVersion: String by project
-val logback_version: String by project
-val koinVersion: String by project
-val jackson_version: String by project
-val cucumber_version: String by project
+val ktorVersion = "1.5.0"
+val kotlinVersion = "1.4.30"
+val coroutinesVersion = "1.4.3"
+val logbackVersion = "1.2.3"
+val koinVersion = "2.0.1"
+val jacksonVersion = "2.12.1"
 
 group = "com.github.flecomte"
 version = versioning.info.run {
@@ -23,26 +28,133 @@ version = versioning.info.run {
 plugins {
     jacoco
     application
+    maven
 
     id("maven-publish")
-    id("org.jetbrains.kotlin.jvm") version "1.3.50"
+    kotlin("jvm") version "1.4.30"
+    kotlin("plugin.serialization") version "1.4.30"
 
     id("com.github.johnrengelman.shadow") version "5.2.0"
-    id("org.jlleitschuh.gradle.ktlint") version "8.2.0"
-    id("org.owasp.dependencycheck") version "5.1.0"
-    id("org.sonarqube") version "2.7"
-    id("net.nemerosa.versioning") version "2.13.1"
+    id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
+    id("org.owasp.dependencycheck") version "6.1.1"
+    id("org.sonarqube") version "3.1.1"
+    id("net.nemerosa.versioning") version "2.14.0"
+    id("io.gitlab.arturbosch.detekt") version "1.16.0-RC1"
+    id("com.avast.gradle.docker-compose") version "0.14.0"
 }
 
 application {
     mainClassName = "io.ktor.server.jetty.EngineMain"
 }
 
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        jcenter()
+        maven { url = uri("https://jitpack.io") }
+    }
+    dependencies {
+        classpath("com.typesafe:config:1.4.1")
+        classpath("com.github.flecomte:postgres-json:2.1.1")
+    }
+}
+
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         jvmTarget = "11"
     }
 }
+
+val migration by tasks.registering {
+    group = "application"
+    dependsOn(tasks.named("composeUp"))
+
+    doLast {
+        val config = ConfigFactory.parseFile(file("$buildDir/../src/main/resources/application.conf")).resolve()
+        val connection = Connection(
+            host = config.getString("db.host"),
+            port = config.getInt("db.port"),
+            database = config.getString("db.database"),
+            username = config.getString("db.username"),
+            password = config.getString("db.password")
+        )
+        Migrations(
+            connection,
+            file("$buildDir/../src/main/resources/sql/migrations").toURI(),
+            file("$buildDir/../src/main/resources/sql/functions").toURI()
+        ).run {
+            run()
+        }
+    }
+}
+
+val migrationTest by tasks.registering {
+    group = "verification"
+    dependsOn(tasks.named("testComposeUp"))
+    finalizedBy(tasks.named("testComposeDown"))
+    doLast {
+        val config = ConfigFactory.parseFile(file("$buildDir/../src/test/resources/application-test.conf")).resolve()
+        val connection = Connection(
+            host = config.getString("db.host"),
+            port = config.getInt("db.port"),
+            database = config.getString("db.database"),
+            username = config.getString("db.username"),
+            password = config.getString("db.password")
+        )
+        Migrations(
+            connection,
+            file("$buildDir/../src/main/resources/sql/migrations").toURI(),
+            file("$buildDir/../src/main/resources/sql/functions").toURI()
+        ).run {
+            run()
+            connection.disconnect()
+        }
+    }
+}
+
+val testSql by tasks.registering {
+    group = "verification"
+    dependsOn(tasks.named("testComposeUp"))
+    finalizedBy(tasks.named("testComposeDown"))
+
+    doLast {
+        val config = ConfigFactory.parseFile(file("$buildDir/../src/test/resources/application-test.conf")).resolve()
+
+        val connection = Connection(
+            host = config.getString("db.host"),
+            port = config.getInt("db.port"),
+            database = config.getString("db.database"),
+            username = config.getString("db.username"),
+            password = config.getString("db.password")
+        )
+
+        Migrations(
+            connection,
+            file("$buildDir/../src/main/resources/sql/migrations").toURI(),
+            file("$buildDir/../src/main/resources/sql/functions").toURI(),
+            file("$buildDir/../src/test/sql/fixtures").toURI()
+        ).run {
+            run()
+        }
+
+        Requester.RequesterFactory(
+            connection = connection,
+            queriesDirectory = file("$buildDir/../src/test/sql").toURI()
+        ).createRequester().run {
+            getQueries().map {
+                try {
+                    it.sendQuery() == 0
+                } catch (e: Exception) {
+                    false
+                }
+            }
+        }
+
+        connection.disconnect()
+    }
+}
+
 tasks.withType<Jar> {
     manifest {
         attributes(
@@ -53,23 +165,62 @@ tasks.withType<Jar> {
     }
 }
 
-tasks {
-    named<ShadowJar>("shadowJar") {
-        mergeServiceFiles("META-INF/services")
-        archiveFileName.set("${archiveBaseName.get()}-latest-all.${archiveExtension.get()}")
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "11"
+        sourceCompatibility = "11"
+        targetCompatibility = "11"
     }
 }
 
-val sourcesJar by tasks.creating(Jar::class) {
+tasks.named<ShadowJar>("shadowJar") {
+    mergeServiceFiles("META-INF/services")
+    archiveFileName.set("${archiveBaseName.get()}-latest-all.${archiveExtension.get()}")
+}
+
+tasks.sonarqube.configure { dependsOn(tasks.jacocoTestReport) }
+
+val sourcesJar by tasks.registering(Jar::class) {
+    group = "build"
     archiveClassifier.set("sources")
     from(sourceSets.getByName("main").allSource)
 }
+
 tasks.test {
     useJUnit()
     useJUnitPlatform()
-//    maxHeapSize = "1G"
+    systemProperty("junit.jupiter.execution.parallel.enabled", true)
+    dependsOn(testSql)
+    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
 }
 
+apply(plugin = "docker-compose")
+dockerCompose {
+    projectName = "dc-project"
+    useComposeFiles = listOf("docker-compose.yml")
+    startedServices = listOf("db", "elasticsearch", "rabbitmq", "redis")
+    stopContainers = false
+    removeVolumes = false
+    removeContainers = false
+    isRequiredBy(project.tasks.run)
+    createNested("test").apply {
+        projectName = "dc-project_test"
+        useComposeFiles = listOf("docker-compose-test.yml")
+        stopContainers = false
+        isRequiredBy(project.tasks.test)
+        isRequiredBy(project.tasks.named("testSql"))
+    }
+    createNested("sonarqube").apply {
+        projectName = "dc-project"
+        useComposeFiles = listOf("docker-compose-sonar.yml")
+        stopContainers = false
+        removeVolumes = false
+        removeContainers = false
+//        isRequiredBy(project.tasks.sonarqube)
+    }
+}
+tasks.sonarqube.configure { dependsOn(tasks.named("sonarqubeComposeUp")) }
+
 publishing {
     if (versioning.info.dirty == false) {
         repositories {
@@ -97,15 +248,53 @@ publishing {
 }
 
 jacoco {
-    toolVersion = "0.8.3"
+    toolVersion = "0.8.6"
+    applyTo(tasks.run.get())
+}
+
+tasks.register<JacocoReport>("applicationCodeCoverageReport") {
+    executionData(tasks.run.get())
+    sourceSets(sourceSets.main.get())
 }
 
 tasks.jacocoTestReport {
+    dependsOn(tasks.test)
     reports {
         xml.isEnabled = true
+        html.isEnabled = true
     }
 }
 
+detekt {
+    buildUponDefaultConfig = true // preconfigure defaults
+//    config = files("$projectDir/config/detekt.yml") // point to your custom config defining rules to run, overwriting default behavior
+//    baseline = file("$projectDir/config/baseline.xml") // a way of suppressing issues before introducing detekt
+
+    reports {
+        html.enabled = true // observe findings in your browser with structure and code snippets
+        xml.enabled = true // checkstyle like format mainly for integrations like Jenkins
+        txt.enabled = true // similar to the console output, contains issue signature to manually edit baseline files
+        sarif.enabled = true // standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations with Github Code Scanning
+    }
+}
+
+tasks.withType<Detekt> {
+    // Target version of the generated JVM bytecode. It is used for type resolution.
+    this.jvmTarget = "11"
+}
+
+val setMaxMapCount = tasks.create<Exec>("setMaxMapCount") {
+    group = "docker"
+    doFirst {
+        if (OperatingSystem.current().isWindows) {
+            commandLine("cmd", "/c", "Powershell -ExecutionPolicy Bypass; wsl -d docker-desktop sysctl -w vm.max_map_count=262144")
+        } else if (OperatingSystem.current().isLinux) {
+            commandLine("sysctl -w vm.max_map_count=262144")
+        }
+    }
+}
+tasks.named("testComposeUp").configure { dependsOn(setMaxMapCount) }
+
 dependencyCheck {
     formats = listOf(ReportGenerator.Format.HTML, ReportGenerator.Format.XML)
 }
@@ -118,41 +307,46 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
+    implementation(gradleApi())
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$coroutinesVersion")
-    implementation("io.ktor:ktor-server-jetty:$ktor_version")
-    implementation("io.ktor:ktor-client-jetty:$ktor_version")
-    implementation("ch.qos.logback:logback-classic:$logback_version")
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-locations:$ktor_version")
-    implementation("io.ktor:ktor-auth:$ktor_version")
-    implementation("io.ktor:ktor-auth-jwt:$ktor_version")
-    implementation("io.ktor:ktor-gson:$ktor_version")
-    implementation("io.ktor:ktor-auth-jwt:$ktor_version")
-    implementation("io.ktor:ktor-websockets:$ktor_version")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
+    implementation("io.ktor:ktor-server-jetty:$ktorVersion")
+    implementation("io.ktor:ktor-client-jetty:$ktorVersion")
+    implementation("ch.qos.logback:logback-classic:$logbackVersion")
+    implementation("io.ktor:ktor-server-core:$ktorVersion")
+    implementation("io.ktor:ktor-locations:$ktorVersion")
+    implementation("io.ktor:ktor-auth:$ktorVersion")
+    implementation("io.ktor:ktor-auth-jwt:$ktorVersion")
+    implementation("io.ktor:ktor-websockets:$ktorVersion")
     implementation("org.koin:koin-ktor:$koinVersion")
-    implementation("io.ktor:ktor-jackson:$ktor_version")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version")
-    implementation("net.pearx.kasechange:kasechange-jvm:1.1.0")
-    implementation("com.auth0:java-jwt:3.8.2")
-    implementation("com.github.jasync-sql:jasync-postgresql:1.0.7")
-    implementation("com.github.flecomte:postgres-json:1.2.1")
-    implementation("com.github.flecomte:ktor-voter:1.0.1")
-    implementation("com.sendgrid:sendgrid-java:4.4.1")
-    implementation("io.lettuce:lettuce-core:5.2.2.RELEASE")
-    implementation("com.rabbitmq:amqp-client:5.8.0")
+    implementation("io.ktor:ktor-jackson:$ktorVersion")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:$jacksonVersion")
+    implementation("net.pearx.kasechange:kasechange-jvm:1.3.0")
+    implementation("com.auth0:java-jwt:3.12.0")
+    implementation("com.github.jasync-sql:jasync-postgresql:1.1.6")
+    implementation("com.github.flecomte:postgres-json:2.1.1")
+    implementation("com.sendgrid:sendgrid-java:4.7.1")
+    implementation("io.lettuce:lettuce-core:5.3.6.RELEASE") // TODO update to 6.0.2
+    implementation("com.rabbitmq:amqp-client:5.10.0")
     implementation("org.elasticsearch.client:elasticsearch-rest-client:6.7.1")
-    implementation("com.jayway.jsonpath:json-path:2.4.0")
+    implementation("com.jayway.jsonpath:json-path:2.5.0")
+    implementation("com.avast.gradle:gradle-docker-compose-plugin:0.14.0")
 
-    testImplementation("io.ktor:ktor-server-tests:$ktor_version")
-    testImplementation("io.ktor:ktor-client-mock:$ktor_version")
-    testImplementation("io.ktor:ktor-client-mock-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
+    testImplementation("io.ktor:ktor-client-mock:$ktorVersion")
+    testImplementation("io.ktor:ktor-client-mock-jvm:$ktorVersion")
     testImplementation("org.koin:koin-test:$koinVersion")
-    testImplementation("io.mockk:mockk:1.9.3")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.5.0")
-    testImplementation("org.amshove.kluent:kluent:1.4")
-    testImplementation("io.cucumber:cucumber-java8:$cucumber_version")
-    testImplementation("io.cucumber:cucumber-junit:$cucumber_version")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
+    testImplementation("io.mockk:mockk:1.10.6")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+    testImplementation("org.amshove.kluent:kluent:1.61")
+    testImplementation("io.mockk:mockk-agent-api:1.10.6")
+    testImplementation("io.mockk:mockk-agent-jvm:1.10.6")
+    testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
+    testImplementation("com.thedeanda:lorem:2.1")
+    testImplementation("org.openapi4j:openapi-operation-validator:1.0.6")
+    testImplementation("org.openapi4j:openapi-parser:1.0.6")
 }
diff --git a/doc/schema/Article.puml b/doc/schema/Article.puml
new file mode 100644
index 0000000..e6c6df7
--- /dev/null
+++ b/doc/schema/Article.puml
@@ -0,0 +1,98 @@
+@startuml
+
+title Search / Get articles
+
+actor Front
+box Article API
+    control Controller
+    control Repository
+    entity Article
+    database Postgres
+endbox
+box View System
+    control ArticleViewManager
+    database Elasticsearch
+endbox
+box Notification System
+    control EventNotification
+    database RabbitMQ
+    database Redis
+endbox
+
+Front -> Controller++: GET /articles?page=1
+    Controller -> Repository++: find
+        Repository -> Postgres++: find_articles()
+        return
+    return
+return: 200, Articles
+
+newpage Create / Update Article
+
+Front -> Controller: POST /article
+    activate Controller
+    Controller -> Controller: Convert dto to Entity
+    Controller -> Controller: Check Authorization
+    alt Authorize
+        Controller -> Repository++: upsert(entity)
+            Repository -> Postgres++: upsert_article
+            return
+        return
+        Controller -> Controller: Convert to dto
+        Front <-- Controller: 200, New Article
+    else not authorize
+        Front <-- Controller: 403, "Forbidden"
+    end
+    Controller -> EventNotification: raiseEvent(ArticleUpdate)
+        deactivate Controller
+        activate EventNotification
+        EventNotification ->> RabbitMQ
+        deactivate EventNotification
+        ...
+RabbitMQ -->> EventNotification++
+    EventNotification ->> : Send Email
+    EventNotification ->> Redis : Push Event Notification
+return <<ACK>>
+
+newpage get one article by id
+
+Front -> Controller: GET /article/{article}
+    activate Controller
+    Controller -> Repository++: findById()
+        Repository -> Postgres++: find_article_by_id()
+        return
+    return
+    Controller -> Controller: Check Authorization
+
+    alt Authorize
+        Controller -> ArticleViewManager++: getViewsCount(Article)
+            ArticleViewManager -> Elasticsearch++
+            return
+        return
+        Controller -> Controller: Convert Article and Views to dto
+        Front <<-- Controller: 200, Article
+    else not authorize
+        Front <<-- Controller: 403, "Forbidden"
+    end
+    Controller -> ArticleViewManager++: increment the view counter
+        ArticleViewManager -> Elasticsearch++
+        return
+    return
+deactivate Controller
+
+newpage get article versions by id
+
+Front -> Controller: GET /articles/{article}/versions
+    activate Controller
+    Controller -> Controller: Check Authorization
+    alt Authorize
+        Controller -> Repository++: findVersionsByVersionId
+            Repository -> Postgres++: find_articles_versions_by_version_id
+            return
+        return
+        Controller -> Controller: Convert to dto
+        Front <-- Controller: 200, Articles versions
+    else not authorize
+        Front <-- Controller: 403, "Forbidden"
+    end
+deactivate Controller
+@enduml
\ No newline at end of file
diff --git a/doc/schema/Notification.puml b/doc/schema/Notification.puml
new file mode 100644
index 0000000..f2b691b
--- /dev/null
+++ b/doc/schema/Notification.puml
@@ -0,0 +1,66 @@
+@startuml
+title Notification
+|Server|
+partition Event {
+    start
+        :Article is modified;
+        :Send message to "notification" exchange (RabbitMQ);
+        :RabbitMQ send message to "push" and "email" queue;
+    stop
+}
+split
+    partition Email {
+        -[hidden]->
+        :Consume "email" queue<
+        repeat :get next notification;
+        :Get followers of article from DB;
+        while (loop on followers)
+             :Send email to the citizen>
+        endwhile
+        :ACK>
+        repeat while()
+        detach
+    }
+splitagain
+    partition Push {
+        -[hidden]->
+        :Consume "email" queue<
+        repeat :get next notification;
+        :Get followers of article from DB;
+        while (loop on followers)
+             :Send notification message to redis>
+        endwhile
+        :ACK>
+        repeat while()
+        detach
+    }
+splitagain
+    partition "Notification direct" {
+        -[hidden]->
+        |Client|
+        start
+        :Client arrive on the web site;
+        :Connect to the websocket;
+        |Server|
+        :Get citizen notification
+        from redis;
+        while (on each notifications)
+            :Send notification to websocket>
+        endwhile(no notification left)
+        |Client|
+        :show notification;
+        |Server|
+        :Subscribe to redis event;
+        repeat :On new notification;
+        :Get new notification from redis;
+        :Send notification to websocket>
+        |Client|
+        :show notification;
+        |Server|
+        repeat while (wait notification)
+        detach
+    }
+endsplit
+
+
+@enduml
diff --git a/docker-compose-sonar.yml b/docker-compose-sonar.yml
new file mode 100644
index 0000000..978c9c9
--- /dev/null
+++ b/docker-compose-sonar.yml
@@ -0,0 +1,48 @@
+version: '3.8'
+services:
+  sonarqube:
+    container_name: ${APP_NAME}_sonarqube
+    image: sonarqube:community
+    depends_on:
+      - sonarqube_db
+    ports:
+      - ${SONARQUBE_PORT}:9000
+    networks:
+      - sonarnet
+    environment:
+      SONAR_JDBC_URL: jdbc:postgresql://sonarqube_db:5432/sonar
+      SONAR_JDBC_USERNAME: sonar
+      SONAR_JDBC_PASSWORD: sonar
+    volumes:
+      - sonarqube_data:/opt/sonarqube/data
+      - sonarqube_extensions:/opt/sonarqube/extensions
+      - sonarqube_logs:/opt/sonarqube/logs
+      - sonarqube_temp:/opt/sonarqube/temp
+
+  sonarqube_db:
+    container_name: ${APP_NAME}_sonarqube_db
+    image: postgres:alpine
+    networks:
+      - sonarnet
+    environment:
+      POSTGRES_USER: sonar
+      POSTGRES_PASSWORD: sonar
+    ports:
+      - ${SONARQUBE_DB_PORT}:5432
+    volumes:
+      - sonarqube_postgresql:/var/lib/postgresql
+      # This needs explicit mapping due to https://github.com/docker-library/postgres/blob/4e48e3228a30763913ece952c611e5e9b95c8759/Dockerfile.template#L52
+      - sonarqube_postgresql_data:/var/lib/postgresql/data
+
+
+networks:
+  sonarnet:
+    driver: bridge
+
+volumes:
+  sonarqube_data:
+  sonarqube_extensions:
+  sonarqube_logs:
+  sonarqube_temp:
+  sonarqube_postgresql:
+  sonarqube_postgresql_data:
\ No newline at end of file
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
new file mode 100644
index 0000000..e66057b
--- /dev/null
+++ b/docker-compose-test.yml
@@ -0,0 +1,44 @@
+version: '3.8'
+services:
+  rabbitmq:
+    container_name: ${APP_NAME}_rabbitmq_test
+    image: rabbitmq:management-alpine
+    ports:
+      - 5673:5672
+      - 15673:15672
+
+  redis:
+    container_name: ${APP_NAME}_redis_test
+    image: redis:6-alpine
+    ports:
+      - 6380:6379
+
+  elasticsearch:
+    container_name: ${APP_NAME}_elasticsearch_test
+    image: elasticsearch:6.7.1
+    ports:
+      - 9201:9200
+      - 9301:9300
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://elasticsearch:9200"]
+      interval: 3s
+      timeout: 2s
+      retries: 20
+
+  db:
+    container_name: ${APP_NAME}_postgresql_test
+    build:
+      context: docker/postgresql
+    ports:
+      - 15432:5432
+    environment:
+      POSTGRES_PASSWORD: ${DB_NAME}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_DB: ${DB_PWD}
+    depends_on:
+      - elasticsearch
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-q", "-d", "${DB_NAME}", "-U", "${DB_USER}" ]
+      interval: 3s
+      timeout: 2s
+      retries: 20
diff --git a/docker-compose.yml b/docker-compose.yml
index fcac966..4d93bf9 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,9 @@
 # To execute this docker-compose yml file use docker-compose -f <file_name> up
 # Add the "-d" flag at the end for detached execution
-version: '3.7'
+version: '3.8'
 services:
-  sonarqube:
-    container_name: sonarqube_${NAME}
-    image: sonarqube
-    ports:
-      - ${SONARQUBE_PORT}:9000
-
   openapi:
-    container_name: openapi_${NAME}
+    container_name: ${APP_NAME}_openapi
     image: swaggerapi/swagger-ui
     ports:
       - ${OPENAPI_PORT}:8080
@@ -17,22 +11,22 @@ services:
       URL: "http://localhost:8080"
 
   rabbitmq:
-    container_name: rabbitmq_${NAME}
+    container_name: ${APP_NAME}_rabbitmq
     image: rabbitmq:management-alpine
     ports:
       - ${RABBITMQ_PORT}:5672
       - ${RABBITMQ_MANAGEMENT_PORT}:15672
 
   redis:
-    container_name: redis_${NAME}
-    image: redis:6.0-rc-alpine
+    container_name: ${APP_NAME}_redis
+    image: redis:6-alpine
     ports:
       - ${REDIS_PORT}:6379
     volumes:
       - redis-data:/var/lib/redis:rw
 
   app:
-    container_name: app_${NAME}
+    container_name: ${APP_NAME}_app
     build:
       context: .
       dockerfile: docker/app/Dockerfile
@@ -51,7 +45,7 @@ services:
       - rabbitmq
 
   elasticsearch:
-    container_name: elasticsearch_${NAME}
+    container_name: ${APP_NAME}_elasticsearch
     image: elasticsearch:6.7.1
     ports:
       - ${ELASTIC_REST}:9200
@@ -63,7 +57,7 @@ services:
       retries: 20
 
   db:
-    container_name: postgresql_${NAME}
+    container_name: ${APP_NAME}_postgresql
     build:
       context: docker/postgresql
     ports:
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index 0c9401f..8d8fb06 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -1,12 +1,13 @@
 #### BUILD ####
-FROM gradle:5.6.4-jdk11 AS build
+FROM gradle:6.8-jdk11 AS build
 COPY --chown=gradle:gradle . /home/gradle/src
 
 WORKDIR /home/gradle/src
 RUN gradle build -x test -x ktlintKotlinScriptCheck -x ktlintTestSourceSetCheck -x ktlintMainSourceSetCheck --no-daemon
+RUN gradle shadowJar
 
 #### RUN ####
-FROM adoptopenjdk/openjdk11:jre-11.0.4_11-alpine
+FROM amazoncorretto:11-alpine as run
 ENV APPLICATION_USER ktor
 RUN adduser -D -g '' $APPLICATION_USER
 
diff --git a/gradle.properties b/gradle.properties
index 23699b1..c799b29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,9 @@
-ktor_version=1.2.2
 kotlin.code.style=official
-kotlin_version=1.3.40
-coroutinesVersion=1.3.3
-logback_version=1.2.1
-koinVersion=2.0.1
-jackson_version=2.9.9
-cucumber_version=5.1.3
-systemProp.sonar.host.url=http://localhost:9000
-systemProp.sonar.login=1196e8015c20035f1aa91e881b95ce9d6e879c8a
+systemProp.sonar.host.url=http://localhost:9002
+systemProp.sonar.login=admin
+systemProp.sonar.password=sonar
+systemProp.sonar.projectKey=dc-project
+systemProp.sonar.projectName=DC Project
+systemProp.sonar.java.coveragePlugin=jacoco
+systemProp.sonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml
+systemProp.sonar.kotlin.detekt.reportPaths=build/reports/detekt/detekt.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..e708b1c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7c4388a..da9702f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acf..4f906e0 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/main/kotlin/Application.kt b/src/main/kotlin/Application.kt
deleted file mode 100644
index 4b459ff..0000000
--- a/src/main/kotlin/Application.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package fr.dcproject
-
-import com.fasterxml.jackson.core.util.DefaultIndenter
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.PropertyNamingStrategy
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.datatype.joda.JodaModule
-import com.github.jasync.sql.db.postgresql.exceptions.GenericDatabaseException
-import fr.dcproject.Env.PROD
-import fr.dcproject.elasticsearch.configElasticIndexes
-import fr.dcproject.entity.*
-import fr.dcproject.event.EventNotification
-import fr.dcproject.event.EventSubscriber
-import fr.dcproject.routes.*
-import fr.dcproject.security.voter.*
-import fr.ktorVoter.AuthorizationVoter
-import fr.ktorVoter.ForbiddenException
-import fr.postgresjson.migration.Migrations
-import io.ktor.application.Application
-import io.ktor.application.ApplicationCall
-import io.ktor.application.call
-import io.ktor.application.install
-import io.ktor.auth.Authentication
-import io.ktor.auth.authenticate
-import io.ktor.auth.jwt.jwt
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.jetty.Jetty
-import io.ktor.features.*
-import io.ktor.http.HttpHeaders
-import io.ktor.http.HttpMethod
-import io.ktor.http.HttpStatusCode
-import io.ktor.http.auth.HttpAuthHeader
-import io.ktor.jackson.jackson
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Locations
-import io.ktor.response.respond
-import io.ktor.routing.Routing
-import io.ktor.util.KtorExperimentalAPI
-import io.ktor.websocket.WebSockets
-import org.eclipse.jetty.util.log.Slf4jLog
-import org.koin.core.qualifier.named
-import org.koin.ktor.ext.Koin
-import org.koin.ktor.ext.get
-import org.slf4j.event.Level
-import java.time.Duration
-import java.util.*
-import java.util.concurrent.CompletionException
-import fr.dcproject.entity.Workgroup as WorkgroupEntity
-import fr.dcproject.repository.Article as RepositoryArticle
-import fr.dcproject.repository.Citizen as RepositoryCitizen
-import fr.dcproject.repository.Constitution as RepositoryConstitution
-import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository
-import fr.dcproject.repository.User as UserRepository
-import fr.dcproject.repository.Workgroup as WorkgroupRepository
-
-fun main(args: Array<String>): Unit = io.ktor.server.jetty.EngineMain.main(args)
-
-enum class Env { PROD, TEST, CUCUMBER }
-
-@KtorExperimentalAPI
-@KtorExperimentalLocationsAPI
-@Suppress("unused") // Referenced in application.conf
-fun Application.module(env: Env = PROD) {
-    install(Koin) {
-        Slf4jLog()
-        modules(Module)
-    }
-
-    install(CallLogging) {
-        level = Level.INFO
-    }
-
-    install(DataConversion) {
-        convert<UUID> {
-            decode { values, _ ->
-                values.singleOrNull()?.let { UUID.fromString(it) }
-            }
-
-            encode { value ->
-                when (value) {
-                    null -> listOf()
-                    is UUID -> listOf(value.toString())
-                    else -> throw InternalError("Cannot convert $value as UUID")
-                }
-            }
-        }
-
-        // TODO: create generic convert for entityI
-        convert<Article> {
-            decode { values, _ ->
-                values.singleOrNull()?.let {
-                    get<RepositoryArticle>().findById(UUID.fromString(it))
-                        ?: throw NotFoundException("Article $values not found")
-                } ?: throw NotFoundException("Article $values not found")
-            }
-        }
-        convert<ArticleRef> {
-            decode { values, _ ->
-                values.singleOrNull()?.let {
-                    ArticleRef(UUID.fromString(it))
-            } ?: throw NotFoundException("""UUID "$values" is not valid for Article""")
-            }
-        }
-
-        convert<CommentRef> {
-            decode { values, _ ->
-                values.singleOrNull()?.let {
-                    CommentRef(UUID.fromString(it))
-                } ?: throw NotFoundException("""UUID "$values" is not valid for Comment""")
-            }
-        }
-        convert<ConstitutionRef> {
-            decode { values, _ ->
-                values.singleOrNull()?.let {
-                    ConstitutionRef(UUID.fromString(it))
-                } ?: throw NotFoundException("""UUID "$values" is not valid for Constitution""")
-            }
-        }
-
-        convert<Constitution> {
-            decode { values, _ ->
-                val id = values.singleOrNull()?.let { UUID.fromString(it) }
-                    ?: throw InternalError("Cannot convert $values to UUID")
-                get<RepositoryConstitution>().findById(id) ?: throw NotFoundException("Constitution $values not found")
-            }
-        }
-
-        convert<Citizen> {
-            decode { values, _ ->
-                val id = values.singleOrNull()?.let { UUID.fromString(it) }
-                    ?: throw InternalError("Cannot convert $values to UUID")
-                get<RepositoryCitizen>().findById(id) ?: throw NotFoundException("Citizen $values not found")
-            }
-        }
-
-        convert<CitizenRef> {
-            decode { values, _ ->
-                values.singleOrNull()?.let {
-                    CitizenRef(UUID.fromString(it))
-                } ?: throw NotFoundException("""UUID "$values" is not valid for Citizen""")
-            }
-        }
-
-        convert<OpinionChoice> {
-            decode { values, _ ->
-                val id = values.singleOrNull()?.let { UUID.fromString(it) }
-                    ?: throw InternalError("Cannot convert $values to UUID")
-                get<OpinionChoiceRepository>().findOpinionChoiceById(id)
-                    ?: throw NotFoundException("OpinionChoice $values not found")
-            }
-        }
-
-        convert<WorkgroupRef> {
-            decode { values, _ ->
-                values.singleOrNull()?.let {
-                    WorkgroupRef(UUID.fromString(it))
-                } ?: throw NotFoundException("""UUID "$values" is not valid for Workgroup""")
-            }
-        }
-
-        convert<WorkgroupEntity> {
-            decode { values, _ ->
-                val id = values.singleOrNull()?.let { UUID.fromString(it) }
-                    ?: throw InternalError("Cannot convert $values to UUID")
-                get<WorkgroupRepository>().findById(id)
-                    ?: throw NotFoundException("Workgroup $values not found")
-            }
-        }
-    }
-
-    install(Locations) {
-    }
-
-    install(AuthorizationVoter) {
-        voters = mutableListOf(
-            ArticleVoter(),
-            ConstitutionVoter(),
-            CitizenVoter(),
-            CommentVoter(),
-            VoteVoter(),
-            FollowVoter(),
-            OpinionVoter(),
-            OpinionChoiceVoter(),
-            WorkgroupVoter()
-        )
-    }
-
-    HttpClient(Jetty) {
-        engine {
-        }
-    }
-
-    configElasticIndexes(get())
-
-    install(WebSockets) {
-        pingPeriod = Duration.ofSeconds(60) // Disabled (null) by default
-        timeout = Duration.ofSeconds(15)
-        maxFrameSize = Long.MAX_VALUE // Disabled (max value). The connection will be closed if surpassed this length.
-        masking = false
-    }
-
-    install(EventSubscriber) {
-        EventNotification(this, get(), get(), get(), get(), get()).config()
-    }
-
-    install(Authentication) {
-        /**
-         * Setup the JWT authentication to be used in [Routing].
-         * If the token is valid, the corresponding [User] is fetched from the database.
-         * The [User] can then be accessed in each [ApplicationCall].
-         */
-        jwt {
-            verifier(JwtConfig.verifier)
-            realm = "dc-project.fr"
-            validate {
-                it.payload.getClaim("id").asString()?.let { id ->
-                    get<UserRepository>().findById(UUID.fromString(id))
-                }
-            }
-        }
-
-        jwt("url") {
-            verifier(JwtConfig.verifier)
-            realm = "dc-project.fr"
-            authHeader { call ->
-                call.request.queryParameters.get("token")?.let {
-                    HttpAuthHeader.Single("Bearer", it)
-                }
-            }
-            validate {
-                it.payload.getClaim("id").asString()?.let { id ->
-                    get<UserRepository>().findById(UUID.fromString(id))
-                }
-            }
-        }
-    }
-
-    install(AutoHeadResponse)
-
-    install(ContentNegotiation) {
-        jackson {
-            propertyNamingStrategy = PropertyNamingStrategy.SNAKE_CASE
-
-            registerModule(JodaModule())
-            disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-            configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-            configure(SerializationFeature.INDENT_OUTPUT, true)
-            setDefaultPrettyPrinter(DefaultPrettyPrinter().apply {
-                indentArraysWith(DefaultPrettyPrinter.FixedSpaceIndenter.instance)
-                indentObjectsWith(DefaultIndenter("  ", "\n"))
-            })
-        }
-    }
-
-    install(Routing) {
-        // trace { application.log.trace(it.buildText()) }
-        authenticate(optional = true) {
-            article(get(), get())
-            auth(get(), get(), get())
-            citizen(get(), get())
-            constitution(get())
-            followArticle(get())
-            followConstitution(get())
-            comment(get())
-            commentArticle(get())
-            commentConstitution(get())
-            voteArticle(get(), get(), get())
-            voteConstitution(get())
-            opinionArticle(get())
-            opinionChoice(get())
-            workgroup(get())
-            definition()
-        }
-
-        authenticate("url") {
-            notificationArticle(get(), get(named("ws")))
-        }
-    }
-
-    install(StatusPages) {
-        // TODO move to postgresJson lib
-        exception<CompletionException> { e ->
-            val parent = e.cause?.cause
-            if (parent is GenericDatabaseException) {
-                call.respond(HttpStatusCode.BadRequest, parent.errorMessage.message!!)
-            } else {
-                throw e
-            }
-        }
-        exception<NotFoundException> { e ->
-            call.respond(HttpStatusCode.NotFound, e.message!!)
-        }
-        exception<ForbiddenException> {
-            call.respond(HttpStatusCode.Forbidden)
-        }
-    }
-
-    install(CORS) {
-        method(HttpMethod.Options)
-        method(HttpMethod.Put)
-        method(HttpMethod.Delete)
-        header(HttpHeaders.Authorization)
-        anyHost()
-        // host("localhost:4200", schemes = listOf("http", "https"))
-        allowCredentials = true
-        allowSameOrigin = true
-        maxAge = Duration.ofDays(1)
-    }
-
-    if (env == PROD) {
-        get<Migrations>().run()
-    }
-}
diff --git a/src/main/kotlin/Configuration.kt b/src/main/kotlin/Configuration.kt
deleted file mode 100644
index d4a0a7c..0000000
--- a/src/main/kotlin/Configuration.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package fr.dcproject
-
-import com.auth0.jwt.JWT
-import com.auth0.jwt.JWTVerifier
-import com.auth0.jwt.algorithms.Algorithm
-import com.typesafe.config.ConfigFactory
-import fr.dcproject.entity.UserI
-import java.util.*
-import java.net.URI
-
-object Config {
-    private var config = ConfigFactory.load()
-
-    object Sql {
-        val migrationFiles: URI = this::class.java.getResource("/sql/migrations").toURI()
-        val functionFiles: URI = this::class.java.getResource("/sql/functions").toURI()
-        val fixtureFiles: URI = this::class.java.getResource("/sql/fixtures").toURI()
-    }
-
-    val envName: String = config.getString("app.envName")
-    val domain: String = config.getString("app.domain")
-
-    val host: String = config.getString("db.host")
-    var database: String = config.getString("db.database")
-    var username: String = config.getString("db.username")
-    var password: String = config.getString("db.password")
-    val port: Int = config.getInt("db.port")
-    val redis: String = config.getString("redis.connection")
-    val elasticsearch: String = config.getString("elasticsearch.connection")
-    val rabbitmq: String = config.getString("rabbitmq.connection")
-    val exchangeNotificationName = "notification"
-    val sendGridKey: String = config.getString("mail.sendGrid.key")
-}
-
-object JwtConfig {
-    private const val secret = "zAP5MBA4B4Ijz0MZaS48"
-    const val issuer = "dc-project.fr"
-    private const val validityInMs = 3_600_000 * 10 // 10 hours
-
-    // TODO change to RSA512
-    val algorithm = Algorithm.HMAC512(secret)
-
-    val verifier: JWTVerifier = JWT
-        .require(algorithm)
-        .withIssuer(issuer)
-        .build()
-
-    /**
-     * Produce a token for this combination of User and Account
-     */
-    fun makeToken(user: UserI): String = JWT.create()
-        .withSubject("Authentication")
-        .withIssuer(issuer)
-        .withClaim("id", user.id.toString())
-        .withExpiresAt(getExpiration())
-        .sign(algorithm)
-
-    /**
-     * Calculate the expiration Date based on current time + the given validity
-     */
-    private fun getExpiration() = Date(System.currentTimeMillis() + validityInMs)
-}
\ No newline at end of file
diff --git a/src/main/kotlin/Module.kt b/src/main/kotlin/Module.kt
deleted file mode 100644
index c107cea..0000000
--- a/src/main/kotlin/Module.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package fr.dcproject
-
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.PropertyNamingStrategy
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.databind.module.SimpleModule
-import com.fasterxml.jackson.datatype.joda.JodaModule
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.rabbitmq.client.ConnectionFactory
-import fr.dcproject.event.publisher.Publisher
-import fr.dcproject.messages.Mailer
-import fr.dcproject.messages.NotificationEmailSender
-import fr.dcproject.messages.SsoManager
-import fr.dcproject.views.ArticleViewManager
-import fr.postgresjson.connexion.Connection
-import fr.postgresjson.connexion.Requester
-import fr.postgresjson.migration.Migrations
-import io.ktor.client.HttpClient
-import io.ktor.client.features.websocket.WebSockets
-import io.ktor.util.KtorExperimentalAPI
-import io.lettuce.core.RedisClient
-import io.lettuce.core.api.async.RedisAsyncCommands
-import org.apache.http.HttpHost
-import org.elasticsearch.client.RestClient
-import org.koin.core.qualifier.named
-import org.koin.dsl.module
-import fr.dcproject.repository.Article as ArticleRepository
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.CommentArticle as CommentArticleRepository
-import fr.dcproject.repository.CommentConstitution as CommentConstitutionRepository
-import fr.dcproject.repository.CommentGeneric as CommentGenericRepository
-import fr.dcproject.repository.Constitution as ConstitutionRepository
-import fr.dcproject.repository.FollowArticle as FollowArticleRepository
-import fr.dcproject.repository.FollowConstitution as FollowConstitutionRepository
-import fr.dcproject.repository.OpinionArticle as OpinionArticleRepository
-import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository
-import fr.dcproject.repository.User as UserRepository
-import fr.dcproject.repository.VoteArticle as VoteArticleRepository
-import fr.dcproject.repository.VoteComment as VoteCommentRepository
-import fr.dcproject.repository.VoteConstitution as VoteConstitutionRepository
-import fr.dcproject.repository.Workgroup as WorkgroupRepository
-
-@KtorExperimentalAPI
-val Module = module {
-
-    single { Config }
-
-    // SQL connection
-    single {
-        Connection(
-            host = Config.host,
-            port = Config.port,
-            database = Config.database,
-            username = Config.username,
-            password = Config.password
-        )
-    }
-
-    // Launch Database migration
-    single { Migrations(get(), Config.Sql.migrationFiles, Config.Sql.functionFiles) }
-
-    // Redis client
-    single<RedisAsyncCommands<String, String>> {
-        RedisClient.create(Config.redis).connect()?.async() ?: error("Unable to connect to redis")
-    }
-
-    // RabbitMQ
-    single<ConnectionFactory> {
-        ConnectionFactory().apply { setUri(Config.rabbitmq) }
-    }
-
-    // JsonSerializer
-    single<ObjectMapper> {
-        jacksonObjectMapper().apply {
-            registerModule(SimpleModule())
-            propertyNamingStrategy = PropertyNamingStrategy.SNAKE_CASE
-
-            registerModule(JodaModule())
-            disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-            configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true)
-        }
-    }
-
-    // Client HTTP for WebSockets
-    single(named("ws")) {
-        HttpClient {
-            install(WebSockets)
-        }
-    }
-
-    // SQL Requester (postgresJson)
-    single {
-        Requester.RequesterFactory(
-            connection = get(),
-            functionsDirectory = Config.Sql.functionFiles
-        ).createRequester()
-    }
-
-    // Repositories
-    single { UserRepository(get()) }
-    single { ArticleRepository(get()) }
-    single { CitizenRepository(get()) }
-    single { ConstitutionRepository(get()) }
-    single { FollowArticleRepository(get()) }
-    single { FollowConstitutionRepository(get()) }
-    single { CommentGenericRepository(get()) }
-    single { CommentArticleRepository(get()) }
-    single { CommentConstitutionRepository(get()) }
-    single { VoteArticleRepository(get()) }
-    single { VoteConstitutionRepository(get()) }
-    single { VoteCommentRepository(get()) }
-    single { OpinionChoiceRepository(get()) }
-    single { OpinionArticleRepository(get()) }
-    single { WorkgroupRepository(get()) }
-
-    // Elasticsearch Client
-    single<RestClient> {
-        RestClient.builder(
-            HttpHost.create(Config.elasticsearch)
-        ).build()
-    }
-
-    single { ArticleViewManager(get()) }
-
-    // Mailler
-    single { Mailer(Config.sendGridKey) }
-
-    // SSO Manager for connection
-    single { SsoManager(get<Mailer>(), Config.domain, get()) }
-
-    single { Publisher(get(), get()) }
-
-    single { NotificationEmailSender(get<Mailer>(), Config.domain, get(), get()) }
-}
diff --git a/src/main/kotlin/elasticsearch/Config.kt b/src/main/kotlin/elasticsearch/Config.kt
deleted file mode 100644
index ecc2abf..0000000
--- a/src/main/kotlin/elasticsearch/Config.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package fr.dcproject.elasticsearch
-
-import org.elasticsearch.client.Request
-import org.elasticsearch.client.RestClient
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-fun waitElasticsearchIsUp(client: RestClient) {
-    val logger: Logger = LoggerFactory.getLogger("fr.dcproject.elasticsearch")
-    val request = Request("GET", "/_cluster/health")
-    repeat(40) {
-        runCatching {
-            client.performRequest(request).statusLine.statusCode
-        }.onSuccess {
-            if (it == 200) {
-                logger.debug("Elasticsearch is Ready! Continue...")
-                return
-            } else {
-                logger.debug("sleep 2s and retry...")
-                Thread.sleep(2000)
-            }
-        }.onFailure {
-            logger.debug("${it.message}, sleep 2s and retry...")
-            Thread.sleep(2000)
-        }
-    }
-    error("Elasticsearch is not ready")
-}
-
-fun configElasticIndexes(client: RestClient) {
-    waitElasticsearchIsUp(client)
-
-    /* Create index if not exist */
-    client.run {
-        if (performRequest(Request("HEAD", "/views?include_type_name=false")).statusLine.statusCode == 404) {
-            Request(
-                "PUT",
-                "/views?include_type_name=false"
-            ).apply {
-                //language=JSON
-                setJsonEntity(
-                    """
-                {
-                  "settings": {
-                    "number_of_shards": 5
-                  },
-                  "mappings": {
-                    "properties": {
-                      "logged": {
-                        "type": "boolean"
-                      },
-                      "type": {
-                        "type": "keyword"
-                      },
-                      "user_ref": {
-                        "type": "keyword"
-                      },
-                      "id": {
-                        "type": "keyword"
-                      },
-                      "version_id": {
-                        "type": "keyword"
-                      },
-                      "ip": {
-                        "type": "keyword"
-                      },
-                      "citizen_id": {
-                        "type": "keyword"
-                      },
-                      "view_at": {
-                        "type": "date"
-                      }
-                    }
-                  }
-                }
-            """.trimIndent()
-                )
-            }.let {
-                performRequest(it)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/entity/Article.kt b/src/main/kotlin/entity/Article.kt
deleted file mode 100644
index 335ec1a..0000000
--- a/src/main/kotlin/entity/Article.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.immutable.*
-import fr.postgresjson.entity.mutable.EntityDeletedAt
-import fr.postgresjson.entity.mutable.EntityDeletedAtImp
-import fr.postgresjson.entity.mutable.EntityVersioning
-import fr.postgresjson.entity.mutable.UuidEntityVersioning
-import java.util.*
-
-class Article(
-    id: UUID? = null,
-    title: String,
-    override var anonymous: Boolean = true,
-    override var content: String,
-    override var description: String,
-    override var tags: List<String> = emptyList(),
-    draft: Boolean = false,
-    override var lastVersion: Boolean = false,
-    override val createdBy: CitizenBasic,
-    workgroup: WorkgroupSimple<CitizenRef>? = null
-) : ArticleFull,
-    ArticleAuthI<CitizenBasicI>,
-    ArticleSimple(id, title, createdBy, draft, workgroup),
-    Viewable by ViewableImp() {
-    init {
-        tags = tags.distinct()
-    }
-}
-
-class ArticleForUpdate(
-    id: UUID?,
-    val title: String,
-    val anonymous: Boolean = true,
-    val content: String,
-    val description: String,
-    tags: List<String> = emptyList(),
-    val draft: Boolean = false,
-    val createdBy: CitizenRef,
-    val workgroup: WorkgroupRef? = null
-) : ArticleRefVersioning(id) {
-    val tags: List<String> = tags.distinct()
-}
-
-open class ArticleSimple(
-    id: UUID? = null,
-    override var title: String,
-    override val createdBy: CitizenBasic,
-    override var draft: Boolean = false,
-    override var workgroup: WorkgroupSimple<CitizenRef>? = null
-) : ArticleSimpleI,
-    ArticleAuthI<CitizenBasicI>,
-    ArticleRefVersioning(id),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityCreatedBy<CitizenBasicI> by EntityCreatedByImp(createdBy),
-    EntityDeletedAt by EntityDeletedAtImp(),
-    Votable by VotableImp(),
-    Opinionable by OpinionableImp()
-
-open class ArticleRefVersioning(
-    id: UUID? = null,
-    versionNumber: Int? = null,
-    versionId: UUID = UUID.randomUUID()
-) : ArticleRef(id),
-    EntityVersioning<UUID, Int> by UuidEntityVersioning(versionNumber, versionId)
-
-open class ArticleRef(
-    id: UUID? = null
-) : ArticleI, TargetRef(id)
-
-interface ArticleI : UuidEntityI, TargetI
-
-interface ArticleSimpleI :
-    ArticleI,
-    EntityVersioning<UUID, Int>,
-    EntityCreatedBy<CitizenBasicI>,
-    EntityCreatedAt,
-    EntityDeletedAt,
-    Votable {
-    var title: String
-    var workgroup: WorkgroupSimple<CitizenRef>?
-}
-
-interface ArticleBasicI :
-    ArticleSimpleI {
-    var anonymous: Boolean
-    var content: String
-    var description: String
-    var tags: List<String>
-}
-
-interface ArticleFull :
-    ArticleBasicI {
-    var draft: Boolean
-    var lastVersion: Boolean
-}
-
-interface ArticleAuthI<U : CitizenWithUserI> :
-    ArticleI,
-    EntityCreatedBy<U>,
-    EntityDeletedAt {
-    var draft: Boolean
-}
\ No newline at end of file
diff --git a/src/main/kotlin/entity/Citizen.kt b/src/main/kotlin/entity/Citizen.kt
deleted file mode 100644
index af86096..0000000
--- a/src/main/kotlin/entity/Citizen.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package fr.dcproject.entity
-
-import fr.dcproject.entity.CitizenI.Name
-import fr.postgresjson.entity.immutable.EntityCreatedAt
-import fr.postgresjson.entity.immutable.EntityCreatedAtImp
-import fr.postgresjson.entity.immutable.UuidEntity
-import fr.postgresjson.entity.immutable.UuidEntityI
-import fr.postgresjson.entity.mutable.EntityDeletedAt
-import fr.postgresjson.entity.mutable.EntityDeletedAtImp
-import org.joda.time.DateTime
-import java.util.*
-
-class Citizen(
-    id: UUID = UUID.randomUUID(),
-    name: Name,
-    email: String,
-    birthday: DateTime,
-    voteAnonymous: Boolean = true,
-    followAnonymous: Boolean = true,
-    override val user: User
-) : CitizenFull,
-    CitizenBasic(id, name, email, birthday, voteAnonymous, followAnonymous, user),
-    EntityCreatedAt by EntityCreatedAtImp() {
-    var workgroups: List<WorkgroupAndRoles> = emptyList()
-
-    class WorkgroupAndRoles(
-        val roles: List<String>,
-        val workgroup: WorkgroupSimple<CitizenRef>
-    )
-}
-
-open class CitizenBasic(
-    id: UUID = UUID.randomUUID(),
-    name: Name,
-    override var email: String,
-    override var birthday: DateTime,
-    override var voteAnonymous: Boolean = true,
-    override var followAnonymous: Boolean = true,
-    override val user: User
-) : CitizenBasicI,
-    CitizenSimple(id, name, user)
-
-open class CitizenSimple(
-    id: UUID = UUID.randomUUID(),
-    var name: Name,
-    user: UserRef
-) : CitizenRefWithUser(id, user)
-
-open class CitizenRefWithUser(
-    id: UUID = UUID.randomUUID(),
-    override val user: UserRef
-) : CitizenWithUserI,
-    CitizenRef(id),
-    EntityDeletedAt by EntityDeletedAtImp()
-
-open class CitizenRef(
-    id: UUID = UUID.randomUUID()
-) : UuidEntity(id),
-    CitizenI
-
-interface CitizenI : UuidEntityI {
-    data class Name(
-        var firstName: String,
-        var lastName: String,
-        var civility: String? = null
-    ) {
-        fun getFullName(): String = "${civility ?: ""} $firstName $lastName".trim()
-    }
-}
-
-interface CitizenBasicI : CitizenWithUserI, EntityDeletedAt {
-    var name: Name
-    var email: String
-    var birthday: DateTime
-    var voteAnonymous: Boolean
-    var followAnonymous: Boolean
-}
-
-interface CitizenFull : CitizenBasicI {
-    override val user: User
-}
-
-interface CitizenWithUserI : CitizenI {
-    val user: UserI
-}
diff --git a/src/main/kotlin/entity/Comment.kt b/src/main/kotlin/entity/Comment.kt
deleted file mode 100644
index cb3c1e0..0000000
--- a/src/main/kotlin/entity/Comment.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.immutable.*
-import fr.postgresjson.entity.mutable.EntityDeletedAt
-import fr.postgresjson.entity.mutable.EntityDeletedAtImp
-import java.util.*
-
-open class Comment<T : TargetI>(
-    id: UUID = UUID.randomUUID(),
-    override val createdBy: CitizenBasic,
-    override var target: T,
-    var content: String,
-    val responses: List<Comment<T>>? = null,
-    var parent: Comment<T>? = null,
-    val parentsIds: List<UUID>? = null,
-    val childrenCount: Int? = null
-) : ExtraI<T, CitizenBasicI>,
-    CommentRef(id),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityCreatedBy<CitizenBasicI> by EntityCreatedByImp(createdBy),
-    EntityUpdatedAt by EntityUpdatedAtImp(),
-    EntityDeletedAt by EntityDeletedAtImp(),
-    Votable by VotableImp(),
-    TargetI {
-    constructor(
-        createdBy: CitizenBasic,
-        parent: Comment<T>,
-        content: String
-    ) : this(
-        createdBy = createdBy,
-        parent = parent,
-        target = parent.target,
-        content = content
-    )
-}
-
-open class CommentRef(id: UUID = UUID.randomUUID()) : CommentS(id)
-
-sealed class CommentS(id: UUID) : TargetRef(id)
diff --git a/src/main/kotlin/entity/Constitution.kt b/src/main/kotlin/entity/Constitution.kt
deleted file mode 100644
index 66ddc2a..0000000
--- a/src/main/kotlin/entity/Constitution.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.immutable.*
-import fr.postgresjson.entity.mutable.EntityDeletedAt
-import fr.postgresjson.entity.mutable.EntityDeletedAtImp
-import fr.postgresjson.entity.mutable.EntityVersioning
-import fr.postgresjson.entity.mutable.UuidEntityVersioning
-import java.util.*
-
-class Constitution(
-    id: UUID = UUID.randomUUID(),
-    title: String,
-    anonymous: Boolean = true,
-    titles: MutableList<TitleSimple<ArticleSimple>> = mutableListOf(),
-    draft: Boolean = false,
-    lastVersion: Boolean = false,
-    override val createdBy: CitizenSimple
-) : ConstitutionSimple<CitizenSimple, ConstitutionSimple.TitleSimple<ArticleSimple>>(
-    id,
-    title = title,
-    anonymous = anonymous,
-    titles = titles,
-    draft = draft,
-    lastVersion = lastVersion,
-    createdBy = createdBy
-) {
-
-    class Title(
-        id: UUID = UUID.randomUUID(),
-        name: String,
-        rank: Int? = null,
-        override val articles: MutableList<ArticleSimple> = mutableListOf()
-    ) : ConstitutionSimple.TitleSimple<ArticleSimple>(id, name, rank)
-}
-
-open class ConstitutionSimple<Cr : CitizenRefWithUser, T : ConstitutionSimple.TitleSimple<*>>(
-    id: UUID = UUID.randomUUID(),
-    var title: String,
-    var anonymous: Boolean = true,
-    open var titles: MutableList<T> = mutableListOf(),
-    var draft: Boolean = false,
-    var lastVersion: Boolean = false,
-    override val createdBy: Cr,
-    versionId: UUID = UUID.randomUUID()
-) : ConstitutionRef(id),
-    EntityVersioning<UUID, Int> by UuidEntityVersioning(versionId = versionId),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityCreatedBy<Cr> by EntityCreatedByImp(createdBy),
-    EntityDeletedAt by EntityDeletedAtImp() {
-
-    init {
-        titles.forEachIndexed { index, title ->
-            title.rank = index
-        }
-    }
-
-    open class TitleSimple<A : ArticleI>(
-        id: UUID = UUID.randomUUID(),
-        var name: String,
-        var rank: Int? = null,
-        open val articles: MutableList<A> = mutableListOf()
-    ) : TitleRef(id)
-}
-
-open class ConstitutionRef(id: UUID = UUID.randomUUID()) : ConstitutionS(id) {
-    open class TitleRef(
-        id: UUID = UUID.randomUUID()
-    ) : UuidEntity(id)
-}
-
-sealed class ConstitutionS(id: UUID = UUID.randomUUID()) : TargetRef(id), TargetI
\ No newline at end of file
diff --git a/src/main/kotlin/entity/Follow.kt b/src/main/kotlin/entity/Follow.kt
deleted file mode 100644
index 5ac948f..0000000
--- a/src/main/kotlin/entity/Follow.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.immutable.*
-import java.util.*
-
-class Follow<T : TargetI>(
-    id: UUID = UUID.randomUUID(),
-    override val createdBy: CitizenBasic,
-    override var target: T
-) : ExtraI<T, CitizenBasicI>,
-    FollowSimple<T, CitizenBasicI>(id, createdBy, target)
-
-open class FollowSimple<T : TargetI, C : CitizenI>(
-    id: UUID = UUID.randomUUID(),
-    override val createdBy: C,
-    override var target: T
-) : ExtraI<T, C>,
-    UuidEntity(id),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityCreatedBy<C> by EntityCreatedByImp(createdBy)
diff --git a/src/main/kotlin/entity/Opinion.kt b/src/main/kotlin/entity/Opinion.kt
deleted file mode 100644
index cffc61d..0000000
--- a/src/main/kotlin/entity/Opinion.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.immutable.EntityCreatedAt
-import fr.postgresjson.entity.immutable.EntityCreatedAtImp
-import fr.postgresjson.entity.immutable.EntityCreatedBy
-import fr.postgresjson.entity.immutable.EntityCreatedByImp
-import java.util.*
-
-open class Opinion<T : TargetI>(
-    id: UUID = UUID.randomUUID(),
-    override val createdBy: CitizenBasic,
-    override val target: T,
-    val choice: OpinionChoice
-) : ExtraI<T, CitizenBasicI>,
-    TargetRef(id),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityCreatedBy<CitizenBasicI> by EntityCreatedByImp(createdBy) {
-
-    fun getName(): String = choice.name
-}
-
-class OpinionArticle(
-    id: UUID = UUID.randomUUID(),
-    createdBy: CitizenBasic,
-    target: ArticleRef,
-    choice: OpinionChoice
-) : Opinion<ArticleRef>(id, createdBy, target, choice)
\ No newline at end of file
diff --git a/src/main/kotlin/entity/OpinionChoice.kt b/src/main/kotlin/entity/OpinionChoice.kt
deleted file mode 100644
index c25632c..0000000
--- a/src/main/kotlin/entity/OpinionChoice.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.immutable.EntityCreatedAt
-import fr.postgresjson.entity.immutable.EntityCreatedAtImp
-import fr.postgresjson.entity.immutable.UuidEntity
-import fr.postgresjson.entity.mutable.EntityDeletedAt
-import fr.postgresjson.entity.mutable.EntityDeletedAtImp
-import java.util.*
-
-class OpinionChoice(
-    id: UUID? = null,
-    val name: String,
-    val target: List<String>?
-) : OpinionChoiceRef(id),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityDeletedAt by EntityDeletedAtImp()
-
-open class OpinionChoiceRef(
-    id: UUID?
-) : UuidEntity(id ?: UUID.randomUUID())
\ No newline at end of file
diff --git a/src/main/kotlin/entity/Opinionable.kt b/src/main/kotlin/entity/Opinionable.kt
deleted file mode 100644
index ba84451..0000000
--- a/src/main/kotlin/entity/Opinionable.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.EntityI
-
-class OpinionAggregation(
-    private val underlying: MutableMap<String, Any> = mutableMapOf()
-) : MutableMap<String, Any> by underlying, EntityI
-
-interface Opinionable {
-    var opinions: MutableMap<String, Int>
-}
-
-class OpinionableImp : Opinionable {
-    override var opinions: MutableMap<String, Int> = mutableMapOf()
-}
\ No newline at end of file
diff --git a/src/main/kotlin/entity/User.kt b/src/main/kotlin/entity/User.kt
deleted file mode 100644
index e7a5317..0000000
--- a/src/main/kotlin/entity/User.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package fr.dcproject.entity
-
-import fr.dcproject.entity.UserI.Roles
-import fr.postgresjson.entity.immutable.*
-import io.ktor.auth.Principal
-import org.joda.time.DateTime
-import java.util.*
-
-class User(
-    id: UUID = UUID.randomUUID(),
-    username: String,
-    blockedAt: DateTime? = null,
-    override var plainPassword: String? = null,
-    override var roles: List<Roles> = emptyList()
-) : UserFull, UserBasic(id, username, blockedAt),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityUpdatedAt by EntityUpdatedAtImp()
-
-open class UserBasic(
-    id: UUID = UUID.randomUUID(),
-    override var username: String,
-    override var blockedAt: DateTime? = null
-) : UserBasicI, UserRef(id)
-
-open class UserRef(
-    id: UUID = UUID.randomUUID()
-) : UserI, UuidEntity(id)
-
-interface UserI : UuidEntityI, Principal {
-    enum class Roles { ROLE_USER, ROLE_ADMIN }
-}
-
-interface UserBasicI : UserI {
-    var username: String
-    var blockedAt: DateTime?
-}
-
-interface UserFull : UserBasicI, EntityCreatedAt, EntityUpdatedAt {
-    var plainPassword: String?
-    var roles: List<Roles>
-}
diff --git a/src/main/kotlin/entity/ViewAggregation.kt b/src/main/kotlin/entity/ViewAggregation.kt
deleted file mode 100644
index 9b810e7..0000000
--- a/src/main/kotlin/entity/ViewAggregation.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.EntityI
-import fr.postgresjson.entity.immutable.EntityUpdatedAt
-import fr.postgresjson.entity.immutable.EntityUpdatedAtImp
-
-open class ViewAggregation(
-    val total: Int,
-    val unique: Int
-) : EntityI,
-    EntityUpdatedAt by EntityUpdatedAtImp() {
-    constructor() : this(0, 0)
-}
diff --git a/src/main/kotlin/entity/Viewable.kt b/src/main/kotlin/entity/Viewable.kt
deleted file mode 100644
index ddbb8b0..0000000
--- a/src/main/kotlin/entity/Viewable.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package fr.dcproject.entity
-
-interface Viewable {
-    var views: ViewAggregation
-}
-
-class ViewableImp : Viewable {
-    override var views: ViewAggregation = ViewAggregation()
-}
\ No newline at end of file
diff --git a/src/main/kotlin/entity/Votable.kt b/src/main/kotlin/entity/Votable.kt
deleted file mode 100644
index c2725f7..0000000
--- a/src/main/kotlin/entity/Votable.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package fr.dcproject.entity
-
-interface Votable {
-    var votes: VoteAggregation
-}
-
-class VotableImp : Votable {
-    override var votes: VoteAggregation = VoteAggregation()
-}
\ No newline at end of file
diff --git a/src/main/kotlin/entity/Vote.kt b/src/main/kotlin/entity/Vote.kt
deleted file mode 100644
index 644e451..0000000
--- a/src/main/kotlin/entity/Vote.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.immutable.*
-import java.util.*
-
-open class Vote<T : TargetI>(
-    id: UUID = UUID.randomUUID(),
-    override val createdBy: CitizenBasic,
-    override var target: T,
-    var note: Int,
-    var anonymous: Boolean = true
-) : ExtraI<T, CitizenBasicI>,
-    UuidEntity(id),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityCreatedBy<CitizenBasicI> by EntityCreatedByImp(createdBy),
-    EntityUpdatedAt by EntityUpdatedAtImp() {
-    init {
-        if (note > 1 && note < -1) {
-            error("note must be 1, 0 or -1")
-        }
-    }
-}
diff --git a/src/main/kotlin/entity/VoteAggregation.kt b/src/main/kotlin/entity/VoteAggregation.kt
deleted file mode 100644
index f30bb43..0000000
--- a/src/main/kotlin/entity/VoteAggregation.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package fr.dcproject.entity
-
-import fr.postgresjson.entity.EntityI
-import fr.postgresjson.entity.mutable.EntityUpdatedAt
-import fr.postgresjson.entity.mutable.EntityUpdatedAtImp
-
-open class VoteAggregation(
-    val up: Int,
-    val neutral: Int,
-    val down: Int,
-    val total: Int,
-    val score: Int
-) : EntityI,
-    EntityUpdatedAt by EntityUpdatedAtImp() {
-    constructor() : this(0, 0, 0, 0, 0)
-}
diff --git a/src/main/kotlin/entity/Workgroup.kt b/src/main/kotlin/entity/Workgroup.kt
deleted file mode 100644
index 2b105bd..0000000
--- a/src/main/kotlin/entity/Workgroup.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-package fr.dcproject.entity
-
-import fr.dcproject.entity.WorkgroupWithMembersI.Member
-import fr.dcproject.entity.WorkgroupWithMembersI.Member.Role
-import fr.postgresjson.entity.EntityI
-import fr.postgresjson.entity.immutable.*
-import fr.postgresjson.entity.mutable.EntityDeletedAt
-import fr.postgresjson.entity.mutable.EntityDeletedAtImp
-import java.util.*
-
-class Workgroup(
-    id: UUID? = null,
-    name: String,
-    description: String,
-    logo: String? = null,
-    anonymous: Boolean = true,
-    createdBy: CitizenBasic,
-    override var members: List<Member<CitizenBasic>> = emptyList()
-) : WorkgroupWithAuthI<CitizenBasic>,
-    WorkgroupSimple<CitizenBasic>(
-        id,
-        name,
-        description,
-        logo,
-        anonymous,
-        createdBy
-    ),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityUpdatedAt by EntityUpdatedAtImp()
-
-open class WorkgroupSimple<Z : CitizenRef>(
-    id: UUID? = null,
-    var name: String,
-    var description: String,
-    var logo: String? = null,
-    var anonymous: Boolean = true,
-    createdBy: Z
-) : WorkgroupRef(id),
-    EntityCreatedBy<Z> by EntityCreatedByImp(createdBy),
-    EntityDeletedAt by EntityDeletedAtImp()
-
-open class WorkgroupRef(
-    id: UUID? = null
-) : UuidEntity(id ?: UUID.randomUUID()), WorkgroupI
-
-interface WorkgroupWithAuthI<Z : CitizenWithUserI> : WorkgroupWithMembersI<Z>, EntityCreatedBy<Z>, EntityDeletedAt {
-    val anonymous: Boolean
-
-    fun isMember(user: UserI): Boolean = members.isMember(user)
-    fun isMember(citizen: CitizenWithUserI): Boolean = members.isMember(citizen)
-
-    fun hasRole(expectedRole: Role, user: UserI): Boolean = members.hasRole(expectedRole, user)
-    fun hasRole(expectedRole: Role, citizen: CitizenI): Boolean = members.hasRole(expectedRole, citizen)
-
-    fun getRoles(user: UserI): List<Role> = members.getRoles(user)
-    fun getRoles(citizen: CitizenI): List<Role> = members.getRoles(citizen)
-}
-
-interface WorkgroupWithMembersI<Z : CitizenI> : WorkgroupI {
-    var members: List<Member<Z>>
-
-    class Member<C : CitizenI> (
-        val citizen: C,
-        val roles: List<Role> = emptyList()
-    ) : EntityI {
-        enum class Role {
-            MASTER,
-            MANAGER,
-            EDITOR,
-            REPORTER
-        }
-    }
-}
-
-fun List<CitizenI>.hasCitizen(citizen: CitizenI): Boolean = this.map { it.id }.contains(citizen.id)
-
-fun <Z : CitizenWithUserI> List<Member<Z>>.isMember(user: UserI): Boolean =
-    map { it.citizen.user.id }.contains(user.id)
-
-fun <Z : CitizenI> List<Member<Z>>.isMember(citizen: CitizenI): Boolean =
-    map { it.citizen.id }.contains(citizen.id)
-
-fun <Z : CitizenI> List<Member<Z>>.hasRole(expectedRole: Role, citizen: CitizenI): Boolean =
-    any { member -> member.citizen.id == citizen.id && member.roles.any { it == expectedRole } }
-
-fun <Z : CitizenWithUserI> List<Member<Z>>.hasRole(expectedRole: Role, user: UserI): Boolean =
-    any { member -> member.citizen.user.id == user.id && member.roles.any { it == expectedRole } }
-
-fun <Z : CitizenWithUserI> List<Member<Z>>.getRoles(user: UserI): List<Role> =
-    firstOrNull { it.citizen.user.id == user.id }?.roles ?: emptyList()
-
-fun <Z : CitizenWithUserI> List<Member<Z>>.getRoles(citizen: CitizenI): List<Role> =
-    firstOrNull { it.citizen.id == citizen.id }?.roles ?: emptyList()
-
-interface WorkgroupI : UuidEntityI
\ No newline at end of file
diff --git a/src/main/kotlin/event/EventNotification.kt b/src/main/kotlin/event/EventNotification.kt
deleted file mode 100644
index 0e92412..0000000
--- a/src/main/kotlin/event/EventNotification.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-package fr.dcproject.event
-
-import com.rabbitmq.client.*
-import com.rabbitmq.client.BuiltinExchangeType.DIRECT
-import fr.dcproject.Config
-import fr.dcproject.entity.Article
-import fr.dcproject.entity.CitizenRef
-import fr.dcproject.entity.FollowSimple
-import fr.dcproject.entity.TargetRef
-import fr.dcproject.event.publisher.Publisher
-import fr.dcproject.messages.NotificationEmailSender
-import fr.dcproject.repository.Follow
-import fr.postgresjson.serializer.deserialize
-import io.ktor.application.ApplicationCall
-import io.ktor.application.EventDefinition
-import io.ktor.application.application
-import io.ktor.util.pipeline.PipelineContext
-import io.lettuce.core.api.async.RedisAsyncCommands
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.io.errors.IOException
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import fr.dcproject.repository.FollowArticle as FollowArticleRepository
-
-class ArticleUpdate(
-    target: Article
-) : EntityEvent(target, "article", "update") {
-    companion object {
-        val event = EventDefinition<ArticleUpdate>()
-    }
-}
-
-fun <T : Event> PipelineContext<Unit, ApplicationCall>.raiseEvent(definition: EventDefinition<T>, value: T) =
-    application.environment.monitor.raise(definition, value)
-
-class EventNotification(
-    private val config: EventSubscriber.Configuration,
-    private val rabbitFactory: ConnectionFactory,
-    private val redis: RedisAsyncCommands<String, String>,
-    private val followRepo: FollowArticleRepository,
-    private val publisher: Publisher,
-    private val notificationEmailSender: NotificationEmailSender
-) {
-    private val logger: Logger = LoggerFactory.getLogger(Publisher::class.qualifiedName)
-
-    fun config() {
-        /* Config Rabbit */
-        val exchangeName = Config.exchangeNotificationName
-        rabbitFactory.newConnection().use { connection ->
-            connection.createChannel().use { channel ->
-                channel.queueDeclare("push", true, false, false, null)
-                channel.queueDeclare("email", true, false, false, null)
-                channel.exchangeDeclare(exchangeName, DIRECT, true)
-                channel.queueBind("push", exchangeName, "")
-                channel.queueBind("email", exchangeName, "")
-            }
-        }
-
-        /* Declare publisher on event */
-        config.subscribe(ArticleUpdate.event) {
-            publisher.publish(it)
-        }
-
-        /* Launch Consumer */
-        GlobalScope.launch {
-            val rabbitChannel = rabbitFactory.newConnection().createChannel()
-
-            val consumerPush: Consumer = object : DefaultConsumer(rabbitChannel) {
-                @Throws(IOException::class)
-                override fun handleDelivery(
-                    consumerTag: String,
-                    envelope: Envelope,
-                    properties: AMQP.BasicProperties,
-                    body: ByteArray
-                ) = runBlocking {
-                    decodeEvent(body) {
-                        redis.zadd(
-                            "notification:${follow.createdBy.id}",
-                            event.id,
-                            rawEvent
-                        )
-                    }
-
-                    rabbitChannel.basicAck(envelope.deliveryTag, false)
-                }
-            }
-
-            val consumerEmail: Consumer = object : DefaultConsumer(rabbitChannel) {
-                @Throws(IOException::class)
-                override fun handleDelivery(
-                    consumerTag: String,
-                    envelope: Envelope,
-                    properties: AMQP.BasicProperties,
-                    body: ByteArray
-                ) {
-                    runBlocking {
-                        decodeEvent(body) {
-                            logger.debug("EmailSend to: ${follow.createdBy.id}")
-                            notificationEmailSender.sendEmail(follow)
-                        }
-                    }
-                    rabbitChannel.basicAck(envelope.deliveryTag, false)
-                }
-            }
-            rabbitChannel.basicConsume("push", false, consumerPush) // The front consume the redis via Websocket
-            rabbitChannel.basicConsume("email", false, consumerEmail)
-        }
-    }
-
-    private suspend fun decodeEvent(body: ByteArray, action: suspend Msg.() -> Unit) {
-        val rawEvent = body.toString(Charsets.UTF_8)
-        val event = rawEvent.deserialize<EntityEvent>() ?: error("Unable to unserialise event message from rabbit")
-        val repo = when (event.type) {
-            "article" -> followRepo
-            else -> error("event '${event.type}' not implemented")
-        } as Follow<*, *>
-
-        repo
-            .findFollowsByTarget(event.target)
-            .collect {
-                Msg(event, rawEvent, it).action()
-            }
-    }
-
-    private class Msg(
-        val event: EntityEvent,
-        val rawEvent: String,
-        val follow: FollowSimple<out TargetRef, CitizenRef>
-    )
-}
diff --git a/src/main/kotlin/event/EventSubscriber.kt b/src/main/kotlin/event/EventSubscriber.kt
deleted file mode 100644
index 23f553d..0000000
--- a/src/main/kotlin/event/EventSubscriber.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package fr.dcproject.event
-
-import fr.postgresjson.entity.Serializable
-import fr.postgresjson.entity.immutable.UuidEntity
-import io.ktor.application.*
-import io.ktor.util.AttributeKey
-import io.ktor.util.KtorExperimentalAPI
-import kotlinx.coroutines.DisposableHandle
-import org.joda.time.DateTime
-import kotlin.random.Random.Default.nextInt
-
-open class Event(
-    val type: String,
-    val createdAt: DateTime = DateTime.now()
-) : Serializable {
-    val id: Double = randId(createdAt.millis)
-
-    private fun randId(time: Long): Double {
-        return (time.toString() + nextInt(1000, 9999).toString()).toDouble()
-    }
-}
-
-open class EntityEvent(
-    val target: UuidEntity,
-    type: String,
-    val action: String
-) : Event(type)
-
-/**
- * Installation Class
- */
-class EventSubscriber {
-    class Configuration(private val monitor: ApplicationEvents) {
-        private val subscribers = mutableListOf<DisposableHandle>()
-        fun <T : Event> subscribe(definition: EventDefinition<T>, handler: EventHandler<T>): DisposableHandle {
-            return monitor.subscribe(definition, handler).also {
-                subscribers.add(it)
-            }
-        }
-    }
-
-    companion object Feature : ApplicationFeature<Application, Configuration, EventSubscriber> {
-        override val key = AttributeKey<EventSubscriber>("EventSubscriber")
-
-        @KtorExperimentalAPI
-        override fun install(
-            pipeline: Application,
-            configure: Configuration.() -> Unit
-        ): EventSubscriber {
-            Configuration(pipeline.environment.monitor).apply(configure)
-            return EventSubscriber()
-        }
-    }
-}
diff --git a/src/main/kotlin/event/publisher/Publisher.kt b/src/main/kotlin/event/publisher/Publisher.kt
deleted file mode 100644
index 89bd9a5..0000000
--- a/src/main/kotlin/event/publisher/Publisher.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package fr.dcproject.event.publisher
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.rabbitmq.client.ConnectionFactory
-import fr.dcproject.Config
-import fr.dcproject.event.EntityEvent
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-class Publisher(
-    private val mapper: ObjectMapper,
-    private val factory: ConnectionFactory,
-    private val logger: Logger = LoggerFactory.getLogger(Publisher::class.qualifiedName)
-) {
-    fun <T : EntityEvent> publish(it: T): Job {
-        return GlobalScope.launch {
-            factory.newConnection().use { connection ->
-                connection.createChannel().use { channel ->
-                    channel.basicPublish(Config.exchangeNotificationName, "", null, it.serialize().toByteArray())
-                    logger.debug("Publish message ${it.target.id}")
-                }
-            }
-        }
-    }
-
-    private fun EntityEvent.serialize(): String {
-        return mapper.writeValueAsString(this) ?: error("Unable tu serialize message")
-    }
-}
diff --git a/src/main/kotlin/fr/dcproject/application/Application.kt b/src/main/kotlin/fr/dcproject/application/Application.kt
new file mode 100644
index 0000000..eb55b1d
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/application/Application.kt
@@ -0,0 +1,213 @@
+package fr.dcproject.application
+
+import com.fasterxml.jackson.core.util.DefaultIndenter
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.PropertyNamingStrategies
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.datatype.joda.JodaModule
+import com.github.jasync.sql.db.postgresql.exceptions.GenericDatabaseException
+import fr.dcproject.application.Env.PROD
+import fr.dcproject.application.Env.TEST
+import fr.dcproject.common.security.AccessDeniedException
+import fr.dcproject.component.article.articleKoinModule
+import fr.dcproject.component.article.routes.installArticleRoutes
+import fr.dcproject.component.auth.ForbiddenException
+import fr.dcproject.component.auth.authKoinModule
+import fr.dcproject.component.auth.jwt.jwtInstallation
+import fr.dcproject.component.auth.routes.installAuthRoutes
+import fr.dcproject.component.auth.user
+import fr.dcproject.component.citizen.citizenKoinModule
+import fr.dcproject.component.citizen.routes.installCitizenRoutes
+import fr.dcproject.component.comment.article.routes.installCommentArticleRoutes
+import fr.dcproject.component.comment.commentKoinModule
+import fr.dcproject.component.comment.constitution.routes.installCommentConstitutionRoutes
+import fr.dcproject.component.comment.generic.routes.installCommentRoutes
+import fr.dcproject.component.constitution.constitutionKoinModule
+import fr.dcproject.component.constitution.routes.installConstitutionRoutes
+import fr.dcproject.component.doc.routes.installDocRoutes
+import fr.dcproject.component.follow.followKoinModule
+import fr.dcproject.component.follow.routes.article.installFollowArticleRoutes
+import fr.dcproject.component.follow.routes.constitution.installFollowConstitutionRoutes
+import fr.dcproject.component.notification.NotificationConsumer
+import fr.dcproject.component.notification.routes.installNotificationsRoutes
+import fr.dcproject.component.opinion.opinionKoinModule
+import fr.dcproject.component.opinion.routes.installOpinionRoutes
+import fr.dcproject.component.views.viewKoinModule
+import fr.dcproject.component.vote.routes.installVoteRoutes
+import fr.dcproject.component.vote.voteKoinModule
+import fr.dcproject.component.workgroup.routes.installWorkgroupRoutes
+import fr.dcproject.component.workgroup.workgroupKoinModule
+import fr.postgresjson.migration.Migrations
+import io.ktor.application.Application
+import io.ktor.application.ApplicationStopped
+import io.ktor.application.call
+import io.ktor.application.install
+import io.ktor.auth.Authentication
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.jetty.Jetty
+import io.ktor.features.AutoHeadResponse
+import io.ktor.features.CORS
+import io.ktor.features.CallLogging
+import io.ktor.features.ContentNegotiation
+import io.ktor.features.DataConversion
+import io.ktor.features.NotFoundException
+import io.ktor.features.StatusPages
+import io.ktor.http.HttpHeaders
+import io.ktor.http.HttpMethod
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.cio.websocket.pingPeriod
+import io.ktor.http.cio.websocket.timeout
+import io.ktor.jackson.jackson
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Locations
+import io.ktor.response.respond
+import io.ktor.routing.Routing
+import io.ktor.server.jetty.EngineMain
+import io.ktor.util.KtorExperimentalAPI
+import io.ktor.websocket.WebSockets
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.eclipse.jetty.util.log.Slf4jLog
+import org.koin.dsl.module
+import org.koin.ktor.ext.Koin
+import org.koin.ktor.ext.get
+import org.slf4j.event.Level
+import java.time.Duration
+import java.util.concurrent.CompletionException
+
+fun main(args: Array<String>): Unit = EngineMain.main(args)
+
+enum class Env { PROD, TEST }
+
+@ExperimentalCoroutinesApi
+@KtorExperimentalAPI
+@KtorExperimentalLocationsAPI
+@Suppress("unused") // Referenced in application.conf
+fun Application.module(env: Env = PROD) {
+    install(Koin) {
+        Slf4jLog()
+        modules(
+            listOf(
+                if (env == TEST) module { single { Configuration("application-test.conf") } }
+                else module { single { Configuration() } },
+                KoinModule,
+                articleKoinModule,
+                authKoinModule,
+                citizenKoinModule,
+                commentKoinModule,
+                constitutionKoinModule,
+                followKoinModule,
+                opinionKoinModule,
+                viewKoinModule,
+                voteKoinModule,
+                workgroupKoinModule,
+            )
+        )
+    }
+
+    install(CallLogging) {
+        level = Level.INFO
+    }
+
+    install(DataConversion, converters)
+
+    install(Locations)
+
+    HttpClient(Jetty) {
+        engine {
+        }
+    }
+
+    install(WebSockets) {
+        pingPeriod = Duration.ofSeconds(60) // Disabled (null) by default
+        timeout = Duration.ofSeconds(15)
+        maxFrameSize = Long.MAX_VALUE // Disabled (max value). The connection will be closed if surpassed this length.
+        masking = false
+    }
+
+    get<NotificationConsumer>().run {
+        start()
+        environment.monitor.subscribe(ApplicationStopped) {
+            close()
+        }
+    }
+
+    install(Authentication, jwtInstallation(get()))
+
+    install(AutoHeadResponse)
+
+    install(ContentNegotiation) {
+        jackson {
+            propertyNamingStrategy = PropertyNamingStrategies.LOWER_CAMEL_CASE
+
+            registerModule(JodaModule())
+            disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true)
+            configure(SerializationFeature.INDENT_OUTPUT, true)
+            setDefaultPrettyPrinter(
+                DefaultPrettyPrinter().apply {
+                    indentArraysWith(DefaultPrettyPrinter.FixedSpaceIndenter.instance)
+                    indentObjectsWith(DefaultIndenter("  ", "\n"))
+                }
+            )
+        }
+    }
+
+    install(Routing.Feature) {
+        // trace { application.log.trace(it.buildText()) }
+        installArticleRoutes()
+        installAuthRoutes()
+        installCitizenRoutes()
+        installCommentArticleRoutes()
+        installCommentRoutes()
+        installFollowArticleRoutes()
+        installFollowConstitutionRoutes()
+        installWorkgroupRoutes()
+        installOpinionRoutes()
+        installVoteRoutes()
+        installConstitutionRoutes()
+        installCommentConstitutionRoutes()
+        installNotificationsRoutes()
+        installDocRoutes()
+    }
+
+    install(StatusPages) {
+        exception<CompletionException> { e ->
+            val parent = e.cause?.cause
+            if (parent is GenericDatabaseException) {
+                call.respond(HttpStatusCode.BadRequest, parent.errorMessage.message!!)
+            } else {
+                throw e
+            }
+        }
+        exception<NotFoundException> { e ->
+            call.respond(HttpStatusCode.NotFound, e.message!!)
+        }
+        exception<AccessDeniedException> {
+            if (call.user == null) call.respond(HttpStatusCode.Unauthorized)
+            else call.respond(HttpStatusCode.Forbidden)
+        }
+        exception<ForbiddenException> {
+            call.respond(HttpStatusCode.Forbidden)
+        }
+    }
+
+    install(CORS) {
+        method(HttpMethod.Options)
+        method(HttpMethod.Put)
+        method(HttpMethod.Delete)
+        header(HttpHeaders.Authorization)
+        if (env == PROD) {
+            host("localhost:4200", schemes = listOf("http", "https"))
+        } else {
+            anyHost()
+        }
+        allowCredentials = true
+        allowSameOrigin = true
+        maxAgeInSeconds = Duration.ofDays(1).seconds
+    }
+
+    if (env == PROD) {
+        get<Migrations>().run()
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/application/Configuration.kt b/src/main/kotlin/fr/dcproject/application/Configuration.kt
new file mode 100644
index 0000000..922e199
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/application/Configuration.kt
@@ -0,0 +1,46 @@
+package fr.dcproject.application
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+import java.net.URI
+
+class Configuration(val config: Config) {
+    constructor(resourceBasename: String? = null) : this(if (resourceBasename == null) ConfigFactory.load() else ConfigFactory.load(resourceBasename))
+
+    interface Sql {
+        val migrationFiles: URI
+        val functionFiles: URI
+        val fixtureFiles: URI
+    }
+    val sql
+        get() = object : Sql {
+            override val migrationFiles: URI = this::class.java.getResource("/sql/migrations")?.toURI() ?: error("No migrations found")
+            override val functionFiles: URI = this::class.java.getResource("/sql/functions")?.toURI() ?: error("No sql function found")
+            override val fixtureFiles: URI = this::class.java.getResource("/sql/fixtures")?.toURI() ?: error("No sql fixture found")
+        }
+
+    interface Database {
+        val host: String
+        val port: Int
+        var database: String
+        var username: String
+        var password: String
+    }
+    val database
+        get() = object : Database {
+            override val host: String = config.getString("db.host")
+            override val port: Int = config.getInt("db.port")
+            override var database: String = config.getString("db.database")
+            override var username: String = config.getString("db.username")
+            override var password: String = config.getString("db.password")
+        }
+
+    val envName: String = config.getString("app.envName")
+    val domain: String = config.getString("app.domain")
+
+    val redis: String = config.getString("redis.connection")
+    val elasticsearch: String = config.getString("elasticsearch.connection")
+    val rabbitmq: String = config.getString("rabbitmq.connection")
+    val exchangeNotificationName = "notification"
+    val sendGridKey: String = config.getString("mail.sendGrid.key")
+}
diff --git a/src/main/kotlin/fr/dcproject/application/Converters.kt b/src/main/kotlin/fr/dcproject/application/Converters.kt
new file mode 100644
index 0000000..a88ba3b
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/application/Converters.kt
@@ -0,0 +1,31 @@
+package fr.dcproject.application
+
+import io.ktor.features.DataConversion
+import io.ktor.util.KtorExperimentalAPI
+import org.koin.core.context.GlobalContext
+import org.koin.core.parameter.ParametersDefinition
+import org.koin.core.qualifier.Qualifier
+import java.util.UUID
+
+private typealias ConverterDeclaration = DataConversion.Configuration.() -> Unit
+private inline fun <reified T> DataConversion.Configuration.get(
+    qualifier: Qualifier? = null,
+    noinline parameters: ParametersDefinition? = null
+): T = GlobalContext.get().koin.rootScope.get(qualifier, parameters)
+
+@KtorExperimentalAPI
+val converters: ConverterDeclaration = {
+    convert<UUID> {
+        decode { values, _ ->
+            values.singleOrNull()?.let { UUID.fromString(it) }
+        }
+
+        encode { value ->
+            when (value) {
+                null -> listOf()
+                is UUID -> listOf(value.toString())
+                else -> throw InternalError("Cannot convert $value as UUID")
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/application/KoinModule.kt b/src/main/kotlin/fr/dcproject/application/KoinModule.kt
new file mode 100644
index 0000000..949b9d5
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/application/KoinModule.kt
@@ -0,0 +1,110 @@
+package fr.dcproject.application
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.PropertyNamingStrategies
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.databind.module.SimpleModule
+import com.fasterxml.jackson.datatype.joda.JodaModule
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.rabbitmq.client.ConnectionFactory
+import fr.dcproject.common.email.Mailer
+import fr.dcproject.component.notification.NotificationConsumer
+import fr.dcproject.component.notification.NotificationEmailSender
+import fr.dcproject.component.notification.NotificationsPush
+import fr.dcproject.component.notification.Publisher
+import fr.postgresjson.connexion.Connection
+import fr.postgresjson.connexion.Requester
+import fr.postgresjson.migration.Migrations
+import io.ktor.client.HttpClient
+import io.ktor.client.features.websocket.WebSockets
+import io.ktor.util.KtorExperimentalAPI
+import io.lettuce.core.RedisClient
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+
+@KtorExperimentalAPI
+val KoinModule = module {
+    // SQL connection
+    single {
+        val config: Configuration = get()
+        Connection(
+            host = config.database.host,
+            port = config.database.port,
+            database = config.database.database,
+            username = config.database.username,
+            password = config.database.password
+        )
+    }
+
+    // Launch Database migration
+    single {
+        val config: Configuration = get()
+        Migrations(get(), config.sql.migrationFiles, config.sql.functionFiles)
+    }
+
+    // Redis client
+    single<RedisClient> {
+        val config: Configuration = get()
+        RedisClient.create(config.redis).apply {
+            connect().sync().configSet("notify-keyspace-events", "KEA")
+        }
+    }
+
+    single { NotificationsPush.Builder(get()) }
+
+    single {
+        val config: Configuration = get()
+        NotificationConsumer(get(), get(), get(), get(), get(), config.exchangeNotificationName)
+    }
+
+    // RabbitMQ
+    single<ConnectionFactory> {
+        val config: Configuration = get()
+        ConnectionFactory().apply { setUri(config.rabbitmq) }
+    }
+
+    // JsonSerializer
+    single<ObjectMapper> {
+        jacksonObjectMapper().apply {
+            registerModule(SimpleModule())
+            propertyNamingStrategy = PropertyNamingStrategies.LOWER_CAMEL_CASE
+
+            registerModule(JodaModule())
+            disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true)
+        }
+    }
+
+    // Client HTTP for WebSockets
+    single(named("ws")) {
+        HttpClient {
+            install(WebSockets)
+        }
+    }
+
+    // SQL Requester (postgresJson)
+    single {
+        val config: Configuration = get()
+        Requester.RequesterFactory(
+            connection = get(),
+            functionsDirectory = config.sql.functionFiles
+        ).createRequester()
+    }
+
+    // Mailer
+    single {
+        val config: Configuration = get()
+        Mailer(config.sendGridKey)
+    }
+
+    single {
+        val config: Configuration = get()
+        Publisher(factory = get(), exchangeName = config.exchangeNotificationName)
+    }
+
+    single {
+        val config: Configuration = get()
+        NotificationEmailSender(get<Mailer>(), config.domain, get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/common/BitMaskEnum.kt b/src/main/kotlin/fr/dcproject/common/BitMaskEnum.kt
new file mode 100644
index 0000000..bad07bb
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/BitMaskEnum.kt
@@ -0,0 +1,11 @@
+package fr.dcproject.common
+
+interface BitMaskI {
+    val bit: Long
+
+    infix operator fun contains(which: BitMaskI): Boolean = bit and which.bit == which.bit
+    infix operator fun plus(mask: BitMaskI): BitMaskI = BitMask(mask.bit and this.bit)
+    infix operator fun minus(mask: BitMaskI): BitMaskI = BitMask(this.bit - mask.bit)
+}
+
+class BitMask(override val bit: Long) : BitMaskI
diff --git a/src/main/kotlin/messages/Mailer.kt b/src/main/kotlin/fr/dcproject/common/email/Mailer.kt
similarity index 94%
rename from src/main/kotlin/messages/Mailer.kt
rename to src/main/kotlin/fr/dcproject/common/email/Mailer.kt
index 4ffa10b..334a283 100644
--- a/src/main/kotlin/messages/Mailer.kt
+++ b/src/main/kotlin/fr/dcproject/common/email/Mailer.kt
@@ -1,4 +1,4 @@
-package fr.dcproject.messages
+package fr.dcproject.common.email
 
 import com.sendgrid.Method
 import com.sendgrid.Request
@@ -24,4 +24,4 @@ class Mailer(
             throw ex
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/fr/dcproject/common/entity/Action.kt b/src/main/kotlin/fr/dcproject/common/entity/Action.kt
new file mode 100644
index 0000000..6b36054
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/entity/Action.kt
@@ -0,0 +1,28 @@
+package fr.dcproject.common.entity
+
+import fr.dcproject.component.citizen.database.CitizenI
+
+interface Created<C : CitizenI> : CreatedAt, CreatedBy<C> {
+    class Imp<C : CitizenI>(createdBy: C) :
+        Created<C>,
+        CreatedBy<C> by CreatedBy.Imp(createdBy),
+        CreatedAt by CreatedAt.Imp()
+}
+
+interface Updated<C : CitizenI> : UpdatedAt, UpdatedBy<C> {
+    class Imp<C : CitizenI>(updatedAt: C) :
+        Updated<C>,
+        UpdatedBy<C> by UpdatedBy.Imp(updatedAt),
+        UpdatedAt by UpdatedAt.Imp()
+}
+
+interface Deleted<C : CitizenI> : DeletedAt, DeletedBy<C> {
+    override fun isDeleted(): Boolean = (this as DeletedAt).isDeleted()
+
+    class Imp<C : CitizenI>(deletedAt: C) :
+        Deleted<C>,
+        DeletedBy<C> by DeletedBy.Imp(deletedAt),
+        DeletedAt by DeletedAt.Imp() {
+        override fun isDeleted(): Boolean = (this as Deleted<C>).isDeleted()
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/common/entity/ActionBy.kt b/src/main/kotlin/fr/dcproject/common/entity/ActionBy.kt
new file mode 100644
index 0000000..d8f82c7
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/entity/ActionBy.kt
@@ -0,0 +1,25 @@
+package fr.dcproject.common.entity
+
+import fr.dcproject.component.citizen.database.CitizenI
+
+interface CreatedBy<T : CitizenI> {
+    val createdBy: T
+
+    class Imp<T : CitizenI>(override val createdBy: T) : CreatedBy<T>
+}
+
+interface UpdatedBy<T : CitizenI> {
+    val updatedBy: T
+
+    class Imp<T : CitizenI>(override val updatedBy: T) : UpdatedBy<T>
+}
+
+interface DeletedBy<T : CitizenI> {
+    val deletedBy: T?
+
+    fun isDeleted(): Boolean {
+        return deletedBy?.let { true } ?: false
+    }
+
+    class Imp<T : CitizenI>(override val deletedBy: T?) : DeletedBy<T>
+}
diff --git a/src/main/kotlin/fr/dcproject/common/entity/Date.kt b/src/main/kotlin/fr/dcproject/common/entity/Date.kt
new file mode 100644
index 0000000..12fd3ac
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/entity/Date.kt
@@ -0,0 +1,30 @@
+package fr.dcproject.common.entity
+
+import org.joda.time.DateTime
+
+/* Interface */
+interface CreatedAt {
+    val createdAt: DateTime
+    class Imp(
+        override val createdAt: DateTime = DateTime.now()
+    ) : CreatedAt
+}
+interface UpdatedAt {
+    val updatedAt: DateTime
+    class Imp(
+        override val updatedAt: DateTime = DateTime.now()
+    ) : UpdatedAt
+}
+
+interface DeletedAt {
+    val deletedAt: DateTime?
+    fun isDeleted(): Boolean {
+        return deletedAt?.let {
+            it < DateTime.now()
+        } ?: false
+    }
+
+    class Imp(
+        override val deletedAt: DateTime? = null
+    ) : DeletedAt
+}
diff --git a/src/main/kotlin/fr/dcproject/common/entity/EntityI.kt b/src/main/kotlin/fr/dcproject/common/entity/EntityI.kt
new file mode 100644
index 0000000..fa87a5f
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/entity/EntityI.kt
@@ -0,0 +1,12 @@
+package fr.dcproject.common.entity
+
+import fr.postgresjson.entity.UuidEntityI
+import java.util.UUID
+
+interface EntityI : UuidEntityI {
+    override val id: UUID
+}
+
+open class Entity(id: UUID? = null) : EntityI {
+    override val id: UUID = id ?: UUID.randomUUID()
+}
diff --git a/src/main/kotlin/entity/Extra.kt b/src/main/kotlin/fr/dcproject/common/entity/Extra.kt
similarity index 69%
rename from src/main/kotlin/entity/Extra.kt
rename to src/main/kotlin/fr/dcproject/common/entity/Extra.kt
index ae435f2..228235f 100644
--- a/src/main/kotlin/entity/Extra.kt
+++ b/src/main/kotlin/fr/dcproject/common/entity/Extra.kt
@@ -1,21 +1,25 @@
-package fr.dcproject.entity
+package fr.dcproject.common.entity
 
-import fr.postgresjson.entity.immutable.EntityCreatedAt
-import fr.postgresjson.entity.immutable.EntityCreatedBy
-import fr.postgresjson.entity.immutable.UuidEntity
-import fr.postgresjson.entity.immutable.UuidEntityI
-import java.util.*
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.generic.database.CommentRef
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.dcproject.component.opinion.database.OpinionRef
+import java.util.UUID
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
 interface ExtraI<T : TargetI, C : CitizenI> :
-    UuidEntityI,
-    EntityCreatedAt,
-    EntityCreatedBy<C> {
+    EntityI,
+    HasTarget<T>,
+    CreatedAt,
+    CreatedBy<C>
+
+interface HasTarget<T : TargetI> {
     val target: T
 }
 
-open class TargetRef(id: UUID? = null, reference: String = "") : TargetI, UuidEntity(id) {
+open class TargetRef(id: UUID? = null, reference: String = "") : TargetI, Entity(id) {
 
     final override val reference: String
         get() = if (field != "") field else TargetI.getReference(this)
@@ -25,7 +29,7 @@ open class TargetRef(id: UUID? = null, reference: String = "") : TargetI, UuidEn
     }
 }
 
-interface TargetI : UuidEntityI {
+interface TargetI : EntityI {
     enum class TargetName(val targetReference: String) {
         Article("article"),
         Constitution("constitution"),
@@ -39,7 +43,7 @@ interface TargetI : UuidEntityI {
                 t.isSubclassOf(ArticleRef::class) -> TargetName.Article.targetReference
                 t.isSubclassOf(ConstitutionRef::class) -> TargetName.Constitution.targetReference
                 t.isSubclassOf(CommentRef::class) -> TargetName.Comment.targetReference
-                t.isSubclassOf(Opinion::class) -> TargetName.Opinion.targetReference
+                t.isSubclassOf(OpinionRef::class) -> TargetName.Opinion.targetReference
                 else -> throw error("target not implemented: ${t.qualifiedName} \nImplement it or return 'reference' from SQL")
             }
         }
@@ -55,4 +59,4 @@ interface TargetI : UuidEntityI {
     }
 
     val reference: String
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/fr/dcproject/common/entity/Versionable.kt b/src/main/kotlin/fr/dcproject/common/entity/Versionable.kt
new file mode 100644
index 0000000..33c493e
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/entity/Versionable.kt
@@ -0,0 +1,25 @@
+package fr.dcproject.common.entity
+
+import java.util.UUID
+
+interface VersionableId {
+    val versionId: UUID
+
+    class Imp(
+        versionId: UUID? = null,
+    ) : VersionableId {
+        override val versionId: UUID = versionId ?: UUID.randomUUID()
+    }
+}
+
+interface Versionable : VersionableId {
+    override val versionId: UUID
+    val versionNumber: Int
+
+    class Imp(
+        override val versionNumber: Int,
+        versionId: UUID? = null,
+    ) : Versionable {
+        override val versionId: UUID = versionId ?: UUID.randomUUID()
+    }
+}
diff --git a/src/main/kotlin/routes/PaginatedRequest.kt b/src/main/kotlin/fr/dcproject/common/request/PaginatedRequest.kt
similarity index 99%
rename from src/main/kotlin/routes/PaginatedRequest.kt
rename to src/main/kotlin/fr/dcproject/common/request/PaginatedRequest.kt
index de27da5..063c961 100644
--- a/src/main/kotlin/routes/PaginatedRequest.kt
+++ b/src/main/kotlin/fr/dcproject/common/request/PaginatedRequest.kt
@@ -11,4 +11,4 @@ open class PaginatedRequest(
 ) : PaginatedRequestI {
     override val page: Int = if (page < 1) 1 else page
     override val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/fr/dcproject/common/response/Paginated.kt b/src/main/kotlin/fr/dcproject/common/response/Paginated.kt
new file mode 100644
index 0000000..a3416cb
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/response/Paginated.kt
@@ -0,0 +1,16 @@
+package fr.dcproject.common.response
+
+import fr.dcproject.common.entity.EntityI
+import fr.postgresjson.connexion.Paginated
+
+fun <E : EntityI> Paginated<E>.toOutput(setup: (E) -> Any): Any {
+    return object {
+        val count = this@toOutput.count
+        val currentPage = this@toOutput.count
+        val limit = this@toOutput.limit
+        val offset = this@toOutput.offset
+        val total = this@toOutput.total
+        val totalPages = this@toOutput.totalPages
+        val result = this@toOutput.result.map { setup(it) }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/common/response/createdBy.kt b/src/main/kotlin/fr/dcproject/common/response/createdBy.kt
new file mode 100644
index 0000000..9a1f3b0
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/response/createdBy.kt
@@ -0,0 +1,21 @@
+package fr.dcproject.common.response
+
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import java.util.UUID
+
+fun CitizenCreatorI.toOutput(): Any = this.let { c ->
+    object {
+        val id: UUID = c.id
+        val name: Any = c.name.let { n ->
+            object {
+                val firstName: String = n.firstName
+                val lastName: String = n.lastName
+            }
+        }
+        val user: Any = c.user.let { u ->
+            object {
+                val username: String = u.username
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/common/security/AccessControlModule.kt b/src/main/kotlin/fr/dcproject/common/security/AccessControlModule.kt
new file mode 100644
index 0000000..1fe2956
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/security/AccessControlModule.kt
@@ -0,0 +1,134 @@
+package fr.dcproject.common.security
+
+/** Responses of AccessControl */
+enum class AccessDecision {
+    GRANTED,
+    DENIED;
+
+    /**
+     * Convert decision to boolean
+     */
+    fun toBoolean(): Boolean = when (this) {
+        GRANTED -> true
+        DENIED -> false
+    }
+}
+
+abstract class AccessControl {
+    /**
+     * A Shortcut for return a GrantedResponse
+     */
+    protected fun granted(message: String? = null, code: String? = null): GrantedResponse = GrantedResponse(this, message, code)
+    /**
+     * A Shortcut for return a DeniedResponse
+     */
+    protected fun denied(message: String, code: String): DeniedResponse = DeniedResponse(this, message, code)
+
+    /**
+     * Check all responses and return DENIED if one is DENIED
+     *
+     * If the list of responses is empty, return GRANTED
+     */
+    private fun AccessResponses.getOneResponse(): AccessResponse = this.firstOrNull { it.decision == AccessDecision.DENIED } ?: granted()
+
+    /**
+     * An helper to convert a list of subject into one response
+     */
+    protected fun <S : List<T>, T> canAll(items: S, action: (T) -> AccessResponse): AccessResponse = items
+        .map { action(it) }
+        .getOneResponse()
+}
+
+/**
+ * Throw an Exception if AccessControl return a DENIED response
+ */
+fun <T : AccessControl> T.assert(action: T.() -> AccessResponse) {
+    action().assert()
+}
+
+/**
+ * Check all responses and return DENIED if one is DENIED
+ *
+ * If the list of responses is empty, return GRANTED
+ */
+fun AccessResponses.getOneResponse(): AccessResponse = this.firstOrNull { it.decision == AccessDecision.DENIED } ?: GrantedResponse(first().accessControl)
+
+/**
+ * Throw an Exception if one response is DENIED
+ */
+fun AccessResponses.assert() = this.getOneResponse().assert()
+
+class AccessDeniedException(private val accessResponses: AccessResponses) : Throwable(accessResponses.first().message) {
+    constructor(accessResponse: AccessResponse) : this(listOf(accessResponse))
+
+    /**
+     * Get first response
+     */
+    fun first(): AccessResponse = accessResponses.first()
+
+    /**
+     * Check if the error code is present into the responses
+     */
+    fun hasErrorCode(code: String): Boolean = accessResponses
+        .filter { it.decision == AccessDecision.DENIED }
+        .any { it.code == code }
+
+    /**
+     * Find and return the response than match with the error code
+     */
+    fun getErrorCode(code: String): AccessResponse? = accessResponses
+        .firstOrNull { it.decision == AccessDecision.DENIED && it.code == code }
+
+    /**
+     * Get a list of messages of all responses
+     */
+    fun getMessages(): List<String> = accessResponses
+        .mapNotNull { it.message }
+
+    /**
+     * Get the first message
+     */
+    fun getFirstMessage(): String? = accessResponses
+        .first()
+        .message
+}
+
+/**
+ * The response that all AccessControl method return
+ * @see GrantedResponse
+ * @see DeniedResponse
+ */
+sealed class AccessResponse(
+    val decision: AccessDecision,
+    val accessControl: AccessControl,
+    val message: String?,
+    val code: String?
+) {
+    /**
+     * Convert response as boolean
+     */
+    fun toBoolean(): Boolean = decision.toBoolean()
+
+    /**
+     * Throw Exception if response if DENIED
+     */
+    fun assert() {
+        if (this.decision == AccessDecision.DENIED) {
+            throw AccessDeniedException(this)
+        }
+    }
+}
+
+class GrantedResponse(
+    accessControl: AccessControl,
+    message: String? = null,
+    code: String? = null
+) : AccessResponse(AccessDecision.GRANTED, accessControl, message, code)
+
+class DeniedResponse(
+    accessControl: AccessControl,
+    message: String,
+    code: String
+) : AccessResponse(AccessDecision.DENIED, accessControl, message, code)
+
+typealias AccessResponses = List<AccessResponse>
diff --git a/src/main/kotlin/fr/dcproject/common/utils/DateTime.kt b/src/main/kotlin/fr/dcproject/common/utils/DateTime.kt
new file mode 100644
index 0000000..74ee9d2
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/utils/DateTime.kt
@@ -0,0 +1,6 @@
+package fr.dcproject.common.utils
+
+import org.joda.time.DateTime
+import org.joda.time.format.ISODateTimeFormat
+
+fun DateTime.toIso(): String = ISODateTimeFormat.dateTime().print(this)
diff --git a/src/main/kotlin/utils/Elastic.kt b/src/main/kotlin/fr/dcproject/common/utils/Elastic.kt
similarity index 95%
rename from src/main/kotlin/utils/Elastic.kt
rename to src/main/kotlin/fr/dcproject/common/utils/Elastic.kt
index 3962a2c..b5f98b7 100644
--- a/src/main/kotlin/utils/Elastic.kt
+++ b/src/main/kotlin/fr/dcproject/common/utils/Elastic.kt
@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 import com.jayway.jsonpath.JsonPath
 import com.jayway.jsonpath.PathNotFoundException
@@ -26,4 +26,4 @@ fun String.getJsonField(jsonPath: String): Int? {
             .warn("No value for Json path ${JsonPath.compile(jsonPath).path}")
         null
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/utils/LoggerDelegate.kt b/src/main/kotlin/fr/dcproject/common/utils/LoggerDelegate.kt
similarity index 55%
rename from src/main/kotlin/utils/LoggerDelegate.kt
rename to src/main/kotlin/fr/dcproject/common/utils/LoggerDelegate.kt
index 6475e10..d6392ee 100644
--- a/src/main/kotlin/utils/LoggerDelegate.kt
+++ b/src/main/kotlin/fr/dcproject/common/utils/LoggerDelegate.kt
@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -6,5 +6,5 @@ import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty
 
 internal class LoggerDelegate<in R : Any> : ReadOnlyProperty<R, Logger> {
-    override fun getValue(thisRef: R, property: KProperty<*>) = LoggerFactory.getLogger(thisRef.javaClass.packageName)
-}
\ No newline at end of file
+    override fun getValue(thisRef: R, property: KProperty<*>): Logger = LoggerFactory.getLogger(thisRef.javaClass.packageName)
+}
diff --git a/src/main/kotlin/fr/dcproject/common/utils/Request.kt b/src/main/kotlin/fr/dcproject/common/utils/Request.kt
new file mode 100644
index 0000000..39d8894
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/utils/Request.kt
@@ -0,0 +1,27 @@
+package fr.dcproject.common.utils
+
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException
+import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
+import io.ktor.application.ApplicationCall
+import io.ktor.application.log
+import io.ktor.features.BadRequestException
+import io.ktor.request.receive
+import kotlin.reflect.typeOf
+
+/**
+ * Receives content for this request.
+ * @param type instance of `KClass` specifying type to be received.
+ * @return instance of [T] received from this call, or `null` if content cannot be transformed to the requested type..
+ */
+@OptIn(ExperimentalStdlibApi::class)
+public suspend inline fun <reified T : Any> ApplicationCall.receiveOrBadRequest(message: String = "Bad Request, wrong body request"): T {
+    return try {
+        receive<T>(typeOf<T>())
+    } catch (cause: MissingKotlinParameterException) {
+        application.log.debug("Conversion failed, throw bad exception", cause)
+        throw BadRequestException(message, cause)
+    } catch (cause: UnrecognizedPropertyException) {
+        application.log.debug("Conversion failed, throw bad exception", cause)
+        throw BadRequestException(message, cause)
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/common/utils/Resources.kt b/src/main/kotlin/fr/dcproject/common/utils/Resources.kt
new file mode 100644
index 0000000..9d1e4df
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/utils/Resources.kt
@@ -0,0 +1,15 @@
+package fr.dcproject.common.utils
+
+import java.net.URL
+
+fun String.readResource(callback: (String) -> Unit = {}): String {
+    val content = callback::class.java.getResource(this)?.readText() ?: error("File not found")
+    callback(content)
+    return content
+}
+
+fun String.getResource(callback: (URL) -> Unit = {}): URL {
+    val content = callback::class.java.getResource(this) ?: error("File not found")
+    callback(content)
+    return content
+}
diff --git a/src/main/kotlin/utils/Uuid.kt b/src/main/kotlin/fr/dcproject/common/utils/Uuid.kt
similarity index 67%
rename from src/main/kotlin/utils/Uuid.kt
rename to src/main/kotlin/fr/dcproject/common/utils/Uuid.kt
index 2824ed1..a820612 100644
--- a/src/main/kotlin/utils/Uuid.kt
+++ b/src/main/kotlin/fr/dcproject/common/utils/Uuid.kt
@@ -1,6 +1,6 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
-import java.util.*
+import java.util.UUID
 
 fun String.toUUID(): UUID = UUID.fromString(this.trim())
 
@@ -8,4 +8,4 @@ fun List<String?>.toUUID(): List<UUID> = this
     .filterNotNull()
     .map { it.trim() }
     .filter { it.isNotBlank() }
-    .map { UUID.fromString(it) }
\ No newline at end of file
+    .map { UUID.fromString(it) }
diff --git a/src/main/kotlin/fr/dcproject/common/utils/waitElastic.kt b/src/main/kotlin/fr/dcproject/common/utils/waitElastic.kt
new file mode 100644
index 0000000..5419797
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/common/utils/waitElastic.kt
@@ -0,0 +1,28 @@
+package fr.dcproject.common.utils
+
+import org.elasticsearch.client.Request
+import org.elasticsearch.client.RestClient
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+fun RestClient.waitElasticsearchIsUp() {
+    val logger: Logger = LoggerFactory.getLogger("fr.dcproject.elasticsearch")
+    val request = Request("GET", "/_cluster/health")
+    repeat(5 * 60 / 2) { // 5 minutes
+        runCatching {
+            performRequest(request).statusLine.statusCode
+        }.onSuccess {
+            if (it == 200) {
+                logger.debug("Elasticsearch is Ready! Continue...")
+                return
+            } else {
+                logger.debug("sleep 2s and retry...")
+                Thread.sleep(2000)
+            }
+        }.onFailure {
+            logger.debug("${it.message}, sleep 2s and retry...")
+            Thread.sleep(2000)
+        }
+    }
+    error("Elasticsearch is not ready")
+}
diff --git a/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt b/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt
new file mode 100644
index 0000000..90604a0
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt
@@ -0,0 +1,52 @@
+package fr.dcproject.component.article
+
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.VersionableId
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.article.database.ArticleAuthI
+import fr.dcproject.component.article.database.ArticleI
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.citizen.database.CitizenI
+
+class ArticleAccessControl(private val articleRepo: ArticleRepository) : AccessControl() {
+    fun <S : ArticleAuthI<*>> canView(subjects: List<S>, citizen: CitizenI?): AccessResponse =
+        canAll(subjects) { canView(it, citizen) }
+
+    fun <S : ArticleAuthI<*>> canView(subject: S, citizen: CitizenI?): AccessResponse {
+        return if (subject.isDeleted()) denied("Article is deleted", "article.deleted")
+        else if (subject.draft && (citizen == null || subject.createdBy.id != citizen.id)) denied("Article is draft, but it's not yours", "article.draft.not.yours")
+        else granted()
+    }
+
+    fun <S : CreatedBy<*>> canDelete(subject: S, citizen: CitizenI?): AccessResponse {
+        if (citizen == null) return denied("You must be connected to create article", "article.create.notConnected")
+        return if (subject.createdBy.id == citizen.id) {
+            granted()
+        } else {
+            denied("Cannot delete article if is not yours", "article.delete.notYours")
+        }
+    }
+
+    fun <S> canUpsert(subject: S, citizen: CitizenI?): AccessResponse
+        where S : ArticleI,
+              S : CreatedBy<*>,
+              S : VersionableId {
+        if (citizen == null) return denied("You must be connected to create article", "article.create.notConnected")
+        /* The new Article must by created by the same citizen of the connected citizen */
+        if (subject.createdBy.id == citizen.id) {
+            /* The creator must be the same of the creator of preview version of article */
+            val lastVersionId = articleRepo
+                .findVersionsByVersionId(1, 1, subject.versionId)
+                .result
+                .firstOrNull()?.createdBy?.id
+
+            return when (lastVersionId) {
+                null -> granted("You can create a new Article")
+                citizen.id -> granted("Last version is yours")
+                else -> denied("Last version is not yours", "article.lastVersion.notYours")
+            }
+        }
+        return denied("This article must be yours for update it", "article.update.notYours")
+    }
+}
diff --git a/src/main/kotlin/views/ArticleViewManager.kt b/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt
similarity index 59%
rename from src/main/kotlin/views/ArticleViewManager.kt
rename to src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt
index 6de186e..7150216 100644
--- a/src/main/kotlin/views/ArticleViewManager.kt
+++ b/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt
@@ -1,17 +1,27 @@
-package fr.dcproject.views
+package fr.dcproject.component.article
 
-import fr.dcproject.entity.*
-import fr.dcproject.utils.contentToString
-import fr.dcproject.utils.getJsonField
-import fr.dcproject.utils.toIso
+import fr.dcproject.common.entity.VersionableId
+import fr.dcproject.common.utils.contentToString
+import fr.dcproject.common.utils.getJsonField
+import fr.dcproject.common.utils.toIso
+import fr.dcproject.component.article.database.ArticleI
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.views.ViewManager
+import fr.dcproject.component.views.entity.ViewAggregation
 import org.elasticsearch.client.Request
 import org.elasticsearch.client.Response
 import org.elasticsearch.client.RestClient
 import org.joda.time.DateTime
-import java.util.*
+import java.util.UUID
 
-class ArticleViewManager(private val restClient: RestClient) : ViewManager<ArticleRefVersioning> {
-    override fun addView(ip: String, article: ArticleRefVersioning, citizen: CitizenRef?, dateTime: DateTime): Response? {
+/**
+ * Wrapper for manage views with elasticsearch
+ */
+class ArticleViewManager <A> (private val restClient: RestClient) : ViewManager<A> where A : VersionableId, A : ArticleI {
+    /**
+     * Add view on article to elasticsearch
+     */
+    override fun addView(ip: String, entity: A, citizen: CitizenI?, dateTime: DateTime): Response? {
         val isLogged = (citizen != null).toString()
         val ref = citizen?.id ?: UUID.nameUUIDFromBytes(ip.toByteArray())!!
         val request = Request(
@@ -19,37 +29,43 @@ class ArticleViewManager(private val restClient: RestClient) : ViewManager<Artic
             "/views/_doc/"
         ).apply {
             //language=JSON
-            setJsonEntity("""
+            setJsonEntity(
+                """
                 {
                   "logged": $isLogged,
                   "type": "article",
                   "user_ref": "$ref",
                   "ip": "$ip",
-                  "id": "${article.id}",
-                  "version_id": "${article.versionId}",
+                  "id": "${entity.id}",
+                  "version_id": "${entity.versionId}",
                   "citizen_id": "${citizen?.id}",
                   "view_at": "${dateTime.toIso()}"
                 }
-            """.trimIndent())
+                """.trimIndent()
+            )
         }
 
         return restClient.performRequest(request)
     }
 
-    override fun getViewsCount(article: ArticleRefVersioning): ViewAggregation {
+    /**
+     * Get article views aggregations from elasticsearch
+     */
+    override fun getViewsCount(entity: A): ViewAggregation {
         val request = Request(
             "GET",
             "/views/_search"
         ).apply {
             //language=JSON
-            setJsonEntity("""
+            setJsonEntity(
+                """
             {
               "size": 0,
               "query": {
                 "bool": {
                   "must": {
                     "term": {
-                      "version_id": "${article.versionId}"
+                      "version_id": "${entity.versionId}"
                     }
                   }
                 }
@@ -70,7 +86,8 @@ class ArticleViewManager(private val restClient: RestClient) : ViewManager<Artic
                 }
               }
             }
-            """.trimIndent())
+                """.trimIndent()
+            )
         }
 
         return restClient
@@ -81,4 +98,4 @@ class ArticleViewManager(private val restClient: RestClient) : ViewManager<Artic
                 )
             }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/fr/dcproject/component/article/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/article/KoinModule.kt
new file mode 100644
index 0000000..3f56332
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/article/KoinModule.kt
@@ -0,0 +1,9 @@
+package fr.dcproject.component.article
+
+import fr.dcproject.component.article.database.ArticleRepository
+import org.koin.dsl.module
+
+val articleKoinModule = module {
+    single { ArticleRepository(get()) }
+    single { ArticleAccessControl(get()) }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/article/database/Article.kt b/src/main/kotlin/fr/dcproject/component/article/database/Article.kt
new file mode 100644
index 0000000..4fda505
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/article/database/Article.kt
@@ -0,0 +1,111 @@
+package fr.dcproject.component.article.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.common.entity.Versionable
+import fr.dcproject.common.entity.VersionableId
+import fr.dcproject.component.citizen.database.CitizenCartI
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.opinion.entity.Opinionable
+import fr.dcproject.component.opinion.entity.Opinions
+import fr.dcproject.component.vote.entity.Votable
+import fr.dcproject.component.vote.entity.VotableImp
+import fr.dcproject.component.workgroup.database.WorkgroupCart
+import fr.dcproject.component.workgroup.database.WorkgroupCartI
+import fr.dcproject.component.workgroup.database.WorkgroupRef
+import org.joda.time.DateTime
+import java.util.UUID
+
+data class ArticleForView(
+    override val id: UUID = UUID.randomUUID(),
+    override val title: String,
+    val anonymous: Boolean = true,
+    val content: String,
+    val description: String,
+    val tags: List<String> = emptyList(),
+    override val createdBy: CitizenCreator,
+    override val versionNumber: Int = 0,
+    override val versionId: UUID = UUID.randomUUID(),
+    val workgroup: WorkgroupCart? = null,
+    override val opinions: Opinions = emptyMap(),
+    override val draft: Boolean = false,
+    override val deletedAt: DateTime? = null
+) : ArticleRef(id),
+    ArticleAuthI<CitizenCreator>,
+    ArticleWithTitleI,
+    Versionable,
+    CreatedAt by CreatedAt.Imp(),
+    DeletedAt by DeletedAt.Imp(deletedAt),
+    VersionableId,
+    Opinionable,
+    Votable by VotableImp() {
+    val lastVersion: Boolean = false
+}
+
+interface ArticleForUpdateI<C : CitizenRef> : ArticleI, ArticleWithTitleI, VersionableId, TargetI, CreatedBy<C> {
+    val anonymous: Boolean
+    val content: String
+    val description: String
+    val draft: Boolean
+    val workgroup: WorkgroupRef?
+}
+
+class ArticleForUpdate(
+    override val id: UUID = UUID.randomUUID(),
+    override val title: String,
+    override val anonymous: Boolean = true,
+    override val content: String,
+    override val description: String,
+    tags: List<String> = emptyList(),
+    override val draft: Boolean = false,
+    override val createdBy: CitizenRef,
+    override val workgroup: WorkgroupRef? = null,
+    override val versionId: UUID = UUID.randomUUID(),
+    override val deletedAt: DateTime? = null,
+) : ArticleRef(id),
+    ArticleForUpdateI<CitizenRef>,
+    ArticleAuthI<CitizenRef>,
+    VersionableId {
+    val tags: List<String> = tags.distinct()
+}
+
+class ArticleForListing(
+    id: UUID? = null,
+    override val title: String,
+    override val createdBy: CitizenCreator,
+    override val workgroup: WorkgroupCart? = null,
+    override val deletedAt: DateTime? = null,
+    override val draft: Boolean = false,
+    val lastVersion: Boolean = false
+) : ArticleForListingI,
+    ArticleRef(id),
+    ArticleAuthI<CitizenCartI>,
+    Votable by VotableImp(),
+    CreatedBy<CitizenCartI>
+
+interface ArticleForListingI : ArticleWithTitleI, CreatedBy<CitizenCartI> {
+    val workgroup: WorkgroupCartI?
+}
+
+open class ArticleRef(
+    id: UUID? = null
+) : ArticleI, TargetRef(id)
+
+interface ArticleI : EntityI, TargetI
+
+interface ArticleWithTitleI : ArticleI {
+    val title: String
+}
+
+interface ArticleAuthI<U : CitizenI> :
+    ArticleI,
+    CreatedBy<U>,
+    DeletedAt {
+    val draft: Boolean
+}
diff --git a/src/main/kotlin/repository/Article.kt b/src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt
similarity index 61%
rename from src/main/kotlin/repository/Article.kt
rename to src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt
index 26dfdab..37d54eb 100644
--- a/src/main/kotlin/repository/Article.kt
+++ b/src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt
@@ -1,23 +1,25 @@
-package fr.dcproject.repository
+package fr.dcproject.component.article.database
 
-import fr.dcproject.entity.ArticleForUpdate
-import fr.dcproject.entity.ArticleSimple
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.entity.Parameter
 import fr.postgresjson.repository.RepositoryI
-import fr.postgresjson.repository.RepositoryI.Direction
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
-import fr.dcproject.entity.Article as ArticleEntity
+import java.util.UUID
 
-class Article(override var requester: Requester) : RepositoryI {
-    fun findById(id: UUID): ArticleEntity? {
+class ArticleRepository(override var requester: Requester) : RepositoryI {
+    fun findById(id: UUID): ArticleForView? {
         val function = requester.getFunction("find_article_by_id")
         return function.selectOne("id" to id)
     }
 
-    fun findVerionsByVersionsId(page: Int = 1, limit: Int = 50, versionId: UUID): Paginated<ArticleEntity> {
+    fun findVersionsById(page: Int = 1, limit: Int = 50, id: UUID): Paginated<ArticleForListing> {
+        return requester
+            .getFunction("find_articles_versions_by_id")
+            .select(page, limit, "id" to id)
+    }
+
+    fun findVersionsByVersionId(page: Int = 1, limit: Int = 50, versionId: UUID): Paginated<ArticleForListing> {
         return requester
             .getFunction("find_articles_versions_by_version_id")
             .select(page, limit, "version_id" to versionId)
@@ -27,14 +29,15 @@ class Article(override var requester: Requester) : RepositoryI {
         page: Int = 1,
         limit: Int = 50,
         sort: String? = null,
-        direction: Direction? = null,
+        direction: RepositoryI.Direction? = null,
         search: String? = null,
         filter: Filter = Filter()
-    ): Paginated<ArticleSimple> {
+    ): Paginated<ArticleForListing> {
         return requester
             .getFunction("find_articles")
             .select(
-                page, limit,
+                page,
+                limit,
                 "sort" to sort?.toSnakeCase(),
                 "direction" to direction,
                 "search" to search,
@@ -42,7 +45,7 @@ class Article(override var requester: Requester) : RepositoryI {
             )
     }
 
-    fun upsert(article: ArticleForUpdate): ArticleEntity? {
+    fun upsert(article: ArticleForUpdate): ArticleForView? {
         return requester
             .getFunction("upsert_article")
             .selectOne("resource" to article)
diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/FindArticleVersions.kt b/src/main/kotlin/fr/dcproject/component/article/routes/FindArticleVersions.kt
new file mode 100644
index 0000000..d9deb0d
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/article/routes/FindArticleVersions.kt
@@ -0,0 +1,72 @@
+package fr.dcproject.component.article.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.article.ArticleAccessControl
+import fr.dcproject.component.article.database.ArticleForListing
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.auth.citizenOrNull
+import fr.postgresjson.repository.RepositoryI
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object FindArticleVersions {
+    @Location("/articles/{article}/versions")
+    class ArticleVersionsRequest(
+        article: UUID,
+        page: Int = 1,
+        limit: Int = 50,
+        val sort: String? = null,
+        val direction: RepositoryI.Direction? = null,
+        val search: String? = null
+    ) {
+        val page: Int = if (page < 1) 1 else page
+        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
+        val article = ArticleRef(article)
+    }
+
+    private fun ArticleRepository.findVersions(request: ArticleVersionsRequest) =
+        findVersionsById(request.page, request.limit, request.article.id)
+
+    fun Route.findArticleVersions(repo: ArticleRepository, ac: ArticleAccessControl) {
+        get<ArticleVersionsRequest> {
+            repo.findVersions(it)
+                .apply { ac.assert { canView(result, citizenOrNull) } }
+                .run {
+                    call.respond(
+                        toOutput { a: ArticleForListing ->
+                            object {
+                                val id = a.id
+                                val title = a.title
+                                val createdBy = object {
+                                    val id = a.createdBy.id
+                                    val name = a.createdBy.name.let { n ->
+                                        object {
+                                            val firstName = n.firstName
+                                            val lastName = n.lastName
+                                        }
+                                    }
+                                    val email = a.createdBy.email
+                                }
+                                val workgroup = a.workgroup?.let { w ->
+                                    object {
+                                        val id = w.id
+                                        val name = w.name
+                                    }
+                                }
+                                val draft = a.draft
+                                val lastVersion = a.lastVersion
+                            }
+                        }
+                    )
+                }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/FindArticles.kt b/src/main/kotlin/fr/dcproject/component/article/routes/FindArticles.kt
new file mode 100644
index 0000000..b0b5abd
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/article/routes/FindArticles.kt
@@ -0,0 +1,68 @@
+package fr.dcproject.component.article.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.article.ArticleAccessControl
+import fr.dcproject.component.article.database.ArticleForListing
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.routes.PaginatedRequest
+import fr.dcproject.routes.PaginatedRequestI
+import fr.postgresjson.connexion.Paginated
+import fr.postgresjson.repository.RepositoryI
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+
+@KtorExperimentalLocationsAPI
+object FindArticles {
+    @Location("/articles")
+    class ArticlesRequest(
+        page: Int = 1,
+        limit: Int = 50,
+        val sort: String? = null,
+        val direction: RepositoryI.Direction? = null,
+        val search: String? = null,
+        val createdBy: String? = null,
+        val workgroup: String? = null
+    ) : PaginatedRequestI by PaginatedRequest(page, limit)
+
+    private fun ArticleRepository.findArticles(request: ArticlesRequest): Paginated<ArticleForListing> {
+        return find(
+            request.page,
+            request.limit,
+            request.sort,
+            request.direction,
+            request.search,
+            ArticleRepository.Filter(createdById = request.createdBy, workgroupId = request.workgroup)
+        )
+    }
+
+    fun Route.findArticles(repo: ArticleRepository, ac: ArticleAccessControl) {
+        get<ArticlesRequest> {
+            repo.findArticles(it)
+                .apply { ac.assert { canView(result, citizenOrNull) } }
+                .let {
+                    call.respond(
+                        it.toOutput {
+                            object {
+                                val id = it.id
+                                val title = it.title
+                                val createdBy: Any = it.createdBy.toOutput()
+                                val workgroup = it.workgroup?.let {
+                                    object {
+                                        val id = it.id
+                                        val name = it.name
+                                    }
+                                }
+                                val draft = it.draft
+                            }
+                        }
+                    )
+                }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt b/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt
new file mode 100644
index 0000000..41b4e58
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt
@@ -0,0 +1,83 @@
+package fr.dcproject.component.article.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.article.ArticleAccessControl
+import fr.dcproject.component.article.ArticleViewManager
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.auth.citizenOrNull
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import kotlinx.coroutines.launch
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetOneArticle {
+    @Location("/articles/{article}")
+    class ArticleRequest(article: UUID) {
+        val article = ArticleRef(article)
+    }
+
+    fun Route.getOneArticle(viewManager: ArticleViewManager<ArticleForView>, ac: ArticleAccessControl, repo: ArticleRepository) {
+        get<ArticleRequest> {
+            val article: ArticleForView = repo.findById(it.article.id) ?: throw NotFoundException("Article ${it.article.id} not found")
+            ac.assert { canView(article, citizenOrNull) }
+
+            call.respond(
+                article.let { a ->
+                    object {
+                        val id = a.id
+                        val versionId = a.versionId
+                        val versionNumber = a.versionNumber
+                        val title = a.title
+                        val anonymous = a.anonymous
+                        val content = a.content
+                        val description = a.description
+                        val tags = a.tags
+                        val draft = a.draft
+                        val lastVersion = a.lastVersion
+                        val createdAt = a.createdAt
+                        val createdBy: Any = object {
+                            val id: UUID = a.createdBy.id
+                            val name: Any = object {
+                                val firstName: String = a.createdBy.name.firstName
+                                val lastName: String = a.createdBy.name.lastName
+                            }
+                            val email: String = a.createdBy.email
+                        }
+                        val workgroup: Any? = a.workgroup?.let { w ->
+                            object {
+                                val id: UUID = w.id
+                                val name: String = w.name
+                            }
+                        }
+                        val votes: Any = object {
+                            val up: Int = a.votes.up
+                            val neutral: Int = a.votes.neutral
+                            val down: Int = a.votes.down
+                            val total: Int = a.votes.total
+                            val score: Int = a.votes.score
+                        }
+                        val views: Any = viewManager.getViewsCount(article).let { v ->
+                            object {
+                                val total = v.total
+                                val unique = v.unique
+                            }
+                        }
+                        val opinions: Map<String, Int> = a.opinions
+                    }
+                }
+            )
+
+            launch {
+                viewManager.addView(call.request.local.remoteHost, article, citizenOrNull)
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/UpsertArticle.kt b/src/main/kotlin/fr/dcproject/component/article/routes/UpsertArticle.kt
new file mode 100644
index 0000000..4d408ad
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/article/routes/UpsertArticle.kt
@@ -0,0 +1,71 @@
+package fr.dcproject.component.article.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.article.ArticleAccessControl
+import fr.dcproject.component.article.database.ArticleForUpdate
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.article.routes.UpsertArticle.UpsertArticleRequest.Input
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.notification.ArticleUpdateNotification
+import fr.dcproject.component.notification.Publisher
+import fr.dcproject.component.workgroup.database.WorkgroupRef
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object UpsertArticle {
+    @Location("/articles")
+    class UpsertArticleRequest {
+        class Input(
+            val id: UUID?,
+            val title: String,
+            val anonymous: Boolean = true,
+            val content: String,
+            val description: String,
+            val tags: List<String> = emptyList(),
+            val draft: Boolean = false,
+            val versionId: UUID,
+            val workgroup: WorkgroupRef? = null,
+        )
+    }
+
+    fun Route.upsertArticle(repo: ArticleRepository, publisher: Publisher, ac: ArticleAccessControl) {
+        suspend fun ApplicationCall.convertRequestToEntity(): ArticleForUpdate = receiveOrBadRequest<Input>().run {
+            ArticleForUpdate(
+                id = id ?: UUID.randomUUID(),
+                title = title,
+                anonymous = anonymous,
+                content = content,
+                description = description,
+                tags = tags,
+                draft = draft,
+                createdBy = citizen,
+                workgroup = workgroup,
+                versionId = versionId
+            )
+        }
+
+        post<UpsertArticleRequest> {
+            val article = call.convertRequestToEntity()
+            ac.assert { canUpsert(article, citizenOrNull) }
+            repo.upsert(article)?.let { a ->
+                call.respond(
+                    object {
+                        val id: UUID = a.id
+                        val versionId = a.versionId
+                        val versionNumber = a.versionNumber
+                    }
+                )
+                publisher.publish(ArticleUpdateNotification(a))
+            } ?: error("Article not updated")
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/install.kt b/src/main/kotlin/fr/dcproject/component/article/routes/install.kt
new file mode 100644
index 0000000..89943bf
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/article/routes/install.kt
@@ -0,0 +1,20 @@
+package fr.dcproject.component.article.routes
+
+import fr.dcproject.component.article.routes.FindArticleVersions.findArticleVersions
+import fr.dcproject.component.article.routes.FindArticles.findArticles
+import fr.dcproject.component.article.routes.GetOneArticle.getOneArticle
+import fr.dcproject.component.article.routes.UpsertArticle.upsertArticle
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installArticleRoutes() {
+    authenticate(optional = true) {
+        findArticles(get(), get())
+        findArticleVersions(get(), get())
+        getOneArticle(get(), get(), get())
+        upsertArticle(get(), get(), get())
+    }
+}
diff --git a/src/main/kotlin/ApplicationContext.kt b/src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt
similarity index 73%
rename from src/main/kotlin/ApplicationContext.kt
rename to src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt
index f57ca38..466998a 100644
--- a/src/main/kotlin/ApplicationContext.kt
+++ b/src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt
@@ -1,21 +1,22 @@
-package fr.dcproject
+package fr.dcproject.component.auth
 
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
-import fr.ktorVoter.ForbiddenException
+import fr.dcproject.component.auth.database.User
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.citizen.database.CitizenRepository
 import io.ktor.application.ApplicationCall
 import io.ktor.auth.authentication
 import io.ktor.util.AttributeKey
 import io.ktor.util.pipeline.PipelineContext
 import org.koin.core.context.GlobalContext
-import fr.dcproject.entity.Citizen as CitizenEntity
-import fr.dcproject.repository.Citizen as CitizenRepository
+import fr.dcproject.component.citizen.database.Citizen as CitizenEntity
+
+class ForbiddenException(message: String) : Exception(message)
 
 private val citizenAttributeKey = AttributeKey<CitizenEntity>("CitizenContext")
 
 val ApplicationCall.citizen: CitizenEntity
     get() = attributes.computeIfAbsent(citizenAttributeKey) {
-        val user = authentication.principal<UserI>() ?: throw ForbiddenException()
+        val user = authentication.principal<UserI>() ?: throw ForbiddenException("No User Connected")
         GlobalContext.get().koin.get<CitizenRepository>().findByUser(user)
             ?: throw ForbiddenException("Citizen not found for this user id \"${user.id}\"")
     }
diff --git a/src/main/kotlin/fr/dcproject/component/auth/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/auth/KoinModule.kt
new file mode 100644
index 0000000..ca05e85
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/KoinModule.kt
@@ -0,0 +1,15 @@
+package fr.dcproject.component.auth
+
+import fr.dcproject.application.Configuration
+import fr.dcproject.common.email.Mailer
+import fr.dcproject.component.auth.database.UserRepository
+import org.koin.dsl.module
+
+val authKoinModule = module {
+    single { UserRepository(get()) }
+    // Used to send a connexion link by email
+    single {
+        val config: Configuration = get()
+        PasswordlessAuth(get<Mailer>(), config.domain, get())
+    }
+}
diff --git a/src/main/kotlin/messages/SsoManager.kt b/src/main/kotlin/fr/dcproject/component/auth/PasswordlessAuth.kt
similarity index 56%
rename from src/main/kotlin/messages/SsoManager.kt
rename to src/main/kotlin/fr/dcproject/component/auth/PasswordlessAuth.kt
index 109b23f..f75b594 100644
--- a/src/main/kotlin/messages/SsoManager.kt
+++ b/src/main/kotlin/fr/dcproject/component/auth/PasswordlessAuth.kt
@@ -1,14 +1,19 @@
-package fr.dcproject.messages
+package fr.dcproject.component.auth
 
 import com.sendgrid.helpers.mail.Mail
 import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
-import fr.dcproject.JwtConfig
-import fr.dcproject.entity.CitizenBasicI
+import fr.dcproject.common.email.Mailer
+import fr.dcproject.component.auth.jwt.makeToken
+import fr.dcproject.component.citizen.database.CitizenRepository
+import fr.dcproject.component.citizen.database.CitizenWithEmail
+import fr.dcproject.component.citizen.database.CitizenWithUserI
 import io.ktor.http.URLBuilder
-import fr.dcproject.repository.Citizen as CitizenRepository
 
-class SsoManager(
+/**
+ * Send a connexion link by email
+ */
+class PasswordlessAuth(
     private val mailer: Mailer,
     private val domain: String,
     private val citizenRepo: CitizenRepository
@@ -18,28 +23,29 @@ class SsoManager(
         sendEmail(citizen, url)
     }
 
-    fun sendEmail(citizen: CitizenBasicI, url: String) {
+    fun <C> sendEmail(citizen: C, url: String) where C : CitizenWithEmail, C : CitizenWithUserI {
         mailer.sendEmail {
+            val token = citizen.user.makeToken()
             Mail(
-                Email("sso@$domain"),
+                Email("passwordless-auth@$domain"),
                 "Connection",
                 Email(citizen.email),
-                Content("text/plain", generateContent(citizen, url))
+                Content("text/plain", generateContent(token, url))
             ).apply {
-                addContent(Content("text/html", generateHtmlContent(citizen, url)))
+                addContent(Content("text/html", generateHtmlContent(token, url)))
             }
         }
     }
 
-    private fun generateHtmlContent(citizen: CitizenBasicI, url: String): String? {
+    private fun generateHtmlContent(token: String, url: String): String? {
         val urlObject = URLBuilder(url)
-        urlObject.parameters.append("token", JwtConfig.makeToken(citizen.user))
+        urlObject.parameters.append("token", token)
         return "Click <a href=\"${urlObject.buildString()}\">here</a> for connect to $domain"
     }
 
-    private fun generateContent(citizen: CitizenBasicI, url: String): String {
+    private fun generateContent(token: String, url: String): String {
         val urlObject = URLBuilder(url)
-        urlObject.parameters.append("token", JwtConfig.makeToken(citizen.user))
+        urlObject.parameters.append("token", token)
         return "Copy this link into your browser for connect to $domain: \n${urlObject.buildString()}"
     }
 
@@ -48,4 +54,4 @@ class SsoManager(
     }
 
     private fun noEmail(email: String): Nothing = throw EmailNotFound(email)
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/fr/dcproject/component/auth/database/User.kt b/src/main/kotlin/fr/dcproject/component/auth/database/User.kt
new file mode 100644
index 0000000..fe43d14
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/database/User.kt
@@ -0,0 +1,61 @@
+package fr.dcproject.component.auth.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.Entity
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.UpdatedAt
+import fr.dcproject.component.auth.database.UserI.Roles
+import io.ktor.auth.Principal
+import org.joda.time.DateTime
+import java.util.UUID
+
+class UserForCreate(
+    id: UUID = UUID.randomUUID(),
+    username: String,
+    override val password: String,
+    blockedAt: DateTime? = null,
+    roles: List<Roles> = emptyList()
+) : User(id, username, blockedAt, roles),
+    UserWithPasswordI
+
+open class User(
+    id: UUID = UUID.randomUUID(),
+    override var username: String,
+    var blockedAt: DateTime? = null,
+    var roles: List<Roles> = emptyList()
+) : UserRef(id),
+    UserWithUsername,
+    CreatedAt by CreatedAt.Imp(),
+    UpdatedAt by UpdatedAt.Imp()
+
+class UserCreator(
+    id: UUID = UUID.randomUUID(),
+    override val username: String,
+) : UserRef(id), UserWithUsername
+
+interface UserWithUsername : UserI {
+    val username: String
+}
+
+interface UserWithPasswordI : UserI {
+    val password: String
+}
+
+class UserWithPassword(
+    id: UUID,
+    override val password: String,
+) : UserWithPasswordI,
+    UserRef(id)
+
+open class UserRef(
+    id: UUID = UUID.randomUUID()
+) : UserI, Entity(id)
+
+interface UserI : EntityI, Principal {
+    enum class Roles { ROLE_USER, ROLE_ADMIN }
+}
+
+interface UserForAuthI : UserI {
+    var roles: List<Roles>
+    var blockedAt: DateTime?
+}
diff --git a/src/main/kotlin/repository/User.kt b/src/main/kotlin/fr/dcproject/component/auth/database/UserRepository.kt
similarity index 70%
rename from src/main/kotlin/repository/User.kt
rename to src/main/kotlin/fr/dcproject/component/auth/database/UserRepository.kt
index b76129d..c09959b 100644
--- a/src/main/kotlin/repository/User.kt
+++ b/src/main/kotlin/fr/dcproject/component/auth/database/UserRepository.kt
@@ -1,23 +1,21 @@
-package fr.dcproject.repository
+package fr.dcproject.component.auth.database
 
-import fr.dcproject.entity.UserFull
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
 import io.ktor.auth.UserPasswordCredential
-import java.util.*
-import fr.dcproject.entity.User as UserEntity
+import java.util.UUID
 
-class User(override var requester: Requester) : RepositoryI {
-    fun findByCredentials(credentials: UserPasswordCredential): UserEntity? {
+class UserRepository(override var requester: Requester) : RepositoryI {
+    fun findByCredentials(credentials: UserPasswordCredential): User? {
         return requester
             .getFunction("check_user")
             .selectOne(
                 "username" to credentials.name,
-                "plain_password" to credentials.password
+                "password" to credentials.password
             )
     }
 
-    fun findById(id: UUID): UserEntity {
+    fun findById(id: UUID): User {
         return requester
             .getFunction("find_user_by_id")
             .selectOne(
@@ -25,13 +23,13 @@ class User(override var requester: Requester) : RepositoryI {
             ) ?: throw UserNotFound(id)
     }
 
-    fun insert(user: UserEntity): UserEntity? {
+    fun insert(user: User): User? {
         return requester
             .getFunction("insert_user")
             .selectOne("resource" to user)
     }
 
-    fun changePassword(user: UserFull) {
+    fun changePassword(user: UserWithPassword) {
         requester
             .getFunction("change_user_password")
             .sendQuery("resource" to user)
diff --git a/src/main/kotlin/fr/dcproject/component/auth/jwt/JWTMaker.kt b/src/main/kotlin/fr/dcproject/component/auth/jwt/JWTMaker.kt
new file mode 100644
index 0000000..349e621
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/jwt/JWTMaker.kt
@@ -0,0 +1,14 @@
+package fr.dcproject.component.auth.jwt
+
+import com.auth0.jwt.JWT
+import fr.dcproject.component.auth.database.UserI
+
+/**
+ * Produce a token for this combination of User and Account
+ */
+fun UserI.makeToken(): String = JWT.create()
+    .withSubject("Authentication")
+    .withIssuer(JwtConfig.issuer)
+    .withClaim("id", id.toString())
+    .withExpiresAt(JwtConfig.getExpiration())
+    .sign(JwtConfig.algorithm)
diff --git a/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtConfig.kt b/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtConfig.kt
new file mode 100644
index 0000000..237cedc
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtConfig.kt
@@ -0,0 +1,25 @@
+package fr.dcproject.component.auth.jwt
+
+import com.auth0.jwt.JWT
+import com.auth0.jwt.JWTVerifier
+import com.auth0.jwt.algorithms.Algorithm
+import java.util.Date
+
+object JwtConfig {
+    private const val secret = "zAP5MBA4B4Ijz0MZaS48"
+    const val issuer = "dc-project.fr"
+    private const val validityInMs = 3_600_000 * 10 // 10 hours
+
+    // TODO change to RSA512
+    val algorithm: Algorithm = Algorithm.HMAC512(secret)
+
+    val verifier: JWTVerifier = JWT
+        .require(algorithm)
+        .withIssuer(issuer)
+        .build()
+
+    /**
+     * Calculate the expiration Date based on current time + the given validity
+     */
+    fun getExpiration() = Date(System.currentTimeMillis() + validityInMs)
+}
diff --git a/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtInstallation.kt b/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtInstallation.kt
new file mode 100644
index 0000000..608138b
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtInstallation.kt
@@ -0,0 +1,43 @@
+package fr.dcproject.component.auth.jwt
+
+import fr.dcproject.component.auth.database.User
+import fr.dcproject.component.auth.database.UserRepository
+import io.ktor.application.ApplicationCall
+import io.ktor.auth.Authentication
+import io.ktor.auth.jwt.jwt
+import io.ktor.http.auth.HttpAuthHeader
+import io.ktor.routing.Routing
+import java.util.UUID
+
+fun jwtInstallation(userRepo: UserRepository): Authentication.Configuration.() -> Unit = {
+    /**
+     * Setup the JWT authentication to be used in [Routing].
+     * If the token is valid, the corresponding [User] is fetched from the database.
+     * The [User] can then be accessed in each [ApplicationCall].
+     */
+    jwt {
+        verifier(JwtConfig.verifier)
+        realm = "dc-project.fr"
+        validate {
+            it.payload.getClaim("id").asString()?.let { id ->
+                userRepo.findById(UUID.fromString(id))
+            }
+        }
+    }
+
+    /* Token in URL */
+    jwt("url") {
+        verifier(JwtConfig.verifier)
+        realm = "dc-project.fr"
+        authHeader { call ->
+            call.request.queryParameters["token"]?.let {
+                HttpAuthHeader.Single("Bearer", it)
+            }
+        }
+        validate {
+            it.payload.getClaim("id").asString()?.let { id ->
+                userRepo.findById(UUID.fromString(id))
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/auth/routes/Login.kt b/src/main/kotlin/fr/dcproject/component/auth/routes/Login.kt
new file mode 100644
index 0000000..6f0b10d
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/routes/Login.kt
@@ -0,0 +1,53 @@
+package fr.dcproject.component.auth.routes
+
+import com.fasterxml.jackson.databind.exc.MismatchedInputException
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.database.UserRepository
+import fr.dcproject.component.auth.jwt.makeToken
+import fr.dcproject.component.auth.routes.Login.LoginRequest.Input
+import io.ktor.application.call
+import io.ktor.auth.UserPasswordCredential
+import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.accept
+import io.ktor.response.respond
+import io.ktor.response.respondText
+import io.ktor.routing.Route
+
+@KtorExperimentalLocationsAPI
+object Login {
+    @Location("/login")
+    class LoginRequest {
+        data class Input(
+            val username: String,
+            val password: String,
+        )
+    }
+
+    fun Route.authLogin(userRepo: UserRepository) {
+        post<LoginRequest> {
+            try {
+                val credentials = call.receiveOrBadRequest<Input>().run {
+                    UserPasswordCredential(username, password)
+                }
+
+                userRepo.findByCredentials(credentials)?.makeToken()?.let { token ->
+                    if (call.request.accept() == ContentType.Application.Json.toString()) {
+                        call.respond(
+                            object {
+                                val token: String = token
+                            }
+                        )
+                    } else {
+                        call.respondText(token)
+                    }
+                } ?: call.respond(HttpStatusCode.BadRequest, "Username not exist or password is wrong")
+            } catch (e: MismatchedInputException) {
+                call.respond(HttpStatusCode.BadRequest, "You must be send name and password to the request")
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt b/src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt
new file mode 100644
index 0000000..08d1d67
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt
@@ -0,0 +1,82 @@
+package fr.dcproject.component.auth.routes
+
+import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.database.UserForCreate
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.auth.jwt.makeToken
+import fr.dcproject.component.auth.routes.Register.RegisterRequest.Input
+import fr.dcproject.component.citizen.database.CitizenForCreate
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRepository
+import io.ktor.application.call
+import io.ktor.features.BadRequestException
+import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.accept
+import io.ktor.response.respond
+import io.ktor.response.respondText
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+
+@KtorExperimentalLocationsAPI
+object Register {
+    @Location("/register")
+    class RegisterRequest {
+        data class Input(
+            val name: Name,
+            val email: String,
+            val birthday: DateTime,
+            val voteAnonymous: Boolean = true,
+            val followAnonymous: Boolean = true,
+            val user: User
+        ) {
+            data class Name(
+                val firstName: String,
+                val lastName: String,
+                val civility: String? = null
+            )
+            data class User(
+                val username: String,
+                val password: String
+            )
+        }
+    }
+
+    fun Route.authRegister(citizenRepo: CitizenRepository) {
+        fun Input.toCitizen(): CitizenForCreate = CitizenForCreate(
+            name = CitizenI.Name(name.firstName, name.lastName, name.civility),
+            birthday = birthday,
+            email = email,
+            followAnonymous = followAnonymous,
+            voteAnonymous = voteAnonymous,
+            user = UserForCreate(
+                username = user.username,
+                password = user.password,
+                roles = listOf(UserI.Roles.ROLE_USER)
+            )
+        )
+
+        post<RegisterRequest> {
+            try {
+                val citizen = call.receiveOrBadRequest<Input>().toCitizen()
+                citizenRepo.insertWithUser(citizen)?.user?.makeToken()?.let { token ->
+                    if (call.request.accept() == ContentType.Application.Json.toString()) {
+                        call.respond(
+                            object {
+                                val token: String = token
+                            }
+                        )
+                    } else {
+                        call.respondText(token)
+                    }
+                } ?: throw BadRequestException("Bad request")
+            } catch (e: MissingKotlinParameterException) {
+                call.respond(HttpStatusCode.BadRequest)
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/auth/routes/Sso.kt b/src/main/kotlin/fr/dcproject/component/auth/routes/Sso.kt
new file mode 100644
index 0000000..26b4155
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/routes/Sso.kt
@@ -0,0 +1,36 @@
+package fr.dcproject.component.auth.routes
+
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.PasswordlessAuth
+import fr.dcproject.component.auth.routes.Sso.PasswordlessRequest.Input
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+
+@KtorExperimentalLocationsAPI
+object Sso {
+    @Location("/auth/passwordless")
+    class PasswordlessRequest {
+        data class Input(val email: String, val url: String)
+    }
+
+    /**
+     * Send an email to the citizen with a link to automatically connect
+     */
+    fun Route.authPasswordless(passwordlessAuth: PasswordlessAuth) {
+        post<PasswordlessRequest> {
+            call.receiveOrBadRequest<Input>().run {
+                try {
+                    passwordlessAuth.sendEmail(email, url)
+                } catch (e: PasswordlessAuth.EmailNotFound) {
+                    call.respond(HttpStatusCode.NotFound)
+                }
+                call.respond(HttpStatusCode.NoContent)
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/auth/routes/install.kt b/src/main/kotlin/fr/dcproject/component/auth/routes/install.kt
new file mode 100644
index 0000000..f6ea265
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/auth/routes/install.kt
@@ -0,0 +1,18 @@
+package fr.dcproject.component.auth.routes
+
+import fr.dcproject.component.auth.routes.Login.authLogin
+import fr.dcproject.component.auth.routes.Register.authRegister
+import fr.dcproject.component.auth.routes.Sso.authPasswordless
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installAuthRoutes() {
+    authenticate(optional = true) {
+        authLogin(get())
+        authRegister(get())
+        authPasswordless(get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/CitizenAccessControl.kt b/src/main/kotlin/fr/dcproject/component/citizen/CitizenAccessControl.kt
new file mode 100644
index 0000000..a6c4f62
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/CitizenAccessControl.kt
@@ -0,0 +1,27 @@
+package fr.dcproject.component.citizen
+
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.citizen.database.CitizenI
+
+class CitizenAccessControl : AccessControl() {
+    fun <S> canView(subjects: List<S>, connectedCitizen: CitizenI?): AccessResponse where S : CitizenI, S : DeletedAt =
+        canAll(subjects) { canView(it, connectedCitizen) }
+
+    fun <S> canView(subject: S, connectedCitizen: CitizenI?): AccessResponse where S : CitizenI, S : DeletedAt {
+        if (connectedCitizen == null) return denied("You must be connected to view citizen", "citizen.view.connected")
+        return if (subject.isDeleted()) denied("You cannot view a deleted citizen", "citizen.view.deleted")
+        else granted()
+    }
+
+    fun <S : CitizenI> canUpdate(subject: S, connectedCitizen: CitizenI?): AccessResponse {
+        if (connectedCitizen == null) return denied("You must be connected to update Citizen", "citizen.update.notConnected")
+        return if (subject.id == connectedCitizen.id) granted() else denied("You can only update your citizen", "citizen.update.notYours")
+    }
+
+    fun <S : CitizenI> canChangePassword(subject: S, connectedCitizen: CitizenI?): AccessResponse {
+        if (connectedCitizen == null) return denied("You must be connected to change your password", "citizen.changePassword.notConnected")
+        return if (subject.id == connectedCitizen.id) granted() else denied("You can only change your password", "citizen.password.notYours")
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/citizen/KoinModule.kt
new file mode 100644
index 0000000..1443ef2
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/KoinModule.kt
@@ -0,0 +1,9 @@
+package fr.dcproject.component.citizen
+
+import fr.dcproject.component.citizen.database.CitizenRepository
+import org.koin.dsl.module
+
+val citizenKoinModule = module {
+    single { CitizenRepository(get()) }
+    single { CitizenAccessControl() }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/database/Citizen.kt b/src/main/kotlin/fr/dcproject/component/citizen/database/Citizen.kt
new file mode 100644
index 0000000..2b1d251
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/database/Citizen.kt
@@ -0,0 +1,122 @@
+package fr.dcproject.component.citizen.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.Entity
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.component.auth.database.User
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.auth.database.UserForCreate
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.auth.database.UserRef
+import fr.dcproject.component.auth.database.UserWithUsername
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import fr.dcproject.component.workgroup.database.WorkgroupRef
+import fr.postgresjson.entity.Serializable
+import org.joda.time.DateTime
+import java.util.UUID
+
+class CitizenForCreate(
+    val name: Name,
+    val email: String,
+    val birthday: DateTime,
+    val voteAnonymous: Boolean = true,
+    val followAnonymous: Boolean = true,
+    override val user: UserForCreate,
+    id: UUID = UUID.randomUUID(),
+) : CitizenI,
+    CitizenRefWithUser(id, user),
+    CreatedAt by CreatedAt.Imp()
+
+class Citizen(
+    override val id: UUID = UUID.randomUUID(),
+    override val name: Name,
+    override val email: String,
+    val birthday: DateTime,
+    override val voteAnonymous: Boolean = true,
+    override val followAnonymous: Boolean = true,
+    override val user: User,
+    deletedAt: DateTime? = null
+) : CitizenWithEmail,
+    CitizenCreatorI,
+    CitizenWithUserI,
+    CitizenRef(id),
+    CitizenCartI,
+    CreatedAt by CreatedAt.Imp(),
+    DeletedAt by DeletedAt.Imp(deletedAt) {
+    var workgroups: List<WorkgroupAndRoles> = emptyList()
+
+    class WorkgroupAndRoles(
+        val roles: List<String>,
+        val workgroup: WorkgroupRef
+    )
+}
+
+data class CitizenCreator(
+    override var id: UUID = UUID.randomUUID(),
+    override var name: Name,
+    override var email: String,
+    override var voteAnonymous: Boolean = true,
+    override var followAnonymous: Boolean = true,
+    override val user: UserCreator,
+    override val deletedAt: DateTime? = null
+) : CitizenCreatorI,
+    CitizenRefWithUser(id, user),
+    DeletedAt by DeletedAt.Imp(deletedAt)
+
+interface CitizenCreatorI : CitizenWithUserI, CitizenWithEmail, CitizenCartI, DeletedAt {
+    override val id: UUID
+    override val name: Name
+    override val email: String
+    val voteAnonymous: Boolean
+    val followAnonymous: Boolean
+    override val user: UserWithUsername
+    override val deletedAt: DateTime?
+}
+
+class CitizenCart(
+    id: UUID = UUID.randomUUID(),
+    override val name: Name,
+    override val user: UserRef,
+    override val deletedAt: DateTime? = null,
+) : CitizenRef(id),
+    CitizenCartI,
+    DeletedAt by DeletedAt.Imp(deletedAt)
+
+interface CitizenCartI : CitizenI, CitizenWithUserI {
+    val name: Name
+}
+
+open class CitizenRefWithUser(
+    id: UUID = UUID.randomUUID(),
+    override val user: UserRef
+) : CitizenWithUserI,
+    CitizenRef(id)
+
+open class CitizenRef(
+    id: UUID = UUID.randomUUID()
+) : Entity(id),
+    CitizenI
+
+interface CitizenI : EntityI {
+    data class Name(
+        override val firstName: String,
+        override val lastName: String,
+        override val civility: String? = null
+    ) : NameI
+
+    interface NameI : Serializable {
+        val firstName: String
+        val lastName: String
+        val civility: String?
+        fun getFullName(): String = "${civility ?: ""} $firstName $lastName".trim()
+    }
+}
+
+interface CitizenWithUserI : CitizenI {
+    val user: UserI
+}
+
+interface CitizenWithEmail : CitizenI {
+    val email: String
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/database/CitizenRepository.kt b/src/main/kotlin/fr/dcproject/component/citizen/database/CitizenRepository.kt
new file mode 100644
index 0000000..16046c0
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/database/CitizenRepository.kt
@@ -0,0 +1,55 @@
+package fr.dcproject.component.citizen.database
+
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import fr.postgresjson.connexion.Paginated
+import fr.postgresjson.connexion.Requester
+import fr.postgresjson.repository.RepositoryI
+import net.pearx.kasechange.toSnakeCase
+import java.util.UUID
+
+class CitizenRepository(override var requester: Requester) : RepositoryI {
+    fun findById(id: UUID): Citizen? = requester
+        .getFunction("find_citizen_by_id_with_user_and_workgroups")
+        .selectOne("id" to id)
+
+    fun findByUser(user: UserI): Citizen? = requester
+        .getFunction("find_citizen_by_user_id")
+        .selectOne("user_id" to user.id)
+
+    fun findByUsername(username: String): Citizen? = requester
+        .getFunction("find_citizen_by_username")
+        .selectOne("username" to username)
+
+    fun findByName(name: Name): Citizen? = requester
+        .getFunction("find_citizen_by_name")
+        .selectOne("name" to name)
+
+    fun findByEmail(email: String): Citizen? = requester
+        .getFunction("find_citizen_by_email")
+        .selectOne("email" to email)
+
+    fun find(
+        page: Int = 1,
+        limit: Int = 50,
+        sort: String? = null,
+        direction: RepositoryI.Direction? = null,
+        search: String? = null
+    ): Paginated<CitizenCreator> = requester
+        .getFunction("find_citizens")
+        .select(
+            page,
+            limit,
+            "sort" to sort?.toSnakeCase(),
+            "direction" to direction,
+            "search" to search
+        )
+
+    fun upsert(citizen: Citizen): Citizen? = requester
+        .getFunction("upsert_citizen")
+        .selectOne("resource" to citizen)
+
+    fun insertWithUser(citizen: CitizenForCreate): Citizen? = requester
+        .getFunction("insert_citizen_with_user")
+        .selectOne("resource" to citizen)
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/routes/ChangeMyPassword.kt b/src/main/kotlin/fr/dcproject/component/citizen/routes/ChangeMyPassword.kt
new file mode 100644
index 0000000..1c3e302
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/routes/ChangeMyPassword.kt
@@ -0,0 +1,45 @@
+package fr.dcproject.component.citizen.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.auth.database.UserRepository
+import fr.dcproject.component.auth.database.UserWithPassword
+import fr.dcproject.component.citizen.CitizenAccessControl
+import fr.dcproject.component.citizen.database.CitizenRef
+import io.ktor.application.call
+import io.ktor.auth.UserPasswordCredential
+import io.ktor.features.BadRequestException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object ChangeMyPassword {
+    @Location("/citizens/{citizen}/password/change")
+    class ChangePasswordCitizenRequest(citizen: UUID) {
+        val citizen = CitizenRef(citizen)
+        data class Input(val oldPassword: String, val newPassword: String)
+    }
+
+    fun Route.changeMyPassword(ac: CitizenAccessControl, userRepository: UserRepository) {
+        put<ChangePasswordCitizenRequest> {
+            ac.assert { canChangePassword(it.citizen, citizenOrNull) }
+            val content = call.receiveOrBadRequest<ChangePasswordCitizenRequest.Input>()
+            userRepository.findByCredentials(UserPasswordCredential(citizen.user.username, content.oldPassword)) ?: throw BadRequestException("Bad Password")
+            userRepository.changePassword(
+                UserWithPassword(
+                    citizen.user.id,
+                    content.newPassword,
+                )
+            )
+
+            call.respond(HttpStatusCode.Created)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/routes/FindCitizens.kt b/src/main/kotlin/fr/dcproject/component/citizen/routes/FindCitizens.kt
new file mode 100644
index 0000000..d3b1ef4
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/routes/FindCitizens.kt
@@ -0,0 +1,49 @@
+package fr.dcproject.component.citizen.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.CitizenAccessControl
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenRepository
+import fr.dcproject.routes.PaginatedRequest
+import fr.dcproject.routes.PaginatedRequestI
+import fr.postgresjson.repository.RepositoryI
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object FindCitizens {
+    @Location("/citizens")
+    class CitizensRequest(
+        page: Int = 1,
+        limit: Int = 50,
+        val sort: String? = null,
+        val direction: RepositoryI.Direction? = null,
+        val search: String? = null
+    ) : PaginatedRequestI by PaginatedRequest(page, limit)
+
+    fun Route.findCitizen(ac: CitizenAccessControl, repo: CitizenRepository) {
+        get<CitizensRequest> {
+            val citizens = repo.find(it.page, it.limit, it.sort, it.direction, it.search)
+            ac.assert { canView(citizens.result, citizenOrNull) }
+            call.respond(
+                citizens.toOutput { c: CitizenCreator ->
+                    object {
+                        val id: UUID = c.id
+                        val name: Any = object {
+                            val firstName: String = c.name.firstName
+                            val lastName: String = c.name.lastName
+                        }
+                        val email: String = c.email
+                    }
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/routes/GetCurrentCitizen.kt b/src/main/kotlin/fr/dcproject/component/citizen/routes/GetCurrentCitizen.kt
new file mode 100644
index 0000000..c6a5fc5
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/routes/GetCurrentCitizen.kt
@@ -0,0 +1,52 @@
+package fr.dcproject.component.citizen.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.CitizenAccessControl
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import org.joda.time.format.ISODateTimeFormat
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetCurrentCitizen {
+    @Location("/citizens/current")
+    class CurrentCitizenRequest
+
+    fun Route.getCurrentCitizen(ac: CitizenAccessControl) {
+        get<CurrentCitizenRequest> {
+            val currentUser = citizenOrNull
+            if (currentUser === null) {
+                call.respond(HttpStatusCode.Unauthorized)
+            } else {
+                ac.assert { canView(currentUser, citizenOrNull) }
+                call.respond(
+                    object {
+                        val id: UUID = citizen.id
+                        val name: Any = citizen.name.let { n ->
+                            object {
+                                val firstName: String = n.firstName
+                                val lastName: String = n.lastName
+                            } 
+                        }
+                        val email: String = citizen.email
+                        val birthday: String = citizen.birthday.run {
+                            toString(ISODateTimeFormat.date())
+                        }
+                        val createdAt: DateTime = citizen.createdAt
+                        val user: Any = object {
+                            val username: String = citizen.user.username
+                        }
+                    }
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/routes/GetOneCitizen.kt b/src/main/kotlin/fr/dcproject/component/citizen/routes/GetOneCitizen.kt
new file mode 100644
index 0000000..b8366c2
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/routes/GetOneCitizen.kt
@@ -0,0 +1,53 @@
+package fr.dcproject.component.citizen.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.CitizenAccessControl
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.citizen.database.CitizenRepository
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import org.joda.time.format.ISODateTimeFormat
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetOneCitizen {
+    @Location("/citizens/{citizen}")
+    class CitizenRequest(citizen: UUID) {
+        val citizen = CitizenRef(citizen)
+    }
+
+    fun Route.getOneCitizen(ac: CitizenAccessControl, citizenRepository: CitizenRepository) {
+        get<CitizenRequest> {
+            val citizen = citizenRepository.findById(it.citizen.id) ?: throw NotFoundException("Citizen not found ${it.citizen.id}")
+            ac.assert { canView(citizen, citizenOrNull) }
+
+            call.respond(
+                object {
+                    val id: UUID = citizen.id
+                    val name: Any = citizen.name.let { n ->
+                        object {
+                            val firstName: String = n.firstName
+                            val lastName: String = n.lastName
+                        }
+                    }
+                    val email: String = citizen.email
+                    val birthday: String = citizen.birthday.run {
+                        toString(ISODateTimeFormat.date())
+                    }
+                    val createdAt: DateTime = citizen.createdAt
+                    val user: Any = object {
+                        val username: String = citizen.user.username
+                    }
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/citizen/routes/install.kt b/src/main/kotlin/fr/dcproject/component/citizen/routes/install.kt
new file mode 100644
index 0000000..c639b2e
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/citizen/routes/install.kt
@@ -0,0 +1,20 @@
+package fr.dcproject.component.citizen.routes
+
+import fr.dcproject.component.citizen.routes.ChangeMyPassword.changeMyPassword
+import fr.dcproject.component.citizen.routes.FindCitizens.findCitizen
+import fr.dcproject.component.citizen.routes.GetCurrentCitizen.getCurrentCitizen
+import fr.dcproject.component.citizen.routes.GetOneCitizen.getOneCitizen
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installCitizenRoutes() {
+    authenticate(optional = true) {
+        findCitizen(get(), get())
+        getOneCitizen(get(), get())
+        getCurrentCitizen(get())
+        changeMyPassword(get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/comment/KoinModule.kt
new file mode 100644
index 0000000..e5d2a4e
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/KoinModule.kt
@@ -0,0 +1,14 @@
+package fr.dcproject.component.comment
+
+import fr.dcproject.component.comment.article.database.CommentArticleRepository
+import fr.dcproject.component.comment.constitution.database.CommentConstitutionRepository
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentRepository
+import org.koin.dsl.module
+
+val commentKoinModule = module {
+    single { CommentRepository(get()) }
+    single { CommentArticleRepository(get()) }
+    single { CommentConstitutionRepository(get()) }
+    single { CommentAccessControl() }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/database/CommentArticleRepository.kt b/src/main/kotlin/fr/dcproject/component/comment/article/database/CommentArticleRepository.kt
new file mode 100644
index 0000000..4c7f1a4
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/article/database/CommentArticleRepository.kt
@@ -0,0 +1,66 @@
+package fr.dcproject.component.comment.article.database
+
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.generic.database.CommentForView
+import fr.dcproject.component.comment.generic.database.CommentRepositoryAbs
+import fr.postgresjson.connexion.Paginated
+import fr.postgresjson.connexion.Requester
+import java.util.UUID
+
+class CommentArticleRepository(requester: Requester) : CommentRepositoryAbs<ArticleForView>(requester) {
+    override fun findById(id: UUID): CommentForView<ArticleForView, CitizenCreatorI>? {
+        return requester
+            .getFunction("find_comment_by_id")
+            .selectOne<CommentForView<ArticleForView, CitizenCreator>>(mapOf("id" to id))
+            as CommentForView<ArticleForView, CitizenCreatorI>?
+    }
+
+    override fun findByCitizen(
+        citizen: CitizenI,
+        page: Int,
+        limit: Int
+    ): Paginated<CommentForView<ArticleForView, CitizenCreatorI>> {
+        return requester.run {
+            getFunction("find_comments_by_citizen")
+                .select<CommentForView<ArticleForView, CitizenCreator>>(
+                    page,
+                    limit,
+                    "created_by_id" to citizen.id,
+                    "reference" to TargetI.getReference(ArticleRef::class)
+                ) as Paginated<CommentForView<ArticleForView, CitizenCreatorI>>
+        }
+    }
+
+    override fun findByTarget(
+        target: EntityI,
+        page: Int,
+        limit: Int,
+        sort: Sort
+    ): Paginated<CommentForView<ArticleForView, CitizenCreatorI>> {
+        return requester
+            .getFunction("find_comments_by_target")
+            .select<CommentForView<ArticleForView, CitizenCreator>>(
+                page,
+                limit,
+                "target_id" to target.id,
+                "sort" to sort.sql
+            ) as Paginated<CommentForView<ArticleForView, CitizenCreatorI>>
+    }
+
+    enum class Sort(val sql: String) {
+        CREATED_AT("created_at"),
+        VOTES("votes");
+
+        companion object {
+            fun fromString(string: String): Sort? {
+                return values().firstOrNull { it.sql == string }
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/routes/CreateCommentArticle.kt b/src/main/kotlin/fr/dcproject/component/comment/article/routes/CreateCommentArticle.kt
new file mode 100644
index 0000000..f4a103e
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/article/routes/CreateCommentArticle.kt
@@ -0,0 +1,50 @@
+package fr.dcproject.component.comment.article.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.article.database.CommentArticleRepository
+import fr.dcproject.component.comment.article.routes.CreateCommentArticle.PostArticleCommentRequest.Input
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentForUpdate
+import fr.dcproject.component.comment.toOutput
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object CreateCommentArticle {
+    @Location("/articles/{article}/comments")
+    class PostArticleCommentRequest(article: UUID) {
+        val article = ArticleRef(article)
+        class Input(val content: String)
+    }
+
+    fun Route.createCommentArticle(repo: CommentArticleRepository, ac: CommentAccessControl) {
+        post<PostArticleCommentRequest> {
+            call.receiveOrBadRequest<Input>().run {
+                CommentForUpdate(
+                    target = it.article,
+                    createdBy = citizen,
+                    content = content
+                )
+            }.let { comment ->
+                ac.assert { canCreate(comment, citizenOrNull) }
+                repo.comment(comment)
+
+                call.respond(
+                    HttpStatusCode.Created,
+                    comment.toOutput()
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetArticleComments.kt b/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetArticleComments.kt
new file mode 100644
index 0000000..896cad6
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetArticleComments.kt
@@ -0,0 +1,49 @@
+package fr.dcproject.component.comment.article.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.article.database.CommentArticleRepository
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.toOutput
+import fr.dcproject.routes.PaginatedRequest
+import fr.dcproject.routes.PaginatedRequestI
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetArticleComments {
+    @Location("/articles/{article}/comments")
+    class ArticleCommentsRequest(
+        article: UUID,
+        page: Int = 1,
+        limit: Int = 50,
+        val search: String? = null,
+        sort: String = CommentArticleRepository.Sort.CREATED_AT.sql
+    ) : PaginatedRequestI by PaginatedRequest(page, limit) {
+        val article = ArticleRef(article)
+        val sort: CommentArticleRepository.Sort = CommentArticleRepository.Sort.fromString(sort) ?: CommentArticleRepository.Sort.CREATED_AT
+    }
+
+    fun Route.getArticleComments(repo: CommentArticleRepository, ac: CommentAccessControl) {
+        get<ArticleCommentsRequest> {
+            val comments = repo.findByTarget(it.article, it.page, it.limit, it.sort)
+            if (comments.result.isNotEmpty()) {
+                ac.assert { canView(comments.result, citizenOrNull) }
+            }
+            call.respond(
+                HttpStatusCode.OK,
+                comments.toOutput { comment ->
+                    comment.toOutput()
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetCitizenArticleComments.kt b/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetCitizenArticleComments.kt
new file mode 100644
index 0000000..3e4409f
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetCitizenArticleComments.kt
@@ -0,0 +1,39 @@
+package fr.dcproject.component.comment.article.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.comment.article.database.CommentArticleRepository
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.toOutput
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetCitizenArticleComments {
+    @Location("/citizens/{citizen}/comments/articles")
+    class CitizenCommentArticleRequest(citizen: UUID) {
+        val citizen = CitizenRef(citizen)
+    }
+
+    fun Route.getCitizenArticleComments(repo: CommentArticleRepository, ac: CommentAccessControl) {
+        get<CitizenCommentArticleRequest> {
+            repo.findByCitizen(it.citizen).let { comments ->
+                ac.assert { canView(comments.result, citizenOrNull) }
+                call.respond(
+                    HttpStatusCode.OK,
+                    comments.toOutput { comment ->
+                        comment.toOutput()
+                    }
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/routes/install.kt b/src/main/kotlin/fr/dcproject/component/comment/article/routes/install.kt
new file mode 100644
index 0000000..b161c80
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/article/routes/install.kt
@@ -0,0 +1,18 @@
+package fr.dcproject.component.comment.article.routes
+
+import fr.dcproject.component.comment.article.routes.CreateCommentArticle.createCommentArticle
+import fr.dcproject.component.comment.article.routes.GetArticleComments.getArticleComments
+import fr.dcproject.component.comment.article.routes.GetCitizenArticleComments.getCitizenArticleComments
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installCommentArticleRoutes() {
+    authenticate(optional = true) {
+        getArticleComments(get(), get())
+        createCommentArticle(get(), get())
+        getCitizenArticleComments(get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/database/CommentConstitutionRepository.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/database/CommentConstitutionRepository.kt
new file mode 100644
index 0000000..e0d03fa
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/database/CommentConstitutionRepository.kt
@@ -0,0 +1,57 @@
+package fr.dcproject.component.comment.constitution.database
+
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.article.database.CommentArticleRepository
+import fr.dcproject.component.comment.generic.database.CommentForView
+import fr.dcproject.component.comment.generic.database.CommentRepositoryAbs
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.postgresjson.connexion.Paginated
+import fr.postgresjson.connexion.Requester
+import java.util.UUID
+
+class CommentConstitutionRepository(requester: Requester) : CommentRepositoryAbs<ConstitutionRef>(requester) {
+    override fun findById(id: UUID): CommentForView<ConstitutionRef, CitizenCreatorI>? {
+        return requester
+            .getFunction("find_comment_by_id")
+            .selectOne(mapOf("id" to id))
+    }
+
+    override fun findByCitizen(
+        citizen: CitizenI,
+        page: Int,
+        limit: Int
+    ): Paginated<CommentForView<ConstitutionRef, CitizenCreatorI>> {
+        return requester.run {
+            getFunction("find_comments_by_citizen")
+                .select<CommentForView<ConstitutionRef, CitizenCreator>>(
+                    page,
+                    limit,
+                    "created_by_id" to citizen.id,
+                    "reference" to TargetI.getReference(ConstitutionRef::class)
+                )
+                as Paginated<CommentForView<ConstitutionRef, CitizenCreatorI>>
+        }
+    }
+
+    override fun findByTarget(
+        target: EntityI,
+        page: Int,
+        limit: Int,
+        sort: CommentArticleRepository.Sort
+    ): Paginated<CommentForView<ConstitutionRef, CitizenCreatorI>> {
+        return requester.run {
+            getFunction("find_comments_by_target")
+                .select<CommentForView<ConstitutionRef, CitizenCreator>>(
+                    page,
+                    limit,
+                    "target_id" to target.id,
+                    "sort" to sort.sql
+                )
+                as Paginated<CommentForView<ConstitutionRef, CitizenCreatorI>>
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/CreateConstitutionComment.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/CreateConstitutionComment.kt
new file mode 100644
index 0000000..e1034c7
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/CreateConstitutionComment.kt
@@ -0,0 +1,50 @@
+package fr.dcproject.component.comment.constitution.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.constitution.database.CommentConstitutionRepository
+import fr.dcproject.component.comment.constitution.routes.CreateConstitutionComment.CreateConstitutionCommentRequest.Input
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentForUpdate
+import fr.dcproject.component.comment.toOutput
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object CreateConstitutionComment {
+    @Location("/constitutions/{constitution}/comments")
+    class CreateConstitutionCommentRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+        class Input(val content: String)
+    }
+
+    fun Route.createConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
+        post<CreateConstitutionCommentRequest> {
+            call.receiveOrBadRequest<Input>().run {
+                CommentForUpdate(
+                    target = it.constitution,
+                    createdBy = citizen,
+                    content = content
+                )
+            }.let { comment ->
+                ac.assert { canCreate(comment, citizenOrNull) }
+                repo.comment(comment)
+
+                call.respond(
+                    HttpStatusCode.Created,
+                    comment.toOutput()
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetCitizenCommentConstitution.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetCitizenCommentConstitution.kt
new file mode 100644
index 0000000..3296bea
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetCitizenCommentConstitution.kt
@@ -0,0 +1,38 @@
+package fr.dcproject.component.comment.constitution.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.comment.constitution.database.CommentConstitutionRepository
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.toOutput
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetCitizenCommentConstitution {
+    @Location("/citizens/{citizen}/comments/constitutions")
+    class GetCitizenCommentConstitutionRequest(citizen: UUID) {
+        val citizen = CitizenRef(citizen)
+    }
+
+    fun Route.getCitizenCommentConstitution(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
+        get<GetCitizenCommentConstitutionRequest> {
+            val comments = repo.findByCitizen(it.citizen)
+            ac.assert { canView(comments.result, citizenOrNull) }
+            call.respond(
+                HttpStatusCode.OK,
+                comments.toOutput { comment ->
+                    comment.toOutput()
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetConstitutionComment.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetConstitutionComment.kt
new file mode 100644
index 0000000..40ae7ef
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetConstitutionComment.kt
@@ -0,0 +1,38 @@
+package fr.dcproject.component.comment.constitution.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.constitution.database.CommentConstitutionRepository
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.toOutput
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetConstitutionComment {
+    @Location("/constitutions/{constitution}/comments")
+    class GetConstitutionCommentRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
+
+    fun Route.getConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
+        get<GetConstitutionCommentRequest> {
+            val comments = repo.findByTarget(it.constitution)
+            ac.assert { canView(comments.result, citizenOrNull) }
+            call.respond(
+                HttpStatusCode.OK,
+                comments.toOutput { comment ->
+                    comment.toOutput()
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/install.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/install.kt
new file mode 100644
index 0000000..8ffc5b6
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/install.kt
@@ -0,0 +1,18 @@
+package fr.dcproject.component.comment.constitution.routes
+
+import fr.dcproject.component.comment.constitution.routes.CreateConstitutionComment.createConstitutionComment
+import fr.dcproject.component.comment.constitution.routes.GetCitizenCommentConstitution.getCitizenCommentConstitution
+import fr.dcproject.component.comment.constitution.routes.GetConstitutionComment.getConstitutionComment
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installCommentConstitutionRoutes() {
+    authenticate(optional = true) {
+        createConstitutionComment(get(), get())
+        getCitizenCommentConstitution(get(), get())
+        getConstitutionComment(get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt
new file mode 100644
index 0000000..da5b2ca
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt
@@ -0,0 +1,43 @@
+package fr.dcproject.component.comment.generic
+
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.HasTarget
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.generic.database.CommentI
+import fr.dcproject.component.comment.generic.database.CommentWithParentI
+
+class CommentAccessControl : AccessControl() {
+    fun <S> canView(subjects: List<S>, citizen: CitizenI?): AccessResponse
+    where S : CommentI,
+          S : DeletedAt = canAll(subjects) { canView(it, citizen) }
+
+    fun <S> canView(subject: S, citizen: CitizenI?): AccessResponse
+    where S : CommentI,
+          S : DeletedAt = when {
+        subject.isDeleted() -> denied("Your cannot view a deleted comment", "comment.view.deleted")
+        else -> granted()
+    }
+
+    fun <S, CR : CitizenI> canCreate(subject: S, citizen: CitizenI?): AccessResponse
+    where S : CommentI,
+          S : CreatedBy<CR>,
+          S : CommentWithParentI<*>,
+          S : HasTarget<*> = when {
+        citizen == null -> denied("You must be connected to create user", "comment.create.notConnected")
+        subject.createdBy.id != citizen.id -> denied("You cannot create a comment with other user than yours", "comment.create.wrongUser")
+        subject.parent?.isDeleted() ?: false -> denied("You cannot create a comment on deleted parent", "comment.create.deletedParent")
+        subject.target.let { it is DeletedAt && it.isDeleted() } -> denied("You cannot create a comment on deleted target", "comment.create.deletedTarget")
+        else -> granted()
+    }
+
+    fun <S, CR : CitizenI> canUpdate(subject: S, citizen: CitizenI?): AccessResponse
+    where S : CommentI,
+          S : CreatedBy<CR> = when {
+        citizen == null -> denied("You must be connected to update comment", "comment.update.notConnected")
+        citizen.id != subject.createdBy.id -> denied("You cannot update another user of yours", "comment.update.notYours")
+        else -> granted()
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/database/Comment.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/database/Comment.kt
new file mode 100644
index 0000000..e18cdf6
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/database/Comment.kt
@@ -0,0 +1,92 @@
+package fr.dcproject.component.comment.generic.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.ExtraI
+import fr.dcproject.common.entity.HasTarget
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.common.entity.UpdatedAt
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.vote.entity.Votable
+import fr.dcproject.component.vote.entity.VotableImp
+import org.joda.time.DateTime
+import java.util.UUID
+
+class CommentForView<T : TargetI, C : CitizenCreatorI>(
+    id: UUID = UUID.randomUUID(),
+    override val createdBy: C,
+    override val target: T,
+    override var content: String,
+    override val parent: CommentParent<T>? = null,
+    val childrenCount: Int? = null,
+    override val deletedAt: DateTime? = null
+) : ExtraI<T, C>,
+    CommentWithParentI<T>,
+    CommentForUpdate<T, C>(id, createdBy, target, content, parent, deletedAt),
+    CommentWithTargetI<T>,
+    CreatedBy<C> by CreatedBy.Imp(createdBy),
+    UpdatedAt by UpdatedAt.Imp(),
+    DeletedAt by DeletedAt.Imp(),
+    Votable by VotableImp(),
+    TargetI {
+    constructor(
+        createdBy: C,
+        parent: CommentParent<T>,
+        content: String
+    ) : this(
+        createdBy = createdBy,
+        parent = parent,
+        target = parent.target,
+        content = content
+    )
+}
+
+open class CommentForUpdate<T : TargetI, C : CitizenI>(
+    override val id: UUID = UUID.randomUUID(),
+    override val createdBy: C,
+    override val target: T,
+    open var content: String,
+    override val parent: CommentParent<T>? = null,
+    override val deletedAt: DateTime? = null
+) : CommentParent<T>(id, deletedAt, target),
+    CommentWithParentI<T>,
+    ExtraI<T, C>,
+    CommentWithTargetI<T>,
+    CreatedAt by CreatedAt.Imp(),
+    CreatedBy<C>,
+    DeletedAt,
+    TargetI {
+    constructor(
+        createdBy: C,
+        parent: CommentParent<T>,
+        content: String
+    ) : this(
+        createdBy = createdBy,
+        parent = parent,
+        target = parent.target,
+        content = content
+    )
+}
+
+open class CommentParent<T : TargetI>(
+    override val id: UUID,
+    override val deletedAt: DateTime?,
+    override val target: T
+) : CommentRef(id),
+    CommentParentI<T>
+
+interface CommentParentI<T : TargetI> : CommentI, DeletedAt, CommentWithTargetI<T>
+
+interface CommentWithTargetI<T : TargetI> : CommentI, TargetI, HasTarget<T>
+
+interface CommentWithParentI<T : TargetI> {
+    val parent: CommentParent<T>?
+}
+
+open class CommentRef(id: UUID = UUID.randomUUID()) : CommentI, TargetRef(id)
+
+interface CommentI : EntityI
diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/database/CommentRepository.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/database/CommentRepository.kt
new file mode 100644
index 0000000..8cf12c7
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/database/CommentRepository.kt
@@ -0,0 +1,132 @@
+package fr.dcproject.component.comment.generic.database
+
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.article.database.CommentArticleRepository
+import fr.postgresjson.connexion.Paginated
+import fr.postgresjson.connexion.Requester
+import fr.postgresjson.repository.RepositoryI
+import java.util.UUID
+
+abstract class CommentRepositoryAbs<T : TargetI>(override var requester: Requester) : RepositoryI {
+    abstract fun findById(id: UUID): CommentForView<T, CitizenCreatorI>?
+
+    abstract fun findByCitizen(
+        citizen: CitizenI,
+        page: Int = 1,
+        limit: Int = 50
+    ): Paginated<CommentForView<T, CitizenCreatorI>>
+
+    open fun findByParent(
+        parent: CommentForView<T, CitizenCreatorI>,
+        page: Int = 1,
+        limit: Int = 50
+    ): Paginated<CommentForView<T, CitizenCreatorI>> {
+        return findByParent(parent.id, page, limit)
+    }
+
+    open fun findByParent(
+        parentId: UUID,
+        page: Int = 1,
+        limit: Int = 50
+    ): Paginated<CommentForView<T, CitizenCreatorI>> {
+        return requester.run {
+            getFunction("find_comments_by_parent")
+                .select<CommentForView<T, CitizenCreator>>(
+                    page,
+                    limit,
+                    "parent_id" to parentId
+                )
+                as Paginated<CommentForView<T, CitizenCreatorI>>
+        }
+    }
+
+    open fun findByTarget(
+        target: EntityI,
+        page: Int = 1,
+        limit: Int = 50,
+        sort: CommentArticleRepository.Sort = CommentArticleRepository.Sort.CREATED_AT
+    ): Paginated<CommentForView<T, CitizenCreatorI>> {
+        return findByTarget(target.id, page, limit, sort)
+    }
+
+    open fun findByTarget(
+        targetId: UUID,
+        page: Int = 1,
+        limit: Int = 50,
+        sort: CommentArticleRepository.Sort = CommentArticleRepository.Sort.CREATED_AT
+    ): Paginated<CommentForView<T, CitizenCreatorI>> {
+        return requester.run {
+            getFunction("find_comments_by_target")
+                .select<CommentForView<T, CitizenCreator>>(
+                    page,
+                    limit,
+                    "target_id" to targetId,
+                    "sort" to sort.sql
+                )
+                as Paginated<CommentForView<T, CitizenCreatorI>>
+        }
+    }
+
+    fun <I : TargetI, C : CitizenCreatorI> comment(comment: CommentForUpdate<I, C>) {
+        requester
+            .getFunction("comment")
+            .sendQuery(
+                "reference" to comment.target.reference,
+                "resource" to comment
+            )
+    }
+
+    fun <I : T> edit(comment: CommentForUpdate<I, CitizenCreatorI>) {
+        requester
+            .getFunction("edit_comment")
+            .sendQuery(
+                "id" to comment.id,
+                "content" to comment.content
+            )
+    }
+}
+
+class CommentRepository(requester: Requester) : CommentRepositoryAbs<TargetRef>(requester) {
+    override fun findById(id: UUID): CommentForView<TargetRef, CitizenCreatorI>? {
+        return requester
+            .getFunction("find_comment_by_id")
+            .selectOne<CommentForView<TargetRef, CitizenCreator>>(mapOf("id" to id))
+            as CommentForView<TargetRef, CitizenCreatorI>?
+    }
+
+    override fun findByCitizen(
+        citizen: CitizenI,
+        page: Int,
+        limit: Int
+    ): Paginated<CommentForView<TargetRef, CitizenCreatorI>> {
+        return requester.run {
+            getFunction("find_comments_by_citizen")
+                .select<CommentForView<TargetRef, CitizenCreator>>(
+                    page,
+                    limit,
+                    "created_by_id" to citizen.id
+                ) as Paginated<CommentForView<TargetRef, CitizenCreatorI>>
+        }
+    }
+
+    override fun findByParent(
+        parentId: UUID,
+        page: Int,
+        limit: Int
+    ): Paginated<CommentForView<TargetRef, CitizenCreatorI>> {
+        return requester.run {
+            getFunction("find_comments_by_parent")
+                .select<CommentForView<TargetRef, CitizenCreator>>(
+                    page,
+                    limit,
+                    "parent_id" to parentId
+                )
+                as Paginated<CommentForView<TargetRef, CitizenCreatorI>>
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateCommentChildren.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateCommentChildren.kt
new file mode 100644
index 0000000..c05b973
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateCommentChildren.kt
@@ -0,0 +1,45 @@
+package fr.dcproject.component.comment.generic.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentForUpdate
+import fr.dcproject.component.comment.generic.database.CommentRef
+import fr.dcproject.component.comment.generic.database.CommentRepository
+import fr.dcproject.component.comment.toOutput
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object CreateCommentChildren {
+    @Location("/comments/{comment}/children")
+    class CreateCommentChildrenRequest(comment: UUID) {
+        val comment = CommentRef(comment)
+        class Input(val content: String)
+    }
+
+    fun Route.createCommentChildren(repo: CommentRepository, ac: CommentAccessControl) {
+        post<CreateCommentChildrenRequest> {
+            val parent = repo.findById(it.comment.id) ?: throw NotFoundException("Comment not found")
+            val newComment = CommentForUpdate(
+                content = call.receiveOrBadRequest<CreateCommentChildrenRequest.Input>().content,
+                createdBy = citizen,
+                parent = parent
+            )
+
+            ac.assert { canCreate(newComment, citizenOrNull) }
+            repo.comment(newComment)
+
+            call.respond(HttpStatusCode.Created, newComment.toOutput())
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/EditComment.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/EditComment.kt
new file mode 100644
index 0000000..305fa32
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/EditComment.kt
@@ -0,0 +1,43 @@
+package fr.dcproject.component.comment.generic.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentRef
+import fr.dcproject.component.comment.generic.database.CommentRepository
+import fr.dcproject.component.comment.toOutput
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object EditComment {
+    @Location("/comments/{comment}")
+    class EditCommentRequest(comment: UUID) {
+        val comment = CommentRef(comment)
+        class Input(val content: String)
+    }
+
+    fun Route.editComment(repo: CommentRepository, ac: CommentAccessControl) {
+        put<EditCommentRequest> {
+            val comment = repo.findById(it.comment.id) ?: throw NotFoundException("Comment not found")
+            ac.assert { canUpdate(comment, citizenOrNull) }
+
+            comment.content = call.receiveOrBadRequest<EditCommentRequest.Input>().content
+            repo.edit(comment)
+
+            call.respond(
+                HttpStatusCode.OK,
+                comment.toOutput()
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetCommentChildren.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetCommentChildren.kt
new file mode 100644
index 0000000..52d1c1e
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetCommentChildren.kt
@@ -0,0 +1,49 @@
+package fr.dcproject.component.comment.generic.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentRepository
+import fr.dcproject.component.comment.toOutput
+import fr.dcproject.routes.PaginatedRequest
+import fr.dcproject.routes.PaginatedRequestI
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetCommentChildren {
+    @Location("/comments/{comment}/children")
+    class CommentChildrenRequest(
+        val comment: UUID,
+        page: Int = 1,
+        limit: Int = 50,
+        val search: String? = null
+    ) : PaginatedRequestI by PaginatedRequest(page, limit)
+
+    fun Route.getChildrenComments(repo: CommentRepository, ac: CommentAccessControl) {
+        get<CommentChildrenRequest> {
+            val comments =
+                repo.findByParent(
+                    it.comment,
+                    it.page,
+                    it.limit
+                )
+
+            ac.assert { canView(comments.result, citizenOrNull) }
+
+            call.respond(
+                HttpStatusCode.OK,
+                comments.toOutput { comment ->
+                    comment.toOutput()
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetOneComment.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetOneComment.kt
new file mode 100644
index 0000000..ae3314c
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetOneComment.kt
@@ -0,0 +1,38 @@
+package fr.dcproject.component.comment.generic.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentRef
+import fr.dcproject.component.comment.generic.database.CommentRepository
+import fr.dcproject.component.comment.toOutput
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetOneComment {
+    @Location("/comments/{comment}")
+    class CommentRequest(comment: UUID) {
+        val comment = CommentRef(comment)
+    }
+
+    fun Route.getOneComment(repo: CommentRepository, ac: CommentAccessControl) {
+        get<CommentRequest> {
+            val comment = repo.findById(it.comment.id) ?: throw NotFoundException("Comment ${it.comment.id} not found")
+            ac.assert { canView(comment, citizenOrNull) }
+
+            call.respond(
+                HttpStatusCode.OK,
+                comment.toOutput()
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/install.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/install.kt
new file mode 100644
index 0000000..8ea983c
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/install.kt
@@ -0,0 +1,20 @@
+package fr.dcproject.component.comment.generic.routes
+
+import fr.dcproject.component.comment.generic.routes.CreateCommentChildren.createCommentChildren
+import fr.dcproject.component.comment.generic.routes.EditComment.editComment
+import fr.dcproject.component.comment.generic.routes.GetCommentChildren.getChildrenComments
+import fr.dcproject.component.comment.generic.routes.GetOneComment.getOneComment
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installCommentRoutes() {
+    authenticate(optional = true) {
+        editComment(get(), get())
+        getOneComment(get(), get())
+        createCommentChildren(get(), get())
+        getChildrenComments(get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/comment/response.kt b/src/main/kotlin/fr/dcproject/component/comment/response.kt
new file mode 100644
index 0000000..fc2dbcb
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/comment/response.kt
@@ -0,0 +1,70 @@
+package fr.dcproject.component.comment
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.comment.generic.database.CommentForUpdate
+import fr.dcproject.component.comment.generic.database.CommentForView
+import org.joda.time.DateTime
+import java.util.UUID
+
+fun CommentForView<*, *>.toOutput(): Any = this.let { c ->
+    object {
+        val id: UUID = c.id
+        val content: String = c.content
+        val childrenCount: Int = c.childrenCount ?: 0
+        val createdAt: DateTime = c.createdAt
+        val updatedAt: DateTime = c.updatedAt
+        val parent: Any? = c.parent?.let { p ->
+            object {
+                val id: UUID = p.id
+                val reference: String = p.reference
+            }
+        }
+        val target: Any = c.target.let { t ->
+            object {
+                val id: UUID = t.id
+                val reference: String = t.reference
+            }
+        }
+        val createdBy: Any = c.createdBy.toOutput()
+        val votes: Any = c.votes.let { v ->
+            object {
+                val up: Int = v.up
+                val neutral: Int = v.neutral
+                val down: Int = v.down
+                val total: Int = v.total
+                val score: Int = v.score
+            }
+        }
+    }
+}
+
+fun <C : CitizenCreatorI> CommentForUpdate<*, C>.toOutput(): Any = this.let { c ->
+    object {
+        val id: UUID = c.id
+        val content: String = c.content
+        val childrenCount: Int = 0
+        val createdAt: DateTime = c.createdAt
+        val updatedAt: DateTime = c.createdAt
+        val parent: Any? = c.parent?.let { p ->
+            object {
+                val id: UUID = p.id
+                val reference: String = p.reference
+            }
+        }
+        val target: Any = c.target.let { t ->
+            object {
+                val id: UUID = t.id
+                val reference: String = t.reference
+            }
+        }
+        val createdBy: Any = c.createdBy.toOutput()
+        val votes: Any = object {
+            val up: Int = 0
+            val neutral: Int = 0
+            val down: Int = 0
+            val total: Int = 0
+            val score: Int = 0
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionAccessControl.kt b/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionAccessControl.kt
new file mode 100644
index 0000000..aa4f981
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionAccessControl.kt
@@ -0,0 +1,37 @@
+package fr.dcproject.component.constitution
+
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.constitution.database.ConstitutionForListing
+import fr.dcproject.component.constitution.database.ConstitutionI
+import fr.dcproject.component.constitution.database.ConstitutionRef
+
+class ConstitutionAccessControl : AccessControl() {
+    fun canCreate(subject: ConstitutionI, citizen: CitizenI?): AccessResponse = when {
+        citizen == null -> denied("You must be connected to create constitution", "constitution.create.notConnected")
+        else -> granted()
+    }
+
+    fun canView(subjects: List<ConstitutionForListing>, citizen: CitizenI?): AccessResponse =
+        canAll(subjects) { canView(it, citizen) }
+
+    fun <S> canView(subject: S, citizen: CitizenI?): AccessResponse where S : DeletedAt, S : ConstitutionI = when {
+        subject.isDeleted() -> denied("You cannot view a deleted constitution", "constitution.view.deleted")
+        else -> granted()
+    }
+
+    fun <S> canDelete(subject: S, citizen: CitizenI?): AccessResponse where S : CreatedBy<CitizenI>, S : ConstitutionRef = when {
+        citizen == null -> denied("You must be connected to delete constitution", "constitution.delete.notConnected")
+        subject.createdBy.id != citizen.id -> denied("You cannot delete the constitution of other citizen", "constitution.delete.otherCitizen")
+        else -> granted()
+    }
+
+    fun <S> canUpdate(subject: S, citizen: CitizenI?): AccessResponse where S : CreatedBy<CitizenI>, S : ConstitutionRef = when {
+        citizen == null -> denied("You must be connected to update constitution", "constitution.update.notConnected")
+        subject.createdBy.id != citizen.id -> denied("You cannot update the constitution of other citizen", "constitution.update.otherCitizen")
+        else -> granted()
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/constitution/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/constitution/KoinModule.kt
new file mode 100644
index 0000000..56e0cad
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/constitution/KoinModule.kt
@@ -0,0 +1,9 @@
+package fr.dcproject.component.constitution
+
+import fr.dcproject.component.constitution.database.ConstitutionRepository
+import org.koin.dsl.module
+
+val constitutionKoinModule = module {
+    single { ConstitutionRepository(get()) }
+    single { ConstitutionAccessControl() }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/constitution/database/Constitution.kt b/src/main/kotlin/fr/dcproject/component/constitution/database/Constitution.kt
new file mode 100644
index 0000000..b16d970
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/constitution/database/Constitution.kt
@@ -0,0 +1,79 @@
+package fr.dcproject.component.constitution.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.Entity
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.common.entity.VersionableId
+import fr.dcproject.component.article.database.ArticleForListing
+import fr.dcproject.component.article.database.ArticleI
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenWithUserI
+import fr.dcproject.component.constitution.database.ConstitutionForUpdate.TitleForUpdate
+import java.util.UUID
+
+data class ConstitutionForView(
+    override val id: UUID = UUID.randomUUID(),
+    val title: String,
+    val anonymous: Boolean = true,
+    val titles: List<TitleForView> = listOf(),
+    val draft: Boolean = false,
+    val lastVersion: Boolean = false,
+    override val createdBy: CitizenCreator,
+    override val versionId: UUID = UUID.randomUUID(),
+) : ConstitutionRef(id),
+    VersionableId,
+    CreatedAt by CreatedAt.Imp(),
+    CreatedBy<CitizenCreator>,
+    DeletedAt by DeletedAt.Imp() {
+    data class TitleForView(
+        override val id: UUID = UUID.randomUUID(),
+        val name: String,
+        val rank: Int,
+        val articles: MutableList<ArticleForListing> = mutableListOf(),
+    ) : TitleRef(id)
+}
+
+data class ConstitutionForListing(
+    override val id: UUID = UUID.randomUUID(),
+    val title: String,
+    override val createdBy: CitizenCreator,
+    override val versionId: UUID = UUID.randomUUID(),
+) : ConstitutionRef(id),
+    VersionableId,
+    CreatedAt by CreatedAt.Imp(),
+    CreatedBy<CitizenCreator>,
+    DeletedAt by DeletedAt.Imp()
+
+data class ConstitutionForUpdate<Cr : CitizenWithUserI, T : TitleForUpdate<*>>(
+    override val id: UUID = UUID.randomUUID(),
+    val title: String,
+    val anonymous: Boolean = true,
+    val titles: List<T> = listOf(),
+    val draft: Boolean = false,
+    val lastVersion: Boolean = false,
+    override val createdBy: Cr,
+    override val versionId: UUID = UUID.randomUUID()
+) : ConstitutionRef(id),
+    VersionableId by VersionableId.Imp(versionId),
+    CreatedAt by CreatedAt.Imp(),
+    CreatedBy<Cr> by CreatedBy.Imp(createdBy),
+    DeletedAt by DeletedAt.Imp() {
+
+    data class TitleForUpdate<A : ArticleI>(
+        override val id: UUID = UUID.randomUUID(),
+        val name: String,
+        val articles: List<A> = listOf()
+    ) : TitleRef(id)
+}
+
+open class ConstitutionRef(id: UUID? = null) : TargetRef(id), ConstitutionI {
+    open class TitleRef(
+        id: UUID = UUID.randomUUID()
+    ) : Entity(id)
+}
+
+interface ConstitutionI : EntityI, TargetI
diff --git a/src/main/kotlin/repository/Constitution.kt b/src/main/kotlin/fr/dcproject/component/constitution/database/ConstitutionRepository.kt
similarity index 58%
rename from src/main/kotlin/repository/Constitution.kt
rename to src/main/kotlin/fr/dcproject/component/constitution/database/ConstitutionRepository.kt
index 8cf812c..9f441f0 100644
--- a/src/main/kotlin/repository/Constitution.kt
+++ b/src/main/kotlin/fr/dcproject/component/constitution/database/ConstitutionRepository.kt
@@ -1,18 +1,17 @@
-package fr.dcproject.repository
+package fr.dcproject.component.constitution.database
 
-import fr.dcproject.entity.ArticleRef
-import fr.dcproject.entity.CitizenSimple
-import fr.dcproject.entity.ConstitutionSimple
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.citizen.database.CitizenWithUserI
+import fr.dcproject.component.constitution.database.ConstitutionForUpdate.TitleForUpdate
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
 import fr.postgresjson.repository.RepositoryI.Direction
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
-import fr.dcproject.entity.Constitution as ConstitutionEntity
+import java.util.UUID
 
-class Constitution(override var requester: Requester) : RepositoryI {
-    fun findById(id: UUID): ConstitutionEntity? {
+class ConstitutionRepository(override var requester: Requester) : RepositoryI {
+    fun findById(id: UUID): ConstitutionForView? {
         val function = requester.getFunction("find_constitution_by_id")
         return function.selectOne("id" to id)
     }
@@ -23,18 +22,19 @@ class Constitution(override var requester: Requester) : RepositoryI {
         sort: String? = null,
         direction: Direction? = null,
         search: String? = null
-    ): Paginated<ConstitutionEntity> {
+    ): Paginated<ConstitutionForListing> {
         return requester
             .getFunction("find_constitutions")
             .select(
-                page, limit,
+                page,
+                limit,
                 "sort" to sort?.toSnakeCase(),
                 "direction" to direction,
                 "search" to search
             )
     }
 
-    fun upsert(constitution: ConstitutionSimple<CitizenSimple, ConstitutionSimple.TitleSimple<ArticleRef>>): ConstitutionEntity? {
+    fun upsert(constitution: ConstitutionForUpdate<CitizenWithUserI, TitleForUpdate<ArticleRef>>): ConstitutionForView? {
         return requester
             .getFunction("upsert_constitution")
             .selectOne("resource" to constitution)
diff --git a/src/main/kotlin/fr/dcproject/component/constitution/routes/CreateConstitution.kt b/src/main/kotlin/fr/dcproject/component/constitution/routes/CreateConstitution.kt
new file mode 100644
index 0000000..6e4a7fb
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/constitution/routes/CreateConstitution.kt
@@ -0,0 +1,107 @@
+package fr.dcproject.component.constitution.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.Citizen
+import fr.dcproject.component.citizen.database.CitizenWithUserI
+import fr.dcproject.component.constitution.ConstitutionAccessControl
+import fr.dcproject.component.constitution.database.ConstitutionForUpdate
+import fr.dcproject.component.constitution.database.ConstitutionForUpdate.TitleForUpdate
+import fr.dcproject.component.constitution.database.ConstitutionRepository
+import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input
+import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input.Title
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object CreateConstitution {
+    @Location("/constitutions")
+    class PostConstitutionRequest {
+        class Input(
+            val title: String,
+            val anonymous: Boolean = true,
+            val titles: MutableList<Title> = mutableListOf(),
+            val draft: Boolean = false,
+            val versionId: UUID = UUID.randomUUID()
+        ) {
+
+            class Title(
+                val id: UUID = UUID.randomUUID(),
+                val name: String,
+                val articles: List<ArticleRef> = listOf()
+            ) {
+                class ArticleRef(val id: UUID)
+            }
+        }
+    }
+
+    private fun getNewConstitution(input: Input, citizen: Citizen) = input.run {
+        ConstitutionForUpdate<CitizenWithUserI, TitleForUpdate<ArticleRef>>(
+            id = UUID.randomUUID(),
+            title = title,
+            titles = titles.create(),
+            createdBy = citizen,
+            versionId = versionId
+        )
+    }
+
+    private fun List<Title>.create(): MutableList<TitleForUpdate<ArticleRef>> =
+        map { it.create() }.toMutableList()
+
+    private fun Title.create(): TitleForUpdate<ArticleRef> =
+        TitleForUpdate(
+            id,
+            name,
+            articles.map { ArticleRef(it.id) }
+        )
+
+    fun Route.createConstitution(repo: ConstitutionRepository, ac: ConstitutionAccessControl) {
+        post<PostConstitutionRequest> {
+            getNewConstitution(call.receiveOrBadRequest(), citizen).let {
+                ac.assert { canCreate(it, citizenOrNull) }
+                val c = repo.upsert(it) ?: error("Unable to create Constitution")
+                call.respond(
+                    HttpStatusCode.Created,
+                    object {
+                        val id: UUID = c.id
+                        val title: String = c.title
+                        val titles: List<Any> = c.titles.map { t ->
+                            object {
+                                val id: UUID = t.id
+                                val name: String = t.name
+                                val rank: Int = t.rank
+                                val articles: List<Any> = t.articles.map { a ->
+                                    val id = a.id
+                                    val title = a.title
+                                    val createdBy = a.createdBy.toOutput()
+                                    val workgroup: Any? = a.workgroup?.let { w ->
+                                        object {
+                                            val id = w.id
+                                            val name = w.name
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        val anonymous: Boolean = c.anonymous
+                        val draft: Boolean = c.draft
+                        val versionId: UUID = c.versionId
+                        val createdAt: DateTime = c.createdAt
+                        val createdBy: Any = c.createdBy.toOutput()
+                    }
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/constitution/routes/FindConstitutions.kt b/src/main/kotlin/fr/dcproject/component/constitution/routes/FindConstitutions.kt
new file mode 100644
index 0000000..f7184f2
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/constitution/routes/FindConstitutions.kt
@@ -0,0 +1,50 @@
+package fr.dcproject.component.constitution.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.constitution.ConstitutionAccessControl
+import fr.dcproject.component.constitution.database.ConstitutionRepository
+import fr.dcproject.routes.PaginatedRequest
+import fr.dcproject.routes.PaginatedRequestI
+import fr.postgresjson.repository.RepositoryI
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object FindConstitutions {
+    @Location("/constitutions")
+    class FindConstitutionsRequest(
+        page: Int = 1,
+        limit: Int = 50,
+        val sort: String? = null,
+        val direction: RepositoryI.Direction? = null,
+        val search: String? = null
+    ) : PaginatedRequestI by PaginatedRequest(page, limit)
+
+    fun Route.findConstitutions(repo: ConstitutionRepository, ac: ConstitutionAccessControl) {
+        get<FindConstitutionsRequest> {
+            val constitutions = repo.find(it.page, it.limit, it.sort, it.direction, it.search)
+            ac.assert { canView(constitutions.result, citizenOrNull) }
+            call.respond(
+                HttpStatusCode.OK,
+                constitutions.toOutput { c ->
+                    object {
+                        val id: UUID = c.id
+                        val title: String = c.title
+                        val versionId: UUID = c.versionId
+                        val createdAt: DateTime = c.createdAt
+                        val createdBy: Any = c.createdBy.toOutput()
+                    }
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/constitution/routes/GetConstitution.kt b/src/main/kotlin/fr/dcproject/component/constitution/routes/GetConstitution.kt
new file mode 100644
index 0000000..64ea816
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/constitution/routes/GetConstitution.kt
@@ -0,0 +1,65 @@
+package fr.dcproject.component.constitution.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.constitution.ConstitutionAccessControl
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.dcproject.component.constitution.database.ConstitutionRepository
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetConstitution {
+    @Location("/constitutions/{constitution}")
+    class GetConstitutionRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
+
+    fun Route.getConstitution(ac: ConstitutionAccessControl, constitutionRepo: ConstitutionRepository) {
+        get<GetConstitutionRequest> {
+            val constitution = constitutionRepo.findById(it.constitution.id) ?: throw NotFoundException("Unable to find constitution ${it.constitution.id}")
+            ac.assert { canView(constitution, citizenOrNull) }
+            call.respond(
+                HttpStatusCode.OK,
+                constitution.let { c ->
+                    object {
+                        val id: UUID = c.id
+                        val title: String = c.title
+                        val titles: List<Any> = c.titles.map { t ->
+                            object {
+                                val id: UUID = t.id
+                                val name: String = t.name
+                                val rank: Int = t.rank
+                                val articles: List<Any> = t.articles.map { a ->
+                                    val id = a.id
+                                    val title = a.title
+                                    val createdBy = a.createdBy.toOutput()
+                                    val workgroup: Any? = a.workgroup?.let { w ->
+                                        object {
+                                            val id = w.id
+                                            val name = w.name
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        val anonymous: Boolean = c.anonymous
+                        val draft: Boolean = c.draft
+                        val versionId: UUID = c.versionId
+                        val createdAt: DateTime = c.createdAt
+                        val createdBy: Any = c.createdBy.toOutput()
+                    }
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/constitution/routes/install.kt b/src/main/kotlin/fr/dcproject/component/constitution/routes/install.kt
new file mode 100644
index 0000000..81f426d
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/constitution/routes/install.kt
@@ -0,0 +1,18 @@
+package fr.dcproject.component.constitution.routes
+
+import fr.dcproject.component.constitution.routes.CreateConstitution.createConstitution
+import fr.dcproject.component.constitution.routes.FindConstitutions.findConstitutions
+import fr.dcproject.component.constitution.routes.GetConstitution.getConstitution
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installConstitutionRoutes() {
+    authenticate(optional = true) {
+        getConstitution(get(), get())
+        findConstitutions(get(), get())
+        createConstitution(get(), get())
+    }
+}
diff --git a/src/main/kotlin/routes/OpenAPI.kt b/src/main/kotlin/fr/dcproject/component/doc/routes/OpenAPI.kt
similarity index 83%
rename from src/main/kotlin/routes/OpenAPI.kt
rename to src/main/kotlin/fr/dcproject/component/doc/routes/OpenAPI.kt
index 7db42ea..5ceab62 100644
--- a/src/main/kotlin/routes/OpenAPI.kt
+++ b/src/main/kotlin/fr/dcproject/component/doc/routes/OpenAPI.kt
@@ -1,6 +1,6 @@
-package fr.dcproject.routes
+package fr.dcproject.component.doc.routes
 
-import fr.dcproject.utils.readResource
+import fr.dcproject.common.utils.readResource
 import io.ktor.application.call
 import io.ktor.http.ContentType
 import io.ktor.locations.KtorExperimentalLocationsAPI
diff --git a/src/main/kotlin/fr/dcproject/component/doc/routes/install.kt b/src/main/kotlin/fr/dcproject/component/doc/routes/install.kt
new file mode 100644
index 0000000..491e270
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/doc/routes/install.kt
@@ -0,0 +1,16 @@
+package fr.dcproject.component.doc.routes
+
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import io.ktor.util.KtorExperimentalAPI
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+
+@KtorExperimentalAPI
+@ExperimentalCoroutinesApi
+@KtorExperimentalLocationsAPI
+fun Routing.installDocRoutes() {
+    authenticate(optional = true) {
+        definition()
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/FollowAccessControl.kt b/src/main/kotlin/fr/dcproject/component/follow/FollowAccessControl.kt
new file mode 100644
index 0000000..90dd34b
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/FollowAccessControl.kt
@@ -0,0 +1,27 @@
+package fr.dcproject.component.follow
+
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.follow.database.FollowForView
+import fr.dcproject.component.follow.database.FollowI
+
+class FollowAccessControl : AccessControl() {
+    fun canCreate(subject: FollowI, citizen: CitizenI?): AccessResponse {
+        return if (citizen == null) denied("You must be connected to follow", "follow.create.notConnected")
+        else granted()
+    }
+
+    fun canDelete(subject: FollowI, citizen: CitizenI?): AccessResponse {
+        return if (citizen == null) denied("You must be connected to unfollow", "follow.delete.notConnected")
+        else granted()
+    }
+
+    fun <S : FollowForView<*>> canView(subjects: List<S>, citizen: CitizenI?): AccessResponse =
+        canAll(subjects) { canView(it, citizen) }
+
+    fun canView(subject: FollowForView<*>, citizen: CitizenI?): AccessResponse {
+        return if ((citizen != null && subject.createdBy.id == citizen.id) || !subject.createdBy.followAnonymous) granted()
+        else denied("You cannot view an anonymous follow", "follow.view.anonymous")
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/follow/KoinModule.kt
new file mode 100644
index 0000000..e57738c
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/KoinModule.kt
@@ -0,0 +1,11 @@
+package fr.dcproject.component.follow
+
+import fr.dcproject.component.follow.database.FollowArticleRepository
+import fr.dcproject.component.follow.database.FollowConstitutionRepository
+import org.koin.dsl.module
+
+val followKoinModule = module {
+    single { FollowArticleRepository(get()) }
+    single { FollowConstitutionRepository(get()) }
+    single { FollowAccessControl() }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/database/Follow.kt b/src/main/kotlin/fr/dcproject/component/follow/database/Follow.kt
new file mode 100644
index 0000000..aeafd6c
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/database/Follow.kt
@@ -0,0 +1,34 @@
+package fr.dcproject.component.follow.database
+
+import fr.dcproject.common.entity.Created
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.ExtraI
+import fr.dcproject.common.entity.HasTarget
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRef
+import java.util.UUID
+
+open class FollowForView<T : TargetI>(
+    id: UUID = UUID.randomUUID(),
+    override val createdBy: CitizenCreator,
+    override var target: T
+) : ExtraI<T, CitizenRef>,
+    FollowRef(id),
+    Created<CitizenRef> by Created.Imp(createdBy)
+
+class FollowForUpdate<T : TargetI, C : CitizenI>(
+    id: UUID = UUID.randomUUID(),
+    override val target: T,
+    override val createdBy: C
+) : FollowRef(id),
+    HasTarget<T>,
+    CreatedBy<C> by CreatedBy.Imp<C>(createdBy)
+
+open class FollowRef(
+    override val id: UUID
+) : FollowI
+
+interface FollowI : EntityI
diff --git a/src/main/kotlin/repository/Follow.kt b/src/main/kotlin/fr/dcproject/component/follow/database/FollowRepository.kt
similarity index 63%
rename from src/main/kotlin/repository/Follow.kt
rename to src/main/kotlin/fr/dcproject/component/follow/database/FollowRepository.kt
index d629c78..7db5aa0 100644
--- a/src/main/kotlin/repository/Follow.kt
+++ b/src/main/kotlin/fr/dcproject/component/follow/database/FollowRepository.kt
@@ -1,39 +1,42 @@
-package fr.dcproject.repository
+package fr.dcproject.component.follow.database
 
-import fr.dcproject.entity.*
+import fr.dcproject.common.entity.Entity
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.constitution.database.ConstitutionForView
+import fr.dcproject.component.constitution.database.ConstitutionRef
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.immutable.UuidEntity
 import fr.postgresjson.repository.RepositoryI
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import java.util.*
-import fr.dcproject.entity.Article as ArticleEntity
-import fr.dcproject.entity.Constitution as ConstitutionEntity
-import fr.dcproject.entity.Follow as FollowEntity
+import java.util.UUID
 
-sealed class Follow<IN : TargetRef, OUT : TargetRef>(override var requester: Requester) : RepositoryI {
+sealed class FollowRepository<IN : TargetRef, OUT : TargetRef>(override var requester: Requester) : RepositoryI {
     open fun findByCitizen(
         citizen: CitizenI,
         page: Int = 1,
         limit: Int = 50
-    ): Paginated<FollowEntity<OUT>> =
+    ): Paginated<FollowForView<OUT>> =
         findByCitizen(citizen.id, page, limit)
 
     open fun findByCitizen(
         citizenId: UUID,
         page: Int = 1,
         limit: Int = 50
-    ): Paginated<FollowEntity<OUT>> {
+    ): Paginated<FollowForView<OUT>> {
         return requester
             .getFunction("find_follows_by_citizen")
             .select(
-                page, limit,
+                page,
+                limit,
                 "created_by_id" to citizenId
             )
     }
 
-    fun follow(follow: FollowEntity<IN>) {
+    fun follow(follow: FollowForUpdate<IN, *>) {
         requester
             .getFunction("follow")
             .sendQuery(
@@ -43,7 +46,7 @@ sealed class Follow<IN : TargetRef, OUT : TargetRef>(override var requester: Req
             )
     }
 
-    fun unfollow(follow: FollowEntity<IN>) {
+    fun unfollow(follow: FollowForUpdate<IN, *>) {
         requester
             .getFunction("unfollow")
             .sendQuery(
@@ -56,7 +59,7 @@ sealed class Follow<IN : TargetRef, OUT : TargetRef>(override var requester: Req
     open fun findFollow(
         citizen: CitizenI,
         target: TargetRef
-    ): FollowEntity<OUT>? =
+    ): FollowForView<TargetRef>? =
         requester
             .getFunction("find_follow")
             .selectOne(
@@ -66,9 +69,9 @@ sealed class Follow<IN : TargetRef, OUT : TargetRef>(override var requester: Req
             )
 
     fun findFollowsByTarget(
-        target: UuidEntity,
+        target: Entity,
         bulkSize: Int = 300
-    ): Flow<FollowSimple<IN, CitizenRef>> = flow {
+    ): Flow<FollowForView<IN>> = flow {
         var nextPage = 1
         do {
             val paginate = findFollowsByTarget(target, nextPage, bulkSize)
@@ -80,61 +83,64 @@ sealed class Follow<IN : TargetRef, OUT : TargetRef>(override var requester: Req
     }
 
     abstract fun findFollowsByTarget(
-        target: UuidEntity,
+        target: Entity,
         page: Int = 1,
         limit: Int = 300
-    ): Paginated<FollowSimple<IN, CitizenRef>>
+    ): Paginated<FollowForView<IN>>
 }
 
-class FollowArticle(requester: Requester) : Follow<ArticleRef, ArticleEntity>(requester) {
+class FollowArticleRepository(requester: Requester) : FollowRepository<ArticleRef, ArticleForView>(requester) {
     override fun findByCitizen(
         citizenId: UUID,
         page: Int,
         limit: Int
-    ): Paginated<FollowEntity<ArticleEntity>> {
+    ): Paginated<FollowForView<ArticleForView>> {
         return requester.run {
             getFunction("find_follows_article_by_citizen")
                 .select(
-                    page, limit,
+                    page,
+                    limit,
                     "created_by_id" to citizenId
                 )
         }
     }
 
     override fun findFollowsByTarget(
-        target: UuidEntity,
+        target: Entity,
         page: Int,
         limit: Int
-    ): Paginated<FollowSimple<ArticleRef, CitizenRef>> {
+    ): Paginated<FollowForView<ArticleRef>> {
         return requester
             .getFunction("find_follows_article_by_target")
             .select(
-                page, limit,
+                page,
+                limit,
                 "target_id" to target.id
             )
     }
 }
 
-class FollowConstitution(requester: Requester) : Follow<ConstitutionRef, ConstitutionEntity>(requester) {
+class FollowConstitutionRepository(requester: Requester) : FollowRepository<ConstitutionRef, ConstitutionForView>(requester) {
     override fun findByCitizen(
         citizenId: UUID,
         page: Int,
         limit: Int
-    ): Paginated<FollowEntity<ConstitutionEntity>> {
+    ): Paginated<FollowForView<ConstitutionForView>> {
         return requester.run {
             getFunction("find_follows_constitution_by_citizen")
                 .select(
-                    page, limit,
+                    page,
+                    limit,
                     "created_by_id" to citizenId
                 )
         }
     }
 
     override fun findFollowsByTarget(
-        target: UuidEntity,
+        target: Entity,
         page: Int,
         limit: Int
-    ): Paginated<FollowSimple<ConstitutionRef, CitizenRef>> {
+    ): Paginated<FollowForView<ConstitutionRef>> {
         TODO("Not yet implemented")
     }
 }
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/FollowArticle.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/FollowArticle.kt
new file mode 100644
index 0000000..e9fbfc6
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/article/FollowArticle.kt
@@ -0,0 +1,34 @@
+package fr.dcproject.component.follow.routes.article
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowArticleRepository
+import fr.dcproject.component.follow.database.FollowForUpdate
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object FollowArticle {
+    @Location("/articles/{article}/follows")
+    class ArticleFollowRequest(article: UUID) {
+        val article = ArticleRef(article)
+    }
+
+    fun Route.followArticle(repo: FollowArticleRepository, ac: FollowAccessControl) {
+        post<ArticleFollowRequest> {
+            val follow = FollowForUpdate(target = it.article, createdBy = this.citizen)
+            ac.assert { canCreate(follow, citizenOrNull) }
+            repo.follow(follow)
+            call.respond(HttpStatusCode.Created)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetFollowArticle.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetFollowArticle.kt
new file mode 100644
index 0000000..2b24f80
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetFollowArticle.kt
@@ -0,0 +1,50 @@
+package fr.dcproject.component.follow.routes.article
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowArticleRepository
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetFollowArticle {
+    @Location("/articles/{article}/follows")
+    class ArticleFollowRequest(article: UUID) {
+        val article = ArticleRef(article)
+    }
+
+    fun Route.getFollowArticle(repo: FollowArticleRepository, ac: FollowAccessControl) {
+        get<ArticleFollowRequest> {
+            repo.findFollow(citizen, it.article)?.let { follow ->
+                ac.assert { canView(follow, citizenOrNull) }
+                call.respond(
+                    HttpStatusCode.OK,
+                    follow.let { f ->
+                        object {
+                            val id: UUID = f.id
+                            val createdBy: Any = f.createdBy.toOutput()
+                            val target: Any = f.target.let { t ->
+                                object {
+                                    val id: UUID = t.id
+                                    val reference: String = f.target.reference
+                                }
+                            }
+                            val createdAt: DateTime = f.createdAt
+                        }
+                    }
+                )
+            } ?: call.respond(HttpStatusCode.NoContent)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetMyFollowsArticle.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetMyFollowsArticle.kt
new file mode 100644
index 0000000..29aa22b
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetMyFollowsArticle.kt
@@ -0,0 +1,48 @@
+package fr.dcproject.component.follow.routes.article
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowArticleRepository
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetMyFollowsArticle {
+    @Location("/citizens/{citizen}/follows/articles")
+    class CitizenFollowArticleRequest(citizen: UUID) {
+        val citizen = CitizenRef(citizen)
+    }
+
+    fun Route.getMyFollowsArticle(repo: FollowArticleRepository, ac: FollowAccessControl) {
+        get<CitizenFollowArticleRequest> {
+            val follows = repo.findByCitizen(it.citizen)
+            ac.assert { canView(follows.result, citizenOrNull) }
+            call.respond(
+                HttpStatusCode.OK,
+                follows.toOutput { f ->
+                    object {
+                        val id: UUID = f.id
+                        val createdBy: Any = f.createdBy.toOutput()
+                        val target: Any = f.target.let { t ->
+                            object {
+                                val id: UUID = t.id
+                                val reference: String = f.target.reference
+                            }
+                        }
+                        val createdAt: DateTime = f.createdAt
+                    }
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/UnfollowArticle.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/UnfollowArticle.kt
new file mode 100644
index 0000000..bf33cec
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/article/UnfollowArticle.kt
@@ -0,0 +1,34 @@
+package fr.dcproject.component.follow.routes.article
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowArticleRepository
+import fr.dcproject.component.follow.database.FollowForUpdate
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.delete
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object UnfollowArticle {
+    @Location("/articles/{article}/follows")
+    class ArticleFollowRequest(article: UUID) {
+        val article = ArticleRef(article)
+    }
+
+    fun Route.unfollowArticle(repo: FollowArticleRepository, ac: FollowAccessControl) {
+        delete<ArticleFollowRequest> {
+            val follow = FollowForUpdate(target = it.article, createdBy = this.citizen)
+            ac.assert { canDelete(follow, citizenOrNull) }
+            repo.unfollow(follow)
+            call.respond(HttpStatusCode.NoContent)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/install.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/install.kt
new file mode 100644
index 0000000..318e649
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/article/install.kt
@@ -0,0 +1,20 @@
+package fr.dcproject.component.follow.routes.article
+
+import fr.dcproject.component.follow.routes.article.FollowArticle.followArticle
+import fr.dcproject.component.follow.routes.article.GetFollowArticle.getFollowArticle
+import fr.dcproject.component.follow.routes.article.GetMyFollowsArticle.getMyFollowsArticle
+import fr.dcproject.component.follow.routes.article.UnfollowArticle.unfollowArticle
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installFollowArticleRoutes() {
+    authenticate(optional = true) {
+        followArticle(get(), get())
+        unfollowArticle(get(), get())
+        getFollowArticle(get(), get())
+        getMyFollowsArticle(get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/FollowConstitution.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/FollowConstitution.kt
new file mode 100644
index 0000000..debfbab
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/FollowConstitution.kt
@@ -0,0 +1,34 @@
+package fr.dcproject.component.follow.routes.constitution
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowConstitutionRepository
+import fr.dcproject.component.follow.database.FollowForUpdate
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object FollowConstitution {
+    @Location("/constitutions/{constitution}/follows")
+    class ConstitutionFollowRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
+
+    fun Route.followConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
+        post<ConstitutionFollowRequest> {
+            val follow = FollowForUpdate(target = it.constitution, createdBy = this.citizen)
+            ac.assert { canCreate(follow, citizenOrNull) }
+            repo.follow(follow)
+            call.respond(HttpStatusCode.Created)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetFollowConstitution.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetFollowConstitution.kt
new file mode 100644
index 0000000..a2d7568
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetFollowConstitution.kt
@@ -0,0 +1,50 @@
+package fr.dcproject.component.follow.routes.constitution
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowConstitutionRepository
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetFollowConstitution {
+    @Location("/constitutions/{constitution}/follows")
+    class ConstitutionFollowRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
+
+    fun Route.getFollowConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
+        get<ConstitutionFollowRequest> {
+            repo.findFollow(citizen, it.constitution)?.let { follow ->
+                ac.assert { canView(follow, citizenOrNull) }
+                call.respond(
+                    HttpStatusCode.OK,
+                    follow.let { f ->
+                        object {
+                            val id: UUID = f.id
+                            val createdBy: Any = f.createdBy.toOutput()
+                            val target: Any = f.target.let { t ->
+                                object {
+                                    val id: UUID = t.id
+                                    val reference: String = f.target.reference
+                                }
+                            }
+                            val createdAt: DateTime = f.createdAt
+                        }
+                    }
+                )
+            } ?: call.respond(HttpStatusCode.NotFound)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetMyFollowsConstitution.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetMyFollowsConstitution.kt
new file mode 100644
index 0000000..bc398f2
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetMyFollowsConstitution.kt
@@ -0,0 +1,48 @@
+package fr.dcproject.component.follow.routes.constitution
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowConstitutionRepository
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.joda.time.DateTime
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetMyFollowsConstitution {
+    @Location("/citizens/{citizen}/follows/constitutions")
+    class CitizenFollowConstitutionRequest(citizen: UUID) {
+        val citizen = CitizenRef(citizen)
+    }
+
+    fun Route.getMyFollowsConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
+        get<CitizenFollowConstitutionRequest> {
+            val follows = repo.findByCitizen(it.citizen)
+            ac.assert { canView(follows.result, citizenOrNull) }
+            call.respond(
+                HttpStatusCode.OK,
+                follows.toOutput { f ->
+                    object {
+                        val id: UUID = f.id
+                        val createdBy: Any = f.createdBy.toOutput()
+                        val target: Any = f.target.let { t ->
+                            object {
+                                val id: UUID = t.id
+                                val reference: String = f.target.reference
+                            }
+                        }
+                        val createdAt: DateTime = f.createdAt
+                    }
+                }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/UnfollowConstitution.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/UnfollowConstitution.kt
new file mode 100644
index 0000000..7f2f6fe
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/UnfollowConstitution.kt
@@ -0,0 +1,34 @@
+package fr.dcproject.component.follow.routes.constitution
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowConstitutionRepository
+import fr.dcproject.component.follow.database.FollowForUpdate
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.delete
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object UnfollowConstitution {
+    @Location("/constitutions/{constitution}/follows")
+    class ConstitutionUnfollowRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
+
+    fun Route.unfollowConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
+        delete<ConstitutionUnfollowRequest> {
+            val follow = FollowForUpdate(target = it.constitution, createdBy = this.citizen)
+            ac.assert { canDelete(follow, citizenOrNull) }
+            repo.unfollow(follow)
+            call.respond(HttpStatusCode.NoContent)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/install.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/install.kt
new file mode 100644
index 0000000..d45f21e
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/install.kt
@@ -0,0 +1,20 @@
+package fr.dcproject.component.follow.routes.constitution
+
+import fr.dcproject.component.follow.routes.constitution.FollowConstitution.followConstitution
+import fr.dcproject.component.follow.routes.constitution.GetFollowConstitution.getFollowConstitution
+import fr.dcproject.component.follow.routes.constitution.GetMyFollowsConstitution.getMyFollowsConstitution
+import fr.dcproject.component.follow.routes.constitution.UnfollowConstitution.unfollowConstitution
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installFollowConstitutionRoutes() {
+    authenticate(optional = true) {
+        followConstitution(get(), get())
+        unfollowConstitution(get(), get())
+        getFollowConstitution(get(), get())
+        getMyFollowsConstitution(get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/notification/Notification.kt b/src/main/kotlin/fr/dcproject/component/notification/Notification.kt
new file mode 100644
index 0000000..ff8871c
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/notification/Notification.kt
@@ -0,0 +1,57 @@
+package fr.dcproject.component.notification
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.PropertyNamingStrategies
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.databind.module.SimpleModule
+import com.fasterxml.jackson.datatype.joda.JodaModule
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import fr.dcproject.common.entity.Entity
+import fr.dcproject.component.article.database.ArticleForView
+import org.joda.time.DateTime
+import java.util.concurrent.atomic.AtomicInteger
+
+open class Notification(
+    val type: String,
+    val createdAt: DateTime = DateTime.now()
+) {
+    val id: Double = nextId()
+
+    private fun nextId(): Double {
+        return (createdAt.millis.toString() + nextInt().toString()).toDouble()
+    }
+
+    override fun toString(): String = mapper.writeValueAsString(this) ?: error("Unable to serialize notification")
+
+    fun toByteArray() = toString().toByteArray()
+
+    companion object {
+        private val counter: AtomicInteger = AtomicInteger(1000)
+        fun nextInt(): Int {
+            counter.compareAndSet(9999, 1000)
+            return counter.incrementAndGet()
+        }
+
+        val mapper = jacksonObjectMapper().apply {
+            registerModule(SimpleModule())
+            propertyNamingStrategy = PropertyNamingStrategies.SNAKE_CASE
+
+            registerModule(JodaModule())
+            disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        }
+
+        inline fun <reified T : Notification> fromString(raw: String): T = mapper.readValue(raw)
+    }
+}
+
+open class EntityNotification(
+    val target: Entity,
+    type: String,
+    val action: String
+) : Notification(type)
+
+class ArticleUpdateNotification(
+    target: ArticleForView
+) : EntityNotification(target, "article", "update")
diff --git a/src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt b/src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt
new file mode 100644
index 0000000..8015f45
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt
@@ -0,0 +1,112 @@
+package fr.dcproject.component.notification
+
+import com.rabbitmq.client.AMQP.BasicProperties
+import com.rabbitmq.client.BuiltinExchangeType.DIRECT
+import com.rabbitmq.client.ConnectionFactory
+import com.rabbitmq.client.Consumer
+import com.rabbitmq.client.DefaultConsumer
+import com.rabbitmq.client.Envelope
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.component.follow.database.FollowArticleRepository
+import fr.dcproject.component.follow.database.FollowConstitutionRepository
+import fr.dcproject.component.follow.database.FollowForView
+import io.ktor.utils.io.errors.IOException
+import io.lettuce.core.RedisClient
+import io.lettuce.core.api.async.RedisAsyncCommands
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.runBlocking
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+class NotificationConsumer(
+    private val rabbitFactory: ConnectionFactory,
+    private val redisClient: RedisClient,
+    private val followConstitutionRepo: FollowConstitutionRepository,
+    private val followArticleRepo: FollowArticleRepository,
+    private val notificationEmailSender: NotificationEmailSender,
+    private val exchangeName: String,
+) {
+    private val redisConnection = redisClient.connect() ?: error("Unable to connect to redis")
+    private val redis: RedisAsyncCommands<String, String> = redisConnection.async() ?: error("Unable to connect to redis")
+    private val rabbitConnection = rabbitFactory.newConnection()
+    private val rabbitChannel = rabbitConnection.createChannel()
+    private val logger: Logger = LoggerFactory.getLogger(Publisher::class.qualifiedName)
+
+    fun close() {
+        rabbitChannel.close()
+        rabbitConnection.close()
+    }
+
+    fun start() {
+        /* Config Rabbit */
+        rabbitFactory.newConnection().use { connection ->
+            connection.createChannel().use { channel ->
+                channel.queueDeclare("push", true, false, false, null)
+                channel.queueDeclare("email", true, false, false, null)
+                channel.exchangeDeclare(exchangeName, DIRECT, true)
+                channel.queueBind("push", exchangeName, "")
+                channel.queueBind("email", exchangeName, "")
+            }
+        }
+
+        /* Define Consumer */
+        val consumerPush: Consumer = object : DefaultConsumer(rabbitChannel) {
+            @Throws(IOException::class)
+            override fun handleDelivery(
+                consumerTag: String,
+                envelope: Envelope,
+                properties: BasicProperties,
+                body: ByteArray
+            ) = runBlocking {
+                followersFromMessage(body) {
+                    redis.zadd(
+                        "notification:${it.follow.createdBy.id}",
+                        it.event.id,
+                        it.rawMessage
+                    )
+                }
+
+                rabbitChannel.basicAck(envelope.deliveryTag, false)
+            }
+        }
+
+        val consumerEmail: Consumer = object : DefaultConsumer(rabbitChannel) {
+            @Throws(IOException::class)
+            override fun handleDelivery(
+                consumerTag: String,
+                envelope: Envelope,
+                properties: BasicProperties,
+                body: ByteArray
+            ) {
+                runBlocking {
+                    followersFromMessage(body) {
+                        notificationEmailSender.sendEmail(it.follow)
+                        logger.debug("EmailSend to: ${it.follow.createdBy.id}")
+                    }
+                }
+                rabbitChannel.basicAck(envelope.deliveryTag, false)
+            }
+        }
+        /* Launch Consumer */
+        rabbitChannel.basicConsume("push", false, consumerPush) // The front consume the redis via Websocket
+        rabbitChannel.basicConsume("email", false, consumerEmail)
+    }
+
+    private suspend fun followersFromMessage(body: ByteArray, action: suspend (DecodedMessage) -> Unit) {
+        val rawMessage: String = body.toString(Charsets.UTF_8)
+        val notification: EntityNotification = Notification.fromString(rawMessage)
+        val follows = when (notification.type) {
+            "article" -> followArticleRepo.findFollowsByTarget(notification.target)
+            "constitution" -> followConstitutionRepo.findFollowsByTarget(notification.target)
+            else -> error("event '${notification.type}' not implemented")
+        }
+
+        follows.collect { action(DecodedMessage(notification, rawMessage, it)) }
+    }
+
+    private class DecodedMessage(
+        val event: EntityNotification,
+        val rawMessage: String,
+        val follow: FollowForView<out TargetRef>
+    )
+}
diff --git a/src/main/kotlin/messages/NotificationEmailSender.kt b/src/main/kotlin/fr/dcproject/component/notification/NotificationEmailSender.kt
similarity index 71%
rename from src/main/kotlin/messages/NotificationEmailSender.kt
rename to src/main/kotlin/fr/dcproject/component/notification/NotificationEmailSender.kt
index da918d6..f693636 100644
--- a/src/main/kotlin/messages/NotificationEmailSender.kt
+++ b/src/main/kotlin/fr/dcproject/component/notification/NotificationEmailSender.kt
@@ -1,13 +1,17 @@
-package fr.dcproject.messages
+package fr.dcproject.component.notification
 
 import com.sendgrid.helpers.mail.Mail
 import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
-import fr.dcproject.entity.*
-import fr.postgresjson.entity.immutable.UuidEntityI
-import java.util.*
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.Article as ArticleRepository
+import fr.dcproject.common.email.Mailer
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.article.database.ArticleWithTitleI
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenRepository
+import fr.dcproject.component.follow.database.FollowForView
+import java.util.UUID
 
 class NotificationEmailSender(
     private val mailer: Mailer,
@@ -15,7 +19,7 @@ class NotificationEmailSender(
     private val citizenRepo: CitizenRepository,
     private val articleRepo: ArticleRepository
 ) {
-    fun sendEmail(follow: FollowSimple<out TargetRef, CitizenRef>) {
+    fun sendEmail(follow: FollowForView<out TargetRef>) {
         val citizen = citizenRepo.findById(follow.createdBy.id) ?: noCitizen(follow.createdBy.id)
         val target = when (follow.target.reference) {
             "article" ->
@@ -38,9 +42,9 @@ class NotificationEmailSender(
         }
     }
 
-    private fun generateHtmlContent(citizen: CitizenBasicI, target: UuidEntityI): String? {
+    private fun generateHtmlContent(citizen: CitizenCreatorI, target: EntityI): String? {
         return when (target) {
-            is Article -> """
+            is ArticleWithTitleI -> """
                 Hello ${citizen.name.getFullName()},<br/>
                 The article "${target.title}" was updated, check it <a href="http://$domain/articles/${target.id}">here</a>
             """.trimIndent()
@@ -48,9 +52,9 @@ class NotificationEmailSender(
         }
     }
 
-    private fun generateContent(citizen: CitizenBasicI, target: UuidEntityI): String {
+    private fun generateContent(citizen: CitizenCreatorI, target: EntityI): String {
         return when (target) {
-            is Article -> """
+            is ArticleWithTitleI -> """
                 Hello ${citizen.name.getFullName()},
                 The article "${target.title}" was updated, check it here: http://$domain/articles/${target.id}
             """.trimIndent()
@@ -63,4 +67,4 @@ class NotificationEmailSender(
 
     private fun noCitizen(id: UUID): Nothing = throw NoCitizen("No Citizen with this id : $id")
     private fun noTarget(id: UUID): Nothing = throw NoTarget("No Target with this id : $id")
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/fr/dcproject/component/notification/NotificationsPush.kt b/src/main/kotlin/fr/dcproject/component/notification/NotificationsPush.kt
new file mode 100644
index 0000000..08e6e29
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/notification/NotificationsPush.kt
@@ -0,0 +1,135 @@
+package fr.dcproject.component.notification
+
+import com.fasterxml.jackson.core.JsonProcessingException
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.citizen.database.CitizenI
+import io.ktor.http.cio.websocket.Frame
+import io.ktor.http.cio.websocket.Frame.Text
+import io.ktor.http.cio.websocket.readText
+import io.ktor.routing.Route
+import io.ktor.websocket.DefaultWebSocketServerSession
+import io.lettuce.core.Limit
+import io.lettuce.core.Range
+import io.lettuce.core.Range.Boundary
+import io.lettuce.core.RedisClient
+import io.lettuce.core.api.async.RedisAsyncCommands
+import io.lettuce.core.pubsub.RedisPubSubAdapter
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.slf4j.LoggerFactory
+
+class NotificationsPush private constructor(
+    private val redis: RedisAsyncCommands<String, String>,
+    private val redisConnectionPubSub: StatefulRedisPubSubConnection<String, String>,
+    citizen: CitizenI,
+    incoming: Flow<Notification>,
+    onRecieve: suspend (Notification) -> Unit,
+) {
+    class Builder(val redisClient: RedisClient) {
+        private val redisConnection = redisClient.connect() ?: error("Unable to connect to redis")
+        private val redisConnectionPubSub = redisClient.connectPubSub() ?: error("Unable to connect to redis PubSub")
+        private val redis: RedisAsyncCommands<String, String> = redisConnection.async() ?: error("Unable to connect to redis Async")
+
+        fun build(
+            citizen: CitizenI,
+            incoming: Flow<Notification>,
+            onRecieve: suspend (Notification) -> Unit,
+        ): NotificationsPush = NotificationsPush(redis, redisConnectionPubSub, citizen, incoming, onRecieve)
+
+        @ExperimentalCoroutinesApi
+        fun build(ws: DefaultWebSocketServerSession): NotificationsPush {
+            /* Convert channel of string from websocket, to a flow of Notification object */
+            val incomingFlow: Flow<Notification> = ws.incoming.consumeAsFlow()
+                .mapNotNull<Frame, Text> { it as? Frame.Text }
+                .map { it.readText() }
+                .map { Notification.fromString(it) }
+
+            return build(ws.call.citizen, incomingFlow) {
+                ws.outgoing.send(Text(it.toString()))
+            }.apply {
+                ws.outgoing.invokeOnClose { close() }
+            }
+        }
+    }
+
+    private val key = "notification:${citizen.id}"
+    private var score: Double = 0.0
+    private val listener = object : RedisPubSubAdapter<String, String>() {
+        /* On new key publish */
+        override fun message(pattern: String?, channel: String?, message: String?) {
+            runBlocking {
+                getNotifications().collect {
+                    onRecieve(it)
+                }
+            }
+        }
+    }
+
+    init {
+        /* Mark as read all incoming notifications */
+        GlobalScope.launch {
+            incoming.collect {
+                markAsRead(it)
+            }
+        }
+
+        /* Get old notification and sent it to websocket */
+        runBlocking {
+            getNotifications().collect { onRecieve(it) }
+        }
+
+        /* Lisen redis event, and sent the new notification into websocket */
+        redisConnectionPubSub.run {
+            addListener(listener)
+
+            /* Register to the events */
+            async()?.psubscribe("__key*__:$key") ?: error("Unable to subscribe to redis events")
+        }
+    }
+
+    fun close() {
+        redisConnectionPubSub.removeListener(listener)
+    }
+
+    /* Return flow with all new notifications */
+    private fun getNotifications() = flow<Notification> {
+        redis
+            .zrangebyscoreWithScores(
+                key,
+                Range.from(
+                    Boundary.excluding(score),
+                    Boundary.including(Double.POSITIVE_INFINITY)
+                ),
+                Limit.from(100)
+            )
+            .get().forEach {
+                emit(Notification.fromString(it.value))
+                if (it.score > score) score = it.score
+            }
+    }
+
+    private suspend fun markAsRead(notificationMessage: Notification) = coroutineScope {
+        try {
+            redis.zremrangebyscore(
+                key,
+                Range.from(
+                    Boundary.including(notificationMessage.id),
+                    Boundary.including(notificationMessage.id)
+                )
+            )
+        } catch (e: JsonProcessingException) {
+            LoggerFactory.getLogger(Route::class.qualifiedName)
+                .error("Unable to deserialize notification")
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/notification/Publisher.kt b/src/main/kotlin/fr/dcproject/component/notification/Publisher.kt
new file mode 100644
index 0000000..d10d34f
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/notification/Publisher.kt
@@ -0,0 +1,25 @@
+package fr.dcproject.component.notification
+
+import com.rabbitmq.client.ConnectionFactory
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+class Publisher(
+    private val factory: ConnectionFactory,
+    private val logger: Logger = LoggerFactory.getLogger(Publisher::class.qualifiedName),
+    private val exchangeName: String,
+) {
+    suspend fun <T : EntityNotification> publish(it: T): Deferred<Unit> = coroutineScope {
+        async {
+            factory.newConnection().use { connection ->
+                connection.createChannel().use { channel ->
+                    channel.basicPublish(exchangeName, "", null, it.toString().toByteArray())
+                    logger.debug("Publish message ${it.target.id}")
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/notification/routes/Notification.kt b/src/main/kotlin/fr/dcproject/component/notification/routes/Notification.kt
new file mode 100644
index 0000000..58669ad
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/notification/routes/Notification.kt
@@ -0,0 +1,20 @@
+package fr.dcproject.component.notification.routes
+
+import fr.dcproject.component.notification.NotificationsPush
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Route
+import io.ktor.websocket.webSocket
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+
+/**
+ * Consume Websocket, then remove notification in redis.
+ *
+ * Sent all notification to websocket.
+ */
+@ExperimentalCoroutinesApi
+@KtorExperimentalLocationsAPI
+fun Route.notificationArticle(pushBuilder: NotificationsPush.Builder) {
+    webSocket("/notifications") {
+        pushBuilder.build(this)
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/notification/routes/install.kt b/src/main/kotlin/fr/dcproject/component/notification/routes/install.kt
new file mode 100644
index 0000000..0289fea
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/notification/routes/install.kt
@@ -0,0 +1,15 @@
+package fr.dcproject.component.notification.routes
+
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.koin.ktor.ext.get
+
+@ExperimentalCoroutinesApi
+@KtorExperimentalLocationsAPI
+fun Routing.installNotificationsRoutes() {
+    authenticate("url") {
+        notificationArticle(get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/opinion/KoinModule.kt
new file mode 100644
index 0000000..95cc15a
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/KoinModule.kt
@@ -0,0 +1,13 @@
+package fr.dcproject.component.opinion
+
+import fr.dcproject.component.opinion.database.OpinionChoiceRepository
+import fr.dcproject.component.opinion.database.OpinionRepositoryArticle
+import org.koin.dsl.module
+
+val opinionKoinModule = module {
+    single { OpinionChoiceRepository(get()) }
+    single { OpinionRepositoryArticle(get()) }
+
+    single { OpinionAccessControl() }
+    single { OpinionChoiceAccessControl() }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/OpinionAccessControl.kt b/src/main/kotlin/fr/dcproject/component/opinion/OpinionAccessControl.kt
new file mode 100644
index 0000000..5f023a8
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/OpinionAccessControl.kt
@@ -0,0 +1,39 @@
+package fr.dcproject.component.opinion
+
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.HasTarget
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.opinion.database.OpinionI
+
+class OpinionAccessControl : AccessControl() {
+
+    fun <S> canCreate(subjects: List<S>, citizen: CitizenI?): AccessResponse where S : OpinionI, S : HasTarget<*> =
+        canAll(subjects) { canCreate(it, citizen) }
+
+    fun <S> canCreate(subject: S, citizen: CitizenI?): AccessResponse where S : OpinionI, S : HasTarget<*> {
+        val target = subject.target
+        return when {
+            citizen == null -> denied("You must be connected to make an opinion", "opinion.create.notConnected")
+            target is DeletedAt && target.isDeleted() -> denied("You cannot make opinion on deleted target", "opinion.create.deletedTarget")
+            else -> granted()
+        }
+    }
+
+    fun <S, SS : List<S>, C : CitizenI> canView(subjects: SS, citizen: CitizenI?): AccessResponse where S : OpinionI, S : CreatedBy<C> =
+        canAll(subjects) { canView(it, citizen) }
+
+    fun <S, C : CitizenI> canView(subject: S, citizen: CitizenI?): AccessResponse where S : OpinionI, S : CreatedBy<C> = when {
+        citizen == null -> denied("You must be connected to delete opinion", "opinion.delete.notConnected")
+        subject.createdBy.id != citizen.id -> denied("You cannot view opinions of other citizen", "opinion.view.otherCitizen")
+        else -> granted()
+    }
+
+    fun <S, C : CitizenI> canDelete(subject: S, citizen: CitizenI?): AccessResponse where S : CreatedBy<C>, S : OpinionI = when {
+        citizen == null -> denied("You must be connected to delete opinion", "opinion.delete.notConnected")
+        subject.createdBy.id != citizen.id -> denied("You can only delete your opinions", "opinion.delete.notYours")
+        else -> granted()
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/OpinionChoiceAccessControl.kt b/src/main/kotlin/fr/dcproject/component/opinion/OpinionChoiceAccessControl.kt
new file mode 100644
index 0000000..0509aca
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/OpinionChoiceAccessControl.kt
@@ -0,0 +1,15 @@
+package fr.dcproject.component.opinion
+
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.opinion.database.OpinionChoiceI
+
+class OpinionChoiceAccessControl : AccessControl() {
+    fun canView(subjects: List<OpinionChoiceI>, citizen: CitizenI?): AccessResponse =
+        canAll(subjects) { canView(it, citizen) }
+
+    fun canView(subject: OpinionChoiceI, citizen: CitizenI?): AccessResponse {
+        return granted()
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/database/Opinion.kt b/src/main/kotlin/fr/dcproject/component/opinion/database/Opinion.kt
new file mode 100644
index 0000000..56864a7
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/database/Opinion.kt
@@ -0,0 +1,42 @@
+package fr.dcproject.component.opinion.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.ExtraI
+import fr.dcproject.common.entity.HasTarget
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRef
+import java.util.UUID
+
+open class Opinion<T : TargetI>(
+    id: UUID = UUID.randomUUID(),
+    override val createdBy: CitizenCreator,
+    override val target: T,
+    val choice: OpinionChoice
+) : OpinionRef(id),
+    ExtraI<T, CitizenCreatorI>,
+    CreatedAt by CreatedAt.Imp(),
+    CreatedBy<CitizenCreatorI> by CreatedBy.Imp(createdBy) {
+
+    fun getName(): String = choice.name
+}
+
+data class OpinionForUpdate<T : TargetI>(
+    override val id: UUID = UUID.randomUUID(),
+    override val target: T,
+    val choice: OpinionChoiceRef,
+    override val createdBy: CitizenRef
+) : OpinionRef(id),
+    HasTarget<T>,
+    CreatedBy<CitizenI> by CreatedBy.Imp(createdBy)
+
+open class OpinionRef(
+    override val id: UUID
+) : OpinionI, TargetRef(id)
+
+interface OpinionI : EntityI
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionChoice.kt b/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionChoice.kt
new file mode 100644
index 0000000..8a29995
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionChoice.kt
@@ -0,0 +1,22 @@
+package fr.dcproject.component.opinion.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.Entity
+import fr.dcproject.common.entity.EntityI
+import java.util.UUID
+
+class OpinionChoice(
+    id: UUID? = null,
+    val name: String,
+    val target: List<String>?
+) : OpinionChoiceRef(id),
+    CreatedAt by CreatedAt.Imp(),
+    DeletedAt by DeletedAt.Imp()
+
+open class OpinionChoiceRef(
+    id: UUID?
+) : OpinionChoiceI,
+    Entity(id ?: UUID.randomUUID())
+
+interface OpinionChoiceI : EntityI
diff --git a/src/main/kotlin/repository/Opinion.kt b/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionRepository.kt
similarity index 65%
rename from src/main/kotlin/repository/Opinion.kt
rename to src/main/kotlin/fr/dcproject/component/opinion/database/OpinionRepository.kt
index f4f4b89..132a284 100644
--- a/src/main/kotlin/repository/Opinion.kt
+++ b/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionRepository.kt
@@ -1,21 +1,19 @@
-package fr.dcproject.repository
+package fr.dcproject.component.opinion.database
 
 import com.fasterxml.jackson.core.type.TypeReference
-import fr.dcproject.entity.ArticleRef
-import fr.dcproject.entity.CitizenRef
-import fr.dcproject.entity.OpinionChoiceRef
-import fr.dcproject.entity.TargetRef
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.citizen.database.CitizenI
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
-import fr.dcproject.entity.Citizen as CitizenEntity
-import fr.dcproject.entity.Opinion as OpinionEntity
-import fr.dcproject.entity.OpinionArticle as OpinionArticleEntity
-import fr.dcproject.entity.OpinionChoice as OpinionChoiceEntity
+import java.util.UUID
+import fr.dcproject.component.citizen.database.Citizen as CitizenEntity
+import fr.dcproject.component.opinion.database.Opinion as OpinionEntity
+import fr.dcproject.component.opinion.database.OpinionChoice as OpinionChoiceEntity
 
-open class OpinionChoice(override val requester: Requester) : RepositoryI {
+open class OpinionChoiceRepository(override val requester: Requester) : RepositoryI {
     /**
      * find all opinion choices
      * can be filtered by target compatibility
@@ -62,28 +60,29 @@ open class OpinionChoice(override val requester: Requester) : RepositoryI {
         )!!
 }
 
-abstract class Opinion<T : TargetRef>(requester: Requester) : OpinionChoice(requester) {
+abstract class OpinionRepository<T : TargetRef>(requester: Requester) : OpinionChoiceRepository(requester) {
     /**
      * Create an Opinion on target (article,...)
      */
-    abstract fun updateOpinions(choices: List<OpinionChoiceRef>, citizen: CitizenRef, target: TargetRef): List<OpinionEntity<T>>
-    fun updateOpinions(choice: OpinionChoiceRef, citizen: CitizenRef, target: TargetRef): List<OpinionEntity<T>> =
-        updateOpinions(listOf(choice), citizen, target)
+    abstract fun updateOpinions(opinions: List<OpinionForUpdate<T>>): List<OpinionEntity<T>>
+    fun updateOpinions(opinion: OpinionForUpdate<T>): List<OpinionEntity<T>> =
+        updateOpinions(listOf(opinion))
 
-    abstract fun addOpinion(opinion: OpinionEntity<T>): OpinionEntity<T>
+    abstract fun addOpinion(opinion: OpinionForUpdate<T>): OpinionEntity<T>
 
     /**
      * Find opinions of one citizen filtered by target ids
      */
     fun findCitizenOpinionsByTargets(
-        citizen: CitizenEntity,
+        citizen: CitizenI,
         targets: List<UUID>
     ): List<OpinionEntity<T>> {
         val typeReference = object : TypeReference<List<OpinionEntity<T>>>() {}
         return requester.run {
             getFunction("find_citizen_opinions_by_target_ids")
                 .select(
-                    typeReference, mapOf(
+                    typeReference,
+                    mapOf(
                         "citizen_id" to citizen.id,
                         "ids" to targets
                     )
@@ -102,7 +101,8 @@ abstract class Opinion<T : TargetRef>(requester: Requester) : OpinionChoice(requ
         return requester
             .getFunction("find_citizen_opinions_by_target_id")
             .select(
-                typeReference, mapOf(
+                typeReference,
+                mapOf(
                     "citizen_id" to citizen.id,
                     "id" to target
                 )
@@ -122,7 +122,9 @@ abstract class Opinion<T : TargetRef>(requester: Requester) : OpinionChoice(requ
     ): Paginated<OpinionEntity<TargetRef>> {
         return requester
             .getFunction("find_citizen_opinions")
-            .select(page, limit,
+            .select(
+                page,
+                limit,
                 "sort" to sort?.toSnakeCase(),
                 "direction" to direction,
                 "citizen_id" to citizen.id
@@ -130,27 +132,28 @@ abstract class Opinion<T : TargetRef>(requester: Requester) : OpinionChoice(requ
     }
 }
 
-class OpinionArticle(requester: Requester) : Opinion<ArticleRef>(requester) {
+class OpinionRepositoryArticle(requester: Requester) : OpinionRepository<ArticleRef>(requester) {
     /**
      * Update Opinions on Article (Delete old one)
      */
-    override fun updateOpinions(choices: List<OpinionChoiceRef>, citizen: CitizenRef, target: TargetRef): List<OpinionArticleEntity> {
+    override fun updateOpinions(opinions: List<OpinionForUpdate<ArticleRef>>): List<OpinionEntity<ArticleRef>> {
         return requester
+            /* TODO change SQL function to not use .first() and pass all createdBy and target */
             .getFunction("update_citizen_opinions_by_target_id")
             .select(
-                "choices_ids" to choices.map { it.id },
-                "citizen_id" to citizen.id,
-                "target_id" to target.id,
-                "target_reference" to target.reference
+                "choices_ids" to opinions.map { it.choice.id },
+                "citizen_id" to opinions.first().createdBy.id,
+                "target_id" to opinions.first().target.id,
+                "target_reference" to opinions.first().target.reference
             )
     }
 
     /**
      * Add Opinions on Article
      */
-    override fun addOpinion(opinion: OpinionEntity<ArticleRef>): OpinionArticleEntity {
+    override fun addOpinion(opinion: OpinionForUpdate<ArticleRef>): OpinionEntity<ArticleRef> {
         return requester
             .getFunction("upsert_opinion")
             .selectOne("resource" to opinion)!!
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/dto/Opinionable.kt b/src/main/kotlin/fr/dcproject/component/opinion/dto/Opinionable.kt
new file mode 100644
index 0000000..50ae170
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/dto/Opinionable.kt
@@ -0,0 +1,11 @@
+package fr.dcproject.component.opinion.dto
+
+typealias Opinions = Map<String, Int>
+
+interface Opinionable {
+    val opinions: Opinions
+
+    class Imp(parent: fr.dcproject.component.opinion.entity.Opinionable) : Opinionable {
+        override val opinions: Opinions = parent.opinions
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/entity/Opinionable.kt b/src/main/kotlin/fr/dcproject/component/opinion/entity/Opinionable.kt
new file mode 100644
index 0000000..61a2684
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/entity/Opinionable.kt
@@ -0,0 +1,12 @@
+package fr.dcproject.component.opinion.entity
+
+typealias Opinions = Map<String, Int>
+typealias OpinionsMutable = MutableMap<String, Int>
+
+interface Opinionable {
+    val opinions: Opinions
+}
+
+class OpinionableImp : Opinionable {
+    override var opinions: OpinionsMutable = mutableMapOf()
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetCitizenOpinions.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetCitizenOpinions.kt
new file mode 100644
index 0000000..f330ce8
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetCitizenOpinions.kt
@@ -0,0 +1,43 @@
+package fr.dcproject.component.opinion.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.opinion.OpinionAccessControl
+import fr.dcproject.component.opinion.database.Opinion
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository
+
+@KtorExperimentalLocationsAPI
+object GetCitizenOpinions {
+    /**
+     * Get all Opinion of citizen on targets by target ids
+     */
+    @Location("/citizens/{citizen}/opinions")
+    class CitizenOpinions(citizen: UUID, id: List<String>) {
+        val citizen = CitizenRef(citizen)
+        val id: List<UUID> = id.toUUID()
+    }
+
+    fun Route.getCitizenOpinions(repo: OpinionArticleRepository, ac: OpinionAccessControl) {
+        get<CitizenOpinions> {
+            val opinionsEntities: List<Opinion<ArticleRef>> = repo.findCitizenOpinionsByTargets(it.citizen, it.id)
+            ac.assert { canView(opinionsEntities, citizenOrNull) }
+
+            call.respond(
+                HttpStatusCode.OK,
+                opinionsEntities.map { it.toOutput() }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetMyOpinionsArticle.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetMyOpinionsArticle.kt
new file mode 100644
index 0000000..bfd7d20
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetMyOpinionsArticle.kt
@@ -0,0 +1,48 @@
+package fr.dcproject.component.opinion.routes
+
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.opinion.OpinionAccessControl
+import fr.dcproject.component.opinion.database.Opinion
+import fr.dcproject.routes.PaginatedRequest
+import fr.dcproject.routes.PaginatedRequestI
+import fr.postgresjson.connexion.Paginated
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository
+
+@KtorExperimentalLocationsAPI
+object GetMyOpinionsArticle {
+    /**
+     * Get paginated opinions of citizen for all articles
+     */
+    @Location("/citizens/{citizen}/opinions/articles")
+    class CitizenOpinionsArticleRequest(
+        citizen: UUID,
+        page: Int = 1,
+        limit: Int = 50
+    ) : PaginatedRequestI by PaginatedRequest(page, limit) {
+        val citizen = CitizenRef(citizen)
+    }
+
+    fun Route.getMyOpinionsArticle(repo: OpinionArticleRepository, ac: OpinionAccessControl) {
+        get<CitizenOpinionsArticleRequest> {
+            val opinions: Paginated<Opinion<TargetRef>> = repo.findCitizenOpinions(citizen, it.page, it.limit)
+            ac.assert { canView(opinions.result, citizenOrNull) }
+            call.respond(
+                HttpStatusCode.OK,
+                opinions.toOutput { it.toOutput() }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoice.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoice.kt
new file mode 100644
index 0000000..809b10a
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoice.kt
@@ -0,0 +1,36 @@
+package fr.dcproject.component.opinion.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.opinion.OpinionChoiceAccessControl
+import fr.dcproject.component.opinion.database.OpinionChoiceRef
+import fr.dcproject.component.opinion.database.OpinionChoiceRepository
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetOpinionChoice {
+    @Location("/opinions/{opinionChoice}")
+    class OpinionChoiceRequest(opinionChoice: UUID) {
+        val opinionChoice = OpinionChoiceRef(opinionChoice)
+    }
+
+    fun Route.getOpinionChoice(ac: OpinionChoiceAccessControl, opinionChoiceRepository: OpinionChoiceRepository) {
+        get<OpinionChoiceRequest> {
+            val opinionChoice = opinionChoiceRepository.findOpinionChoiceById(it.opinionChoice.id) ?: throw NotFoundException("OpinionChoice ${it.opinionChoice.id} not found")
+            ac.assert { canView(it.opinionChoice, citizenOrNull) }
+
+            call.respond(
+                HttpStatusCode.OK,
+                opinionChoice.toOutput()
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoices.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoices.kt
new file mode 100644
index 0000000..e440516
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoices.kt
@@ -0,0 +1,31 @@
+package fr.dcproject.component.opinion.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.opinion.OpinionChoiceAccessControl
+import fr.dcproject.component.opinion.database.OpinionChoiceRepository
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+
+@KtorExperimentalLocationsAPI
+object GetOpinionChoices {
+    @Location("/opinions")
+    class OpinionChoicesRequest(val targets: List<String> = emptyList())
+
+    fun Route.getOpinionChoices(repo: OpinionChoiceRepository, ac: OpinionChoiceAccessControl) {
+        get<OpinionChoicesRequest> {
+            val opinionChoices = repo.findOpinionsChoices(it.targets)
+            ac.assert { canView(opinionChoices, citizenOrNull) }
+
+            call.respond(
+                HttpStatusCode.OK,
+                opinionChoices.map { it.toOutput() }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/OpinionArticle.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/OpinionArticle.kt
new file mode 100644
index 0000000..4d4d5b9
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/OpinionArticle.kt
@@ -0,0 +1,54 @@
+package fr.dcproject.component.opinion.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.opinion.OpinionAccessControl
+import fr.dcproject.component.opinion.database.OpinionChoiceRef
+import fr.dcproject.component.opinion.database.OpinionForUpdate
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository
+
+@KtorExperimentalLocationsAPI
+object OpinionArticle {
+    /**
+     * Put an opinion on one article
+     */
+    @Location("/articles/{article}/opinions")
+    class ArticleOpinion(article: UUID) {
+        val article = ArticleRef(article)
+        class Body(ids: List<String>) {
+            val ids: List<UUID> = ids.map { it.toUUID() }
+        }
+    }
+
+    fun Route.setOpinionOnArticle(repo: OpinionArticleRepository, ac: OpinionAccessControl) {
+        put<ArticleOpinion> {
+            call.receiveOrBadRequest<ArticleOpinion.Body>().ids.map { id ->
+                OpinionForUpdate(
+                    choice = OpinionChoiceRef(id),
+                    target = it.article,
+                    createdBy = citizen
+                )
+            }.let { opinions ->
+                ac.assert { canCreate(opinions, citizenOrNull) }
+                repo.updateOpinions(opinions)
+            }.let {
+                call.respond(
+                    HttpStatusCode.Created,
+                    it.map { it.toOutput() }
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/install.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/install.kt
new file mode 100644
index 0000000..7426941
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/install.kt
@@ -0,0 +1,23 @@
+package fr.dcproject.component.opinion.routes
+
+import fr.dcproject.component.opinion.routes.GetCitizenOpinions.getCitizenOpinions
+import fr.dcproject.component.opinion.routes.GetMyOpinionsArticle.getMyOpinionsArticle
+import fr.dcproject.component.opinion.routes.GetOpinionChoice.getOpinionChoice
+import fr.dcproject.component.opinion.routes.GetOpinionChoices.getOpinionChoices
+import fr.dcproject.component.opinion.routes.OpinionArticle.setOpinionOnArticle
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import io.ktor.routing.get
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installOpinionRoutes() {
+    authenticate(optional = true) {
+        getCitizenOpinions(get(), get())
+        getMyOpinionsArticle(get(), get())
+        setOpinionOnArticle(get(), get())
+        getOpinionChoice(get(), get())
+        getOpinionChoices(get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/response.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/response.kt
new file mode 100644
index 0000000..11147a3
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/response.kt
@@ -0,0 +1,30 @@
+package fr.dcproject.component.opinion.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.component.opinion.database.Opinion
+import fr.dcproject.component.opinion.database.OpinionChoice
+import org.joda.time.DateTime
+import java.util.UUID
+
+fun OpinionChoice.toOutput(): Any = this.let { o ->
+    object {
+        val id: UUID = o.id
+        val name: String = o.name
+        val target: List<String>? = o.target
+    }
+}
+
+fun Opinion<*>.toOutput(): Any = this.let { o ->
+    object {
+        val id: UUID = o.id
+        val name: String = o.getName()
+        val target: Any = o.target.let { t ->
+            val id: UUID = t.id
+            val reference: String = t.reference
+        }
+        val choice: Any = o.choice.toOutput()
+        val reference: String = o.reference
+        val createdBy: Any = o.createdBy.toOutput()
+        val createdAt: DateTime = o.createdAt
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt
new file mode 100644
index 0000000..dfc83fa
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt
@@ -0,0 +1,22 @@
+package fr.dcproject.component.views
+
+import fr.dcproject.application.Configuration
+import fr.dcproject.component.article.ArticleViewManager
+import fr.dcproject.component.article.database.ArticleForView
+import org.apache.http.HttpHost
+import org.elasticsearch.client.RestClient
+import org.koin.dsl.module
+
+val viewKoinModule = module {
+
+    single {
+        val config: Configuration = get()
+        // Elasticsearch Client
+        val esClient = RestClient.builder(
+            HttpHost.create(config.elasticsearch)
+        ).build().apply {
+            createEsIndexForViews()
+        }
+        ArticleViewManager<ArticleForView>(esClient)
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/views/ViewManager.kt b/src/main/kotlin/fr/dcproject/component/views/ViewManager.kt
new file mode 100644
index 0000000..dd89700
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/views/ViewManager.kt
@@ -0,0 +1,18 @@
+package fr.dcproject.component.views
+
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.views.entity.ViewAggregation
+import org.elasticsearch.client.Response
+import org.joda.time.DateTime
+
+interface ViewManager <T> {
+    /**
+     * Add view to one entity
+     */
+    fun addView(ip: String, entity: T, citizen: CitizenI? = null, dateTime: DateTime = DateTime.now()): Response?
+
+    /**
+     * Get Views aggregations
+     */
+    fun getViewsCount(entity: T): ViewAggregation
+}
diff --git a/src/main/kotlin/fr/dcproject/component/views/createEsIndexForViews.kt b/src/main/kotlin/fr/dcproject/component/views/createEsIndexForViews.kt
new file mode 100644
index 0000000..e328dfa
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/views/createEsIndexForViews.kt
@@ -0,0 +1,58 @@
+package fr.dcproject.component.views
+
+import fr.dcproject.common.utils.waitElasticsearchIsUp
+import org.elasticsearch.client.Request
+import org.elasticsearch.client.RestClient
+
+fun RestClient.createEsIndexForViews() {
+    waitElasticsearchIsUp()
+
+    /* Create index if not exist */
+    if (performRequest(Request("HEAD", "/views?include_type_name=false")).statusLine.statusCode == 404) {
+        Request(
+            "PUT",
+            "/views?include_type_name=false"
+        ).apply {
+            //language=JSON
+            setJsonEntity(
+                """
+        {
+          "settings": {
+            "number_of_shards": 5
+          },
+          "mappings": {
+            "properties": {
+              "logged": {
+                "type": "boolean"
+              },
+              "type": {
+                "type": "keyword"
+              },
+              "user_ref": {
+                "type": "keyword"
+              },
+              "id": {
+                "type": "keyword"
+              },
+              "version_id": {
+                "type": "keyword"
+              },
+              "ip": {
+                "type": "keyword"
+              },
+              "citizen_id": {
+                "type": "keyword"
+              },
+              "view_at": {
+                "type": "date"
+              }
+            }
+          }
+        }
+                """.trimIndent()
+            )
+        }.let {
+            performRequest(it)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/views/dto/ViewAggregation.kt b/src/main/kotlin/fr/dcproject/component/views/dto/ViewAggregation.kt
new file mode 100644
index 0000000..41b1b93
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/views/dto/ViewAggregation.kt
@@ -0,0 +1,10 @@
+package fr.dcproject.component.views.dto
+
+import fr.dcproject.component.views.entity.ViewAggregation
+
+class ViewAggregation(
+    val total: Int,
+    val unique: Int
+) {
+    constructor(views: ViewAggregation) : this(views.total, views.unique)
+}
diff --git a/src/main/kotlin/fr/dcproject/component/views/dto/Viewable.kt b/src/main/kotlin/fr/dcproject/component/views/dto/Viewable.kt
new file mode 100644
index 0000000..fb35787
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/views/dto/Viewable.kt
@@ -0,0 +1,9 @@
+package fr.dcproject.component.views.dto
+
+interface Viewable {
+    var views: ViewAggregation
+
+    class Imp(views: fr.dcproject.component.views.entity.ViewAggregation) : Viewable {
+        override var views: ViewAggregation = ViewAggregation(views.total, views.unique)
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/views/entity/ViewAggregation.kt b/src/main/kotlin/fr/dcproject/component/views/entity/ViewAggregation.kt
new file mode 100644
index 0000000..f9e5f95
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/views/entity/ViewAggregation.kt
@@ -0,0 +1,12 @@
+package fr.dcproject.component.views.entity
+
+import fr.dcproject.common.entity.UpdatedAt
+import fr.postgresjson.entity.EntityI
+
+class ViewAggregation(
+    val total: Int,
+    val unique: Int
+) : EntityI,
+    UpdatedAt by UpdatedAt.Imp() {
+    constructor() : this(0, 0)
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/vote/KoinModule.kt
new file mode 100644
index 0000000..d205327
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/KoinModule.kt
@@ -0,0 +1,16 @@
+package fr.dcproject.component.vote
+
+import fr.dcproject.component.vote.database.VoteArticleRepository
+import fr.dcproject.component.vote.database.VoteCommentRepository
+import fr.dcproject.component.vote.database.VoteConstitutionRepository
+import fr.dcproject.component.vote.database.VoteRepository
+import org.koin.dsl.module
+
+val voteKoinModule = module {
+    single { VoteRepository(get()) }
+    single { VoteArticleRepository(get()) }
+    single { VoteConstitutionRepository(get()) }
+    single { VoteCommentRepository(get()) }
+
+    single { VoteAccessControl() }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/VoteAccessControl.kt b/src/main/kotlin/fr/dcproject/component/vote/VoteAccessControl.kt
new file mode 100644
index 0000000..214c2ca
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/VoteAccessControl.kt
@@ -0,0 +1,26 @@
+package fr.dcproject.component.vote
+
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.vote.database.VoteForUpdateI
+import fr.dcproject.component.vote.database.VoteForView as VoteEntity
+
+class VoteAccessControl : AccessControl() {
+    fun <S> canCreate(subject: VoteForUpdateI<S, *>, citizen: CitizenI?): AccessResponse where S : DeletedAt, S : TargetI = when {
+        citizen == null -> denied("You must be connected for vote", "vote.create.connected")
+        subject.target.isDeleted() -> denied("You cannot vote on deleted target", "vote.create.isDeleted")
+        else -> granted()
+    }
+
+    fun <S : VoteEntity<*>> canView(subjects: List<S>, citizen: CitizenI?): AccessResponse =
+        canAll(subjects) { canView(it, citizen) }
+
+    fun canView(subject: VoteEntity<*>, citizen: CitizenI?): AccessResponse = when {
+        citizen == null -> denied("You must be connected for view your votes", "vote.view.connected")
+        subject.createdBy.id != citizen.id -> denied("You can only display your votes", "vote.view.onlyYours")
+        else -> granted()
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/database/Vote.kt b/src/main/kotlin/fr/dcproject/component/vote/database/Vote.kt
new file mode 100644
index 0000000..0fc6af0
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/database/Vote.kt
@@ -0,0 +1,53 @@
+package fr.dcproject.component.vote.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.ExtraI
+import fr.dcproject.common.entity.HasTarget
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.entity.UpdatedAt
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenI
+import java.util.UUID
+
+class VoteForView<T : TargetI>(
+    id: UUID = UUID.randomUUID(),
+    override val createdBy: CitizenCreator,
+    override val target: T,
+    val note: Int,
+    val anonymous: Boolean = true
+) : ExtraI<T, CitizenCreatorI>,
+    VoteRef(id),
+    CreatedAt by CreatedAt.Imp(),
+    CreatedBy<CitizenCreatorI> by CreatedBy.Imp(createdBy),
+    UpdatedAt by UpdatedAt.Imp() {
+    init {
+        if (note > 1 && note < -1) {
+            error("note must be 1, 0 or -1")
+        }
+    }
+}
+
+class VoteForUpdate<T : TargetI, C : CitizenI>(
+    override val id: UUID = UUID.randomUUID(),
+    override val note: Int,
+    override val target: T,
+    override val createdBy: C
+) : VoteRef(id),
+    VoteForUpdateI<T, C>,
+    CreatedBy<C> by CreatedBy.Imp<C>(createdBy)
+
+interface VoteForUpdateI<T : TargetI, C : CitizenI> : VoteI, HasTarget<T>, CreatedBy<C> {
+    override val id: UUID
+    val note: Int
+    override val target: T
+    override val createdBy: C
+}
+
+open class VoteRef(
+    override val id: UUID
+) : VoteI
+
+interface VoteI : EntityI
diff --git a/src/main/kotlin/repository/Vote.kt b/src/main/kotlin/fr/dcproject/component/vote/database/VoteRepositoryAbs.kt
similarity index 50%
rename from src/main/kotlin/repository/Vote.kt
rename to src/main/kotlin/fr/dcproject/component/vote/database/VoteRepositoryAbs.kt
index 79f0dcf..8b1f678 100644
--- a/src/main/kotlin/repository/Vote.kt
+++ b/src/main/kotlin/fr/dcproject/component/vote/database/VoteRepositoryAbs.kt
@@ -1,21 +1,24 @@
-package fr.dcproject.repository
+package fr.dcproject.component.vote.database
 
 import com.fasterxml.jackson.core.type.TypeReference
-import fr.dcproject.entity.*
-import fr.dcproject.entity.Article
-import fr.dcproject.entity.Comment
-import fr.dcproject.entity.Constitution
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.generic.database.CommentForView
+import fr.dcproject.component.constitution.database.ConstitutionForView
+import fr.dcproject.component.vote.entity.VoteAggregation
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
-import java.util.*
-import fr.dcproject.entity.Citizen as CitizenEntity
-import fr.dcproject.entity.Vote as VoteEntity
+import java.util.UUID
+import fr.dcproject.component.citizen.database.Citizen as CitizenEntity
+import fr.dcproject.component.vote.database.VoteForView as VoteEntity
 
-open class Vote<T : TargetI>(override var requester: Requester) : RepositoryI {
-    fun vote(vote: VoteEntity<T>): VoteAggregation {
+abstract class VoteRepositoryAbs<T : TargetI>(override var requester: Requester) : RepositoryI {
+    fun vote(vote: VoteForUpdateI<T, *>, anonymous: Boolean? = null): VoteAggregation {
         val author = vote.createdBy
-        val anonymous = author.voteAnonymous
         return requester
             .getFunction("vote")
             .selectOne(
@@ -37,7 +40,10 @@ open class Vote<T : TargetI>(override var requester: Requester) : RepositoryI {
         return requester.run {
             getFunction("find_votes_by_citizen")
                 .select(
-                    page, limit, typeReference, mapOf(
+                    page,
+                    limit,
+                    typeReference,
+                    mapOf(
                         "created_by_id" to citizenId,
                         "reference" to target
                     )
@@ -46,14 +52,15 @@ open class Vote<T : TargetI>(override var requester: Requester) : RepositoryI {
     }
 
     fun findCitizenVotesByTargets(
-        citizen: CitizenEntity,
+        citizen: CitizenI,
         targets: List<UUID>
     ): List<VoteEntity<*>> {
         val typeReference = object : TypeReference<List<VoteEntity<TargetRef>>>() {}
         return requester.run {
             getFunction("find_citizen_votes_by_target_ids")
                 .select(
-                    typeReference, mapOf(
+                    typeReference,
+                    mapOf(
                         "citizen_id" to citizen.id,
                         "ids" to targets
                     )
@@ -62,62 +69,64 @@ open class Vote<T : TargetI>(override var requester: Requester) : RepositoryI {
     }
 }
 
-class VoteArticle(requester: Requester) : Vote<Article>(requester) {
+class VoteRepository(requester: Requester) : VoteRepositoryAbs<TargetRef>(requester)
+
+class VoteArticleRepository(requester: Requester) : VoteRepositoryAbs<ArticleForView>(requester) {
     fun findByCitizen(
-        citizen: CitizenEntity,
+        citizen: CitizenI,
         page: Int = 1,
         limit: Int = 50
-    ): Paginated<VoteEntity<Article>> =
+    ): Paginated<VoteEntity<ArticleForView>> =
         findByCitizen(
             citizen.id,
             "article",
-            object : TypeReference<List<VoteEntity<Article>>>() {},
+            object : TypeReference<List<VoteEntity<ArticleForView>>>() {},
             page,
             limit
         )
 }
 
-class VoteArticleComment(requester: Requester) : Vote<Comment<Article>>(requester) {
+class VoteArticleCommentRepository(requester: Requester) : VoteRepositoryAbs<CommentForView<ArticleForView, CitizenCreatorI>>(requester) {
     fun findByCitizen(
         citizen: CitizenEntity,
         page: Int = 1,
         limit: Int = 50
-    ): Paginated<VoteEntity<Comment<Article>>> =
+    ): Paginated<VoteEntity<CommentForView<ArticleForView, CitizenCreatorI>>> =
         findByCitizen(
             citizen.id,
             "article",
-            object : TypeReference<List<VoteEntity<Comment<Article>>>>() {},
+            object : TypeReference<List<VoteEntity<CommentForView<ArticleForView, CitizenCreatorI>>>>() {},
             page,
             limit
         )
 }
 
-class VoteComment(requester: Requester) : Vote<Comment<TargetRef>>(requester) {
+class VoteCommentRepository(requester: Requester) : VoteRepositoryAbs<CommentForView<TargetRef, CitizenCreatorI>>(requester) {
     fun findByCitizen(
         citizen: CitizenEntity,
         page: Int = 1,
         limit: Int = 50
-    ): Paginated<VoteEntity<Comment<TargetRef>>> =
+    ): Paginated<VoteEntity<CommentForView<TargetRef, CitizenCreatorI>>> =
         findByCitizen(
             citizen.id,
             "article",
-            object : TypeReference<List<VoteEntity<Comment<TargetRef>>>>() {},
+            object : TypeReference<List<VoteEntity<CommentForView<TargetRef, CitizenCreatorI>>>>() {},
             page,
             limit
         )
 }
 
-class VoteConstitution(requester: Requester) : Vote<Constitution>(requester) {
+class VoteConstitutionRepository(requester: Requester) : VoteRepositoryAbs<ConstitutionForView>(requester) {
     fun findByCitizen(
         citizen: CitizenEntity,
         page: Int = 1,
         limit: Int = 50
-    ): Paginated<VoteEntity<Constitution>> =
+    ): Paginated<VoteEntity<ConstitutionForView>> =
         findByCitizen(
             citizen.id,
             "constitution",
-            object : TypeReference<List<VoteEntity<Constitution>>>() {},
+            object : TypeReference<List<VoteEntity<ConstitutionForView>>>() {},
             page,
             limit
         )
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/dto/Votable.kt b/src/main/kotlin/fr/dcproject/component/vote/dto/Votable.kt
new file mode 100644
index 0000000..70e828b
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/dto/Votable.kt
@@ -0,0 +1,9 @@
+package fr.dcproject.component.vote.dto
+
+interface Votable {
+    val votes: VoteAggregation
+
+    class Imp(parent: fr.dcproject.component.vote.entity.Votable) : Votable {
+        override val votes: VoteAggregation = VoteAggregation(parent)
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/dto/VoteAggregation.kt b/src/main/kotlin/fr/dcproject/component/vote/dto/VoteAggregation.kt
new file mode 100644
index 0000000..b109cb7
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/dto/VoteAggregation.kt
@@ -0,0 +1,11 @@
+package fr.dcproject.component.vote.dto
+
+import fr.dcproject.component.vote.entity.Votable
+
+class VoteAggregation(parent: Votable) {
+    val up: Int = parent.votes.up
+    val neutral: Int = parent.votes.neutral
+    val down: Int = parent.votes.down
+    val total: Int = parent.votes.total
+    val score: Int = parent.votes.score
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/entity/Votable.kt b/src/main/kotlin/fr/dcproject/component/vote/entity/Votable.kt
new file mode 100644
index 0000000..6971e80
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/entity/Votable.kt
@@ -0,0 +1,9 @@
+package fr.dcproject.component.vote.entity
+
+interface Votable {
+    val votes: VoteAggregation
+}
+
+class VotableImp : Votable {
+    override val votes: VoteAggregation = VoteAggregation()
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/entity/VoteAggregation.kt b/src/main/kotlin/fr/dcproject/component/vote/entity/VoteAggregation.kt
new file mode 100644
index 0000000..fc24668
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/entity/VoteAggregation.kt
@@ -0,0 +1,14 @@
+package fr.dcproject.component.vote.entity
+
+import fr.dcproject.common.entity.UpdatedAt
+
+class VoteAggregation(
+    val up: Int,
+    val neutral: Int,
+    val down: Int,
+    val total: Int,
+    val score: Int
+) : fr.postgresjson.entity.EntityI,
+    UpdatedAt by UpdatedAt.Imp() {
+    constructor() : this(0, 0, 0, 0, 0)
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotes.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotes.kt
new file mode 100644
index 0000000..9524a29
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotes.kt
@@ -0,0 +1,39 @@
+package fr.dcproject.component.vote.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.vote.VoteAccessControl
+import fr.dcproject.component.vote.database.VoteRepository
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetCitizenVotes {
+    @Location("/citizens/{citizen}/votes")
+    class CitizenVotesRequest(citizen: UUID, id: List<String>) {
+        val citizen = CitizenRef(citizen)
+        val id: List<UUID> = id.toUUID()
+    }
+
+    fun Route.getCitizenVote(repo: VoteRepository, ac: VoteAccessControl) {
+        get<CitizenVotesRequest> {
+            val votes = repo.findCitizenVotesByTargets(it.citizen, it.id)
+            if (votes.isNotEmpty()) {
+                ac.assert { canView(votes, citizenOrNull) }
+            }
+            call.respond(
+                HttpStatusCode.OK,
+                votes.map { it.toOutput() }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotesOnArticle.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotesOnArticle.kt
new file mode 100644
index 0000000..5328f1f
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotesOnArticle.kt
@@ -0,0 +1,43 @@
+package fr.dcproject.component.vote.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.vote.VoteAccessControl
+import fr.dcproject.component.vote.database.VoteArticleRepository
+import fr.dcproject.routes.PaginatedRequest
+import fr.dcproject.routes.PaginatedRequestI
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetCitizenVotesOnArticle {
+    @Location("/citizens/{citizen}/votes/articles")
+    class CitizenVoteArticleRequest(
+        citizen: UUID,
+        page: Int = 1,
+        limit: Int = 50,
+        val search: String? = null
+    ) : PaginatedRequestI by PaginatedRequest(page, limit) {
+        val citizen = CitizenRef(citizen)
+    }
+
+    fun Route.getCitizenVotesOnArticle(repo: VoteArticleRepository, ac: VoteAccessControl) {
+        get<CitizenVoteArticleRequest> {
+            val votes = repo.findByCitizen(it.citizen, it.page, it.limit)
+            ac.assert { canView(votes.result, citizenOrNull) }
+
+            call.respond(
+                HttpStatusCode.OK,
+                votes.toOutput { it.toOutput() }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnArticle.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnArticle.kt
new file mode 100644
index 0000000..85212ad
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnArticle.kt
@@ -0,0 +1,47 @@
+package fr.dcproject.component.vote.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.vote.VoteAccessControl
+import fr.dcproject.component.vote.database.VoteArticleRepository
+import fr.dcproject.component.vote.database.VoteForUpdate
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object PutVoteOnArticle {
+    @Location("/articles/{article}/vote")
+    class ArticleVoteRequest(article: UUID) {
+        val article = ArticleRef(article)
+        data class Input(var note: Int)
+    }
+
+    fun Route.putVoteOnArticle(repo: VoteArticleRepository, ac: VoteAccessControl, articleRepo: ArticleRepository) {
+        put<ArticleVoteRequest> {
+            val input = call.receiveOrBadRequest<ArticleVoteRequest.Input>()
+            val article = articleRepo.findById(it.article.id) ?: throw NotFoundException("Article ${it.article.id} not found")
+            val vote = VoteForUpdate(
+                target = article,
+                note = input.note,
+                createdBy = this.citizen
+            )
+            ac.assert { canCreate(vote, citizenOrNull) }
+            val votes = repo.vote(vote)
+            call.respond(
+                HttpStatusCode.Created,
+                votes.toOutput()
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnComment.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnComment.kt
new file mode 100644
index 0000000..6d65e4e
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnComment.kt
@@ -0,0 +1,44 @@
+package fr.dcproject.component.vote.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.comment.generic.database.CommentRepository
+import fr.dcproject.component.vote.VoteAccessControl
+import fr.dcproject.component.vote.database.VoteCommentRepository
+import fr.dcproject.component.vote.database.VoteForUpdate
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object PutVoteOnComment {
+    @Location("/comments/{comment}/vote")
+    class CommentVoteRequest(val comment: UUID) {
+        data class Content(var note: Int)
+    }
+
+    fun Route.putVoteOnComment(voteCommentRepo: VoteCommentRepository, commentRepo: CommentRepository, ac: VoteAccessControl) {
+        put<CommentVoteRequest> {
+            val comment = commentRepo.findById(it.comment)!!
+            val content = call.receiveOrBadRequest<CommentVoteRequest.Content>()
+            val vote = VoteForUpdate(
+                target = comment,
+                note = content.note,
+                createdBy = this.citizen
+            )
+            ac.assert { canCreate(vote, citizenOrNull) }
+            val votes = voteCommentRepo.vote(vote)
+            call.respond(
+                HttpStatusCode.Created,
+                votes.toOutput()
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnConstitution.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnConstitution.kt
new file mode 100644
index 0000000..c643e57
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnConstitution.kt
@@ -0,0 +1,45 @@
+package fr.dcproject.component.vote.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.dcproject.component.constitution.database.ConstitutionRepository
+import fr.dcproject.component.vote.VoteAccessControl
+import fr.dcproject.component.vote.database.VoteConstitutionRepository
+import fr.dcproject.component.vote.database.VoteForUpdate
+import fr.dcproject.component.vote.routes.PutVoteOnConstitution.ConstitutionVoteRequest.Input
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object PutVoteOnConstitution {
+    @Location("/constitutions/{constitution}/vote")
+    class ConstitutionVoteRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+        data class Input(var note: Int)
+    }
+
+    fun Route.voteConstitution(repo: VoteConstitutionRepository, ac: VoteAccessControl, constitutionRepo: ConstitutionRepository) {
+        put<ConstitutionVoteRequest> {
+            val constitution = constitutionRepo.findById(it.constitution.id) ?: throw NotFoundException("Unable to find constitution ${it.constitution.id}")
+            val content = call.receiveOrBadRequest<Input>()
+            val vote = VoteForUpdate(
+                target = constitution,
+                note = content.note,
+                createdBy = this.citizen
+            )
+            ac.assert { canCreate(vote, citizenOrNull) }
+            repo.vote(vote)
+            call.respond(HttpStatusCode.Created)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/install.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/install.kt
new file mode 100644
index 0000000..da3a009
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/routes/install.kt
@@ -0,0 +1,22 @@
+package fr.dcproject.component.vote.routes
+
+import fr.dcproject.component.vote.routes.GetCitizenVotes.getCitizenVote
+import fr.dcproject.component.vote.routes.GetCitizenVotesOnArticle.getCitizenVotesOnArticle
+import fr.dcproject.component.vote.routes.PutVoteOnArticle.putVoteOnArticle
+import fr.dcproject.component.vote.routes.PutVoteOnComment.putVoteOnComment
+import fr.dcproject.component.vote.routes.PutVoteOnConstitution.voteConstitution
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installVoteRoutes() {
+    authenticate(optional = true) {
+        getCitizenVote(get(), get())
+        getCitizenVotesOnArticle(get(), get())
+        putVoteOnArticle(get(), get(), get())
+        putVoteOnComment(get(), get(), get())
+        voteConstitution(get(), get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/response.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/response.kt
new file mode 100644
index 0000000..113aa70
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/vote/routes/response.kt
@@ -0,0 +1,31 @@
+package fr.dcproject.component.vote.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.component.vote.database.VoteForView
+import fr.dcproject.component.vote.entity.VoteAggregation
+import org.joda.time.DateTime
+import java.util.UUID
+
+fun VoteForView<*>.toOutput(): Any = this.let { v ->
+    object {
+        val id: UUID = v.id
+        val note: Int = v.note
+        val createdAt: DateTime = v.createdAt
+        val createdBy: Any = v.createdBy.toOutput()
+        val target: Any = object {
+            val id: UUID = v.target.id
+            val reference: String = v.target.reference
+        }
+    }
+}
+
+fun VoteAggregation.toOutput(): Any = this.let { v ->
+    object {
+        val up: Int = v.up
+        val neutral: Int = v.neutral
+        val down: Int = v.down
+        val total: Int = v.total
+        val score: Int = v.score
+        val updatedAt: DateTime = v.updatedAt
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/workgroup/KoinModule.kt
new file mode 100644
index 0000000..bf43c9d
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/KoinModule.kt
@@ -0,0 +1,9 @@
+package fr.dcproject.component.workgroup
+
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import org.koin.dsl.module
+
+val workgroupKoinModule = module {
+    single { WorkgroupRepository(get()) }
+    single { WorkgroupAccessControl() }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupAccessControl.kt b/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupAccessControl.kt
new file mode 100644
index 0000000..f2705c0
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupAccessControl.kt
@@ -0,0 +1,53 @@
+package fr.dcproject.component.workgroup
+
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.workgroup.database.WorkgroupI
+import fr.dcproject.component.workgroup.database.WorkgroupWithAuthI
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member.Role
+
+class WorkgroupAccessControl : AccessControl() {
+    fun canCreate(subject: WorkgroupI, citizen: CitizenI?): AccessResponse {
+        if (citizen == null) return denied("You must be connected to create workgroup", "workgroup.create.notConnected")
+        return granted()
+    }
+
+    fun <S : WorkgroupWithAuthI<*>> canView(subjects: List<S>, citizen: CitizenI?): AccessResponse =
+        canAll(subjects) { canView(it, citizen) }
+
+    fun canView(subject: WorkgroupWithAuthI<*>, citizen: CitizenI?): AccessResponse =
+        if (subject.isDeleted()) denied("You cannot view a deleted workgroup", "workgroup.view.deleted")
+        else if (!subject.anonymous) granted()
+        else if (subject.anonymous && citizen != null && subject.isMember(citizen)) granted()
+        else denied("You cannot view anonymous workgroup", "workgroup.view.anonymous")
+
+    fun canDelete(subject: WorkgroupWithAuthI<*>, citizen: CitizenI?): AccessResponse {
+        if (citizen == null) return denied("You must be connected to delete workgroup", "workgroup.delete.notConnected")
+        return if (subject.hasRole(Role.MASTER, citizen)) granted()
+        else denied("You must hase role MASTER to delete workgroup", "workgroup.delete.role")
+    }
+    fun canUpdate(subject: WorkgroupWithAuthI<*>, citizen: CitizenI?): AccessResponse {
+        if (citizen == null) return denied("You must be connected to update workgroup", "workgroup.update.notConnected")
+        return if (subject.hasRole(Role.MASTER, citizen)) granted()
+        else denied("You must hase role MASTER to delete workgroup", "workgroup.delete.role")
+    }
+
+    fun canAddMembers(subject: WorkgroupWithAuthI<*>, citizen: CitizenI?): AccessResponse = when {
+        citizen == null -> denied("You must be connected to add member to the workgroup", "workgroup.addMember.notConnected")
+        subject.hasRole(Role.MASTER, citizen) -> granted()
+        else -> denied("You must have MASTER Role for add member to workgroup", "workgroup.addMember.role")
+    }
+
+    fun canUpdateMembers(subject: WorkgroupWithAuthI<*>, citizen: CitizenI?): AccessResponse = when {
+        citizen == null -> denied("You must be connected to update member of the workgroup", "workgroup.updateMember.notConnected")
+        subject.hasRole(Role.MASTER, citizen) -> granted()
+        else -> denied("You must have MASTER Role for update members of workgroup", "workgroup.updateMember.role")
+    }
+
+    fun canRemoveMembers(subject: WorkgroupWithAuthI<*>, citizen: CitizenI?): AccessResponse = when {
+        citizen == null -> denied("You must be connected to remove member of the workgroup", "workgroup.removeMember.notConnected")
+        subject.hasRole(Role.MASTER, citizen) -> granted()
+        else -> denied("You must have MASTER Role for remove members of workgroup", "workgroup.removeMember.role")
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/database/Workgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/database/Workgroup.kt
new file mode 100644
index 0000000..9e3a4ed
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/database/Workgroup.kt
@@ -0,0 +1,113 @@
+package fr.dcproject.component.workgroup.database
+
+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.DeletedAt
+import fr.dcproject.common.entity.Entity
+import fr.dcproject.common.entity.EntityI
+import fr.dcproject.common.entity.UpdatedAt
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.citizen.database.CitizenCreatorI
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenWithUserI
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member.Role
+import org.joda.time.DateTime
+import java.util.UUID
+
+data class WorkgroupForView<C : CitizenCreatorI>(
+    override val id: UUID = UUID.randomUUID(),
+    val name: String,
+    val description: String,
+    val logo: String? = null,
+    override var anonymous: Boolean = true,
+    override val createdBy: C,
+    override var members: List<Member<C>> = emptyList()
+) : WorkgroupWithAuthI<C>,
+    WorkgroupRef(id),
+    CreatedBy<C> by CreatedBy.Imp(createdBy),
+    CreatedAt by CreatedAt.Imp(),
+    UpdatedAt by UpdatedAt.Imp(),
+    DeletedAt by DeletedAt.Imp()
+
+data class WorkgroupForUpdate<C : CitizenWithUserI>(
+    override val id: UUID,
+    override val name: String,
+    override val description: String,
+    override val createdBy: C,
+    override val logo: String? = null,
+    override val anonymous: Boolean = true,
+    override val members: List<Member<C>> = listOf(),
+    override val deletedAt: DateTime? = null,
+) : WorkgroupRef(id),
+    WorkgroupForUpdateI<C>,
+    CreatedBy<C> by CreatedBy.Imp(createdBy)
+
+interface WorkgroupForUpdateI<C : CitizenWithUserI> : WorkgroupWithAuthI<C>, WorkgroupCartI, CreatedBy<C> {
+    val description: String
+    val logo: String?
+}
+
+class WorkgroupCart(
+    override val id: UUID,
+    override val name: String
+) : WorkgroupCartI
+
+interface WorkgroupCartI : EntityI {
+    val name: String
+}
+
+open class WorkgroupRef(
+    id: UUID? = null
+) : Entity(id ?: UUID.randomUUID()), WorkgroupI
+
+interface WorkgroupWithAuthI<Z : CitizenWithUserI> : WorkgroupWithMembersI<Z>, CreatedBy<Z>, DeletedAt {
+    val anonymous: Boolean
+
+    fun isMember(user: UserI): Boolean = members.isMember(user)
+    fun isMember(citizen: CitizenI): Boolean = members.isMember(citizen)
+
+    fun hasRole(expectedRole: Role, user: UserI): Boolean = members.hasRole(expectedRole, user)
+    fun hasRole(expectedRole: Role, citizen: CitizenI): Boolean = members.hasRole(expectedRole, citizen)
+
+    fun getRoles(user: UserI): List<Role> = members.getRoles(user)
+    fun getRoles(citizen: CitizenI): List<Role> = members.getRoles(citizen)
+}
+
+interface WorkgroupWithMembersI<Z : CitizenI> : WorkgroupI {
+    val members: List<Member<Z>>
+
+    class Member<C : CitizenI>(
+        val citizen: C,
+        val roles: List<Role> = emptyList()
+    ) : fr.postgresjson.entity.EntityI {
+        enum class Role {
+            MASTER,
+            MANAGER,
+            EDITOR,
+            REPORTER
+        }
+    }
+}
+
+fun List<CitizenI>.hasCitizen(citizen: CitizenI): Boolean = this.map { it.id }.contains(citizen.id)
+
+fun <Z : CitizenWithUserI> List<Member<Z>>.isMember(user: UserI): Boolean =
+    map { it.citizen.user.id }.contains(user.id)
+
+fun <Z : CitizenI> List<Member<Z>>.isMember(citizen: CitizenI): Boolean =
+    map { it.citizen.id }.contains(citizen.id)
+
+fun <Z : CitizenI> List<Member<Z>>.hasRole(expectedRole: Role, citizen: CitizenI): Boolean =
+    any { member -> member.citizen.id == citizen.id && member.roles.any { it == expectedRole } }
+
+fun <Z : CitizenWithUserI> List<Member<Z>>.hasRole(expectedRole: Role, user: UserI): Boolean =
+    any { member -> member.citizen.user.id == user.id && member.roles.any { it == expectedRole } }
+
+fun <Z : CitizenWithUserI> List<Member<Z>>.getRoles(user: UserI): List<Role> =
+    firstOrNull { it.citizen.user.id == user.id }?.roles ?: emptyList()
+
+fun <Z : CitizenWithUserI> List<Member<Z>>.getRoles(citizen: CitizenI): List<Role> =
+    firstOrNull { it.citizen.id == citizen.id }?.roles ?: emptyList()
+
+interface WorkgroupI : EntityI
diff --git a/src/main/kotlin/repository/Workgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/database/WorkgroupRepository.kt
similarity index 64%
rename from src/main/kotlin/repository/Workgroup.kt
rename to src/main/kotlin/fr/dcproject/component/workgroup/database/WorkgroupRepository.kt
index 815dc2e..1caba1a 100644
--- a/src/main/kotlin/repository/Workgroup.kt
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/database/WorkgroupRepository.kt
@@ -1,7 +1,9 @@
-package fr.dcproject.repository
+package fr.dcproject.component.workgroup.database
 
-import fr.dcproject.entity.*
-import fr.dcproject.entity.WorkgroupWithMembersI.Member
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.entity.Parameter
@@ -9,11 +11,11 @@ import fr.postgresjson.repository.RepositoryI
 import fr.postgresjson.repository.RepositoryI.Direction
 import fr.postgresjson.serializer.serialize
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
-import fr.dcproject.entity.Workgroup as WorkgroupEntity
+import java.util.UUID
+import fr.dcproject.component.workgroup.database.WorkgroupForView as WorkgroupEntity
 
-class Workgroup(override var requester: Requester) : RepositoryI {
-    fun findById(id: UUID): WorkgroupEntity? {
+class WorkgroupRepository(override var requester: Requester) : RepositoryI {
+    fun findById(id: UUID): WorkgroupEntity<CitizenCreator>? {
         val function = requester.getFunction("find_workgroup_by_id")
         return function.selectOne("id" to id)
     }
@@ -25,11 +27,12 @@ class Workgroup(override var requester: Requester) : RepositoryI {
         direction: Direction? = null,
         search: String? = null,
         filter: Filter = Filter()
-    ): Paginated<WorkgroupEntity> {
+    ): Paginated<WorkgroupEntity<CitizenCreator>> {
         return requester
             .getFunction("find_workgroups")
             .select(
-                page, limit,
+                page,
+                limit,
                 "sort" to sort?.toSnakeCase(),
                 "direction" to direction,
                 "search" to search,
@@ -37,56 +40,48 @@ class Workgroup(override var requester: Requester) : RepositoryI {
             )
     }
 
-    fun upsert(workgroup: WorkgroupSimple<CitizenRef>): WorkgroupEntity = requester
+    fun <C : CitizenI, W : WorkgroupForUpdateI<C>> upsert(workgroup: W): WorkgroupEntity<CitizenCreator> = requester
         .getFunction("upsert_workgroup")
         .selectOne("resource" to workgroup) ?: error("query 'upsert_workgroup' return null")
 
-    fun delete(workgroup: WorkgroupRef) = requester
-            .getFunction("delete_workgroup")
-            .perform("id" to workgroup.id)
+    fun <W : WorkgroupRef> delete(workgroup: W) = requester
+        .getFunction("delete_workgroup")
+        .perform("id" to workgroup.id)
 
-    fun addMember(workgroup: WorkgroupI, member: Member<CitizenI>): Member<CitizenBasic>? =
+    fun addMember(workgroup: WorkgroupI, member: Member<CitizenI>): Member<CitizenRef>? =
         addMember(workgroup, member.citizen, member.roles)
 
-    fun addMember(workgroup: WorkgroupI, citizen: CitizenI, roles: List<Member.Role>): Member<CitizenBasic>? = requester
+    fun addMember(workgroup: WorkgroupI, citizen: CitizenI, roles: List<Member.Role>): Member<CitizenRef>? = requester
         .getFunction("add_workgroup_member")
         .selectOne(
             "id" to workgroup.id,
             "members" to Member(citizen, roles).serialize()
         )
 
-    fun <Z : CitizenI> addMembers(workgroup: WorkgroupI, members: List<Member<Z>>): List<Member<CitizenBasic>> = requester
+    fun <Z : CitizenI> addMembers(workgroup: WorkgroupI, members: List<Member<Z>>): List<Member<CitizenCreator>> = requester
         .getFunction("add_workgroup_members")
         .select(
             "id" to workgroup.id,
             "members" to members.serialize()
         )
 
-    fun <Z : CitizenI> removeMember(workgroup: WorkgroupI, memberToDelete: Member<Z>): List<Member<CitizenBasic>> =
+    fun <Z : CitizenI> removeMember(workgroup: WorkgroupI, memberToDelete: Member<Z>): List<Member<CitizenCreator>> =
         removeMembers(workgroup, listOf(memberToDelete))
 
-    fun <Z : CitizenI> removeMembers(workgroup: WorkgroupI, membersToDelete: List<Member<Z>>): List<Member<CitizenBasic>> = requester
+    fun <Z : CitizenI> removeMembers(workgroup: WorkgroupI, membersToDelete: List<Member<Z>>): List<Member<CitizenCreator>> = requester
         .getFunction("remove_workgroup_members")
         .select(
             "id" to workgroup.id,
             "members" to membersToDelete
         )
 
-    fun <Z : CitizenI> updateMembers(workgroup: WorkgroupI, members: List<Member<Z>>): List<Member<CitizenBasic>> = requester
+    fun <Z : CitizenI> updateMembers(workgroup: WorkgroupI, members: List<Member<Z>>): List<Member<CitizenCreator>> = requester
         .getFunction("update_workgroup_members")
         .select(
             "id" to workgroup.id,
             "members" to members
         )
 
-    fun <W : WorkgroupWithMembersI<Z>, Z : CitizenI> updateMembers(workgroup: W): W {
-        updateMembers(workgroup, workgroup.members).let {
-            workgroup.members = it as List<Member<Z>>
-        }
-
-        return workgroup
-    }
-
     class Filter(
         val createdById: String? = null,
         val members: List<UUID>? = null
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/CreateWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/CreateWorkgroup.kt
new file mode 100644
index 0000000..e97128e
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/CreateWorkgroup.kt
@@ -0,0 +1,56 @@
+package fr.dcproject.component.workgroup.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupForUpdate
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import fr.dcproject.component.workgroup.routes.CreateWorkgroup.PostWorkgroupRequest.Input
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object CreateWorkgroup {
+    @Location("/workgroups")
+    open class PostWorkgroupRequest {
+        class Input(
+            val id: UUID?,
+            val name: String,
+            val description: String,
+            val logo: String?,
+            val anonymous: Boolean?
+        )
+    }
+
+    fun Route.createWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
+        post<PostWorkgroupRequest> {
+            call.receiveOrBadRequest<Input>().run {
+                WorkgroupForUpdate(
+                    id ?: UUID.randomUUID(),
+                    name,
+                    description,
+                    citizen,
+                    logo,
+                    anonymous ?: true,
+                )
+            }.let { workgroup ->
+                ac.assert { canCreate(workgroup, citizenOrNull) }
+                repo.upsert(workgroup)
+            }.let { w ->
+                call.respond(
+                    HttpStatusCode.Created,
+                    w.toOutput()
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/DeleteWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/DeleteWorkgroup.kt
new file mode 100644
index 0000000..17fbdcd
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/DeleteWorkgroup.kt
@@ -0,0 +1,30 @@
+package fr.dcproject.component.workgroup.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.delete
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object DeleteWorkgroup {
+    @Location("/workgroups/{workgroupId}")
+    class DeleteWorkgroupRequest(val workgroupId: UUID)
+
+    fun Route.deleteWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
+        delete<DeleteWorkgroupRequest> {
+            repo.findById(it.workgroupId)?.let { workgroup ->
+                ac.assert { canDelete(workgroup, citizenOrNull) }
+                repo.delete(workgroup)
+                call.respond(HttpStatusCode.NoContent)
+            } ?: call.respond(HttpStatusCode.NotFound)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/EditWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/EditWorkgroup.kt
new file mode 100644
index 0000000..b4c61f0
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/EditWorkgroup.kt
@@ -0,0 +1,55 @@
+package fr.dcproject.component.workgroup.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupForUpdate
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import fr.dcproject.component.workgroup.routes.EditWorkgroup.PutWorkgroupRequest.Input
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.koin.core.KoinComponent
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object EditWorkgroup {
+    @Location("/workgroups/{workgroupId}")
+    class PutWorkgroupRequest(val workgroupId: UUID) : KoinComponent {
+        class Input(
+            val name: String?,
+            val description: String?,
+            val logo: String?,
+            val anonymous: Boolean?
+        )
+    }
+
+    fun Route.editWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
+        put<PutWorkgroupRequest> {
+            repo.findById(it.workgroupId)?.let { old ->
+                call.receiveOrBadRequest<Input>().run {
+                    WorkgroupForUpdate(
+                        id = old.id,
+                        name = name ?: old.name,
+                        description = description ?: old.description,
+                        createdBy = old.createdBy,
+                        logo = logo ?: old.logo,
+                        anonymous = anonymous ?: old.anonymous,
+                        deletedAt = old.deletedAt,
+                        members = old.members,
+                    ).let { workgroup ->
+                        ac.assert { canUpdate(workgroup, citizenOrNull) }
+                        repo.upsert(workgroup)
+                    }.let {
+                        call.respond(HttpStatusCode.OK, it.toOutput())
+                    }
+                }
+            } ?: call.respond(HttpStatusCode.NotFound)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroup.kt
new file mode 100644
index 0000000..f242406
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroup.kt
@@ -0,0 +1,35 @@
+package fr.dcproject.component.workgroup.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupRef
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetWorkgroup {
+    @Location("/workgroups/{workgroup}")
+    class WorkgroupRequest(workgroup: UUID) {
+        val workgroup = WorkgroupRef(workgroup)
+    }
+
+    fun Route.getWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
+        get<WorkgroupRequest> {
+            repo.findById(it.workgroup.id)?.let { workgroup ->
+                ac.assert { canView(workgroup, citizenOrNull) }
+                call.respond(
+                    HttpStatusCode.OK,
+                    workgroup.toOutput()
+                )
+            } ?: call.respond(HttpStatusCode.NotFound)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroups.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroups.kt
new file mode 100644
index 0000000..40f79ba
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroups.kt
@@ -0,0 +1,54 @@
+package fr.dcproject.component.workgroup.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import fr.postgresjson.repository.RepositoryI
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object GetWorkgroups {
+    @Location("/workgroups")
+    class WorkgroupsRequest(
+        page: Int = 1,
+        limit: Int = 50,
+        val sort: String? = null,
+        val direction: RepositoryI.Direction? = null,
+        val search: String? = null,
+        val createdBy: String? = null,
+        members: List<String?>? = null
+    ) {
+        val page: Int = if (page < 1) 1 else page
+        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
+        val members: List<UUID>? = members?.toUUID()
+    }
+
+    fun Route.getWorkgroups(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
+        get<WorkgroupsRequest> {
+            val workgroups =
+                repo.find(
+                    it.page,
+                    it.limit,
+                    it.sort,
+                    it.direction,
+                    it.search,
+                    WorkgroupRepository.Filter(createdById = it.createdBy, members = it.members)
+                )
+            ac.assert { canView(workgroups.result, citizenOrNull) }
+            call.respond(
+                HttpStatusCode.OK,
+                workgroups.toOutput { it.toOutputListing() }
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/install.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/install.kt
new file mode 100644
index 0000000..80791b6
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/install.kt
@@ -0,0 +1,30 @@
+package fr.dcproject.component.workgroup.routes
+
+import fr.dcproject.component.workgroup.routes.CreateWorkgroup.createWorkgroup
+import fr.dcproject.component.workgroup.routes.DeleteWorkgroup.deleteWorkgroup
+import fr.dcproject.component.workgroup.routes.EditWorkgroup.editWorkgroup
+import fr.dcproject.component.workgroup.routes.GetWorkgroup.getWorkgroup
+import fr.dcproject.component.workgroup.routes.GetWorkgroups.getWorkgroups
+import fr.dcproject.component.workgroup.routes.members.AddMemberToWorkgroup.addMemberToWorkgroup
+import fr.dcproject.component.workgroup.routes.members.DeleteMembersOfWorkgroup.deleteMemberOfWorkgroup
+import fr.dcproject.component.workgroup.routes.members.UpdateMemberOfWorkgroup.updateMemberOfWorkgroup
+import io.ktor.auth.authenticate
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Routing
+import org.koin.ktor.ext.get
+
+@KtorExperimentalLocationsAPI
+fun Routing.installWorkgroupRoutes() {
+    authenticate(optional = true) {
+        /* Workgroup */
+        getWorkgroups(get(), get())
+        getWorkgroup(get(), get())
+        createWorkgroup(get(), get())
+        editWorkgroup(get(), get())
+        deleteWorkgroup(get(), get())
+        /* Members */
+        addMemberToWorkgroup(get(), get())
+        deleteMemberOfWorkgroup(get(), get())
+        updateMemberOfWorkgroup(get(), get())
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/AddMemberToWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/AddMemberToWorkgroup.kt
new file mode 100644
index 0000000..dd73f81
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/AddMemberToWorkgroup.kt
@@ -0,0 +1,60 @@
+package fr.dcproject.component.workgroup.routes.members
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI
+import fr.dcproject.component.workgroup.routes.toOutput
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.koin.core.KoinComponent
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object AddMemberToWorkgroup {
+    @Location("/workgroups/{workgroupId}/members")
+    class WorkgroupsMembersRequest(val workgroupId: UUID) : KoinComponent {
+        class Input : MutableList<Input.Member> by mutableListOf() {
+            class Member(val citizen: CitizenRef, roles: List<String> = emptyList()) {
+                val roles: List<WorkgroupWithMembersI.Member.Role> = roles.map {
+                    WorkgroupWithMembersI.Member.Role.valueOf(it)
+                }
+            }
+        }
+    }
+
+    @KtorExperimentalLocationsAPI
+    private suspend fun ApplicationCall.getMembersFromRequest(): List<WorkgroupWithMembersI.Member<CitizenRef>> = receiveOrBadRequest<WorkgroupsMembersRequest.Input>().map {
+        WorkgroupWithMembersI.Member(
+            citizen = it.citizen,
+            roles = it.roles
+        )
+    }
+
+    @KtorExperimentalLocationsAPI
+    fun Route.addMemberToWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
+        /* Add members to workgroup */
+        post<WorkgroupsMembersRequest> {
+            repo.findById(it.workgroupId)?.let { workgroup ->
+                call.getMembersFromRequest().let { members ->
+                    ac.assert { canAddMembers(workgroup, citizenOrNull) }
+                    repo.addMembers(workgroup, members)
+                }.let { members ->
+                    call.respond(
+                        HttpStatusCode.Created,
+                        members.toOutput()
+                    )
+                }
+            } ?: call.respond(HttpStatusCode.NotFound)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt
new file mode 100644
index 0000000..fb22715
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt
@@ -0,0 +1,52 @@
+package fr.dcproject.component.workgroup.routes.members
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI
+import fr.dcproject.component.workgroup.routes.toOutput
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.delete
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.koin.core.KoinComponent
+import java.util.UUID
+import fr.dcproject.component.workgroup.routes.members.DeleteMembersOfWorkgroup.WorkgroupsMembersRequest.Input as Input
+
+@KtorExperimentalLocationsAPI
+object DeleteMembersOfWorkgroup {
+    @Location("/workgroups/{workgroupId}/members")
+    class WorkgroupsMembersRequest(val workgroupId: UUID) : KoinComponent {
+        class Input : MutableList<Input.Member> by mutableListOf() {
+            class Member(val citizen: CitizenRef)
+        }
+    }
+
+    private suspend fun ApplicationCall.getMembersFromRequest(): List<WorkgroupWithMembersI.Member<CitizenRef>> =
+        receiveOrBadRequest<Input>().map { WorkgroupWithMembersI.Member(it.citizen) }
+
+    fun Route.deleteMemberOfWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
+        /* Delete members of workgroup */
+        delete<WorkgroupsMembersRequest> {
+            repo.findById(it.workgroupId)?.let { workgroup ->
+                call.getMembersFromRequest()
+                    .let { members ->
+                        ac.assert { canRemoveMembers(workgroup, citizenOrNull) }
+                        repo.removeMembers(workgroup, members)
+                    }.let { members ->
+                        call.respond(
+                            HttpStatusCode.OK,
+                            members.toOutput()
+                        )
+                    }
+            } ?: call.respond(HttpStatusCode.NotFound)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt
new file mode 100644
index 0000000..b36a2b3
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt
@@ -0,0 +1,58 @@
+package fr.dcproject.component.workgroup.routes.members
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI
+import fr.dcproject.component.workgroup.routes.toOutput
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.koin.core.KoinComponent
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object UpdateMemberOfWorkgroup {
+    @Location("/workgroups/{workgroupId}/members")
+    class WorkgroupsMembersRequest(val workgroupId: UUID) : KoinComponent {
+        class Input : MutableList<Input.Item> by mutableListOf() {
+            class Item(val citizen: CitizenRef, roles: List<String> = emptyList()) {
+                val roles: List<WorkgroupWithMembersI.Member.Role> = roles.map {
+                    WorkgroupWithMembersI.Member.Role.valueOf(it)
+                }
+            }
+        }
+    }
+
+    private suspend fun ApplicationCall.getMembersFromRequest(): List<WorkgroupWithMembersI.Member<CitizenRef>> = receiveOrBadRequest<WorkgroupsMembersRequest.Input>().map {
+        WorkgroupWithMembersI.Member(
+            citizen = it.citizen,
+            roles = it.roles
+        )
+    }
+
+    fun Route.updateMemberOfWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
+        /* Update members of workgroup */
+        put<WorkgroupsMembersRequest> {
+            repo.findById(it.workgroupId)?.let { workgroup ->
+                call.getMembersFromRequest().let { members ->
+                    ac.assert { canUpdateMembers(workgroup, citizenOrNull) }
+                    repo.updateMembers(workgroup, members)
+                }.let { members ->
+                    call.respond(
+                        HttpStatusCode.OK,
+                        members.toOutput()
+                    )
+                }
+            } ?: call.respond(HttpStatusCode.NotFound)
+        }
+    }
+}
diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/response.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/response.kt
new file mode 100644
index 0000000..985a313
--- /dev/null
+++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/response.kt
@@ -0,0 +1,40 @@
+package fr.dcproject.component.workgroup.routes
+
+import fr.dcproject.common.response.toOutput
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.workgroup.database.WorkgroupForView
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI
+import org.joda.time.DateTime
+import java.util.UUID
+
+fun WorkgroupForView<CitizenCreator>.toOutput(): Any = this.let { w ->
+    object {
+        val id: UUID = w.id
+        val name: String = w.name
+        val description: String = w.description
+        val logo: String? = w.logo
+        val anonymous: Boolean = w.anonymous
+        val createdAt: DateTime = w.createdAt
+        val createdBy: Any = w.createdBy.toOutput()
+        val members: Any = w.members.toOutput()
+    }
+}
+
+fun WorkgroupForView<*>.toOutputListing(): Any = this.let { w ->
+    object {
+        val id: UUID = w.id
+        val name: String = w.name
+        val description: String = w.description
+        val logo: String? = w.logo
+        val createdAt: DateTime = w.createdAt
+    }
+}
+
+fun List<WorkgroupWithMembersI.Member<CitizenCreator>>.toOutput(): Any {
+    return this.map { m ->
+        object {
+            val citizen: Any = m.citizen.toOutput()
+            val roles: List<String> = m.roles.map { it.toString() }
+        }
+    }
+}
diff --git a/src/main/kotlin/repository/Citizen.kt b/src/main/kotlin/repository/Citizen.kt
deleted file mode 100644
index 1021e1b..0000000
--- a/src/main/kotlin/repository/Citizen.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package fr.dcproject.repository
-
-import fr.dcproject.entity.CitizenBasic
-import fr.dcproject.entity.CitizenFull
-import fr.dcproject.entity.UserI
-import fr.postgresjson.connexion.Paginated
-import fr.postgresjson.connexion.Requester
-import fr.postgresjson.repository.RepositoryI
-import fr.postgresjson.repository.RepositoryI.Direction
-import net.pearx.kasechange.toSnakeCase
-import java.util.*
-import fr.dcproject.entity.Citizen as CitizenEntity
-
-class Citizen(override var requester: Requester) : RepositoryI {
-    fun findById(id: UUID): CitizenEntity? = requester
-        .getFunction("find_citizen_by_id_with_user_and_workgroups")
-        .selectOne("id" to id)
-
-    fun findByUser(user: UserI): CitizenEntity? = requester
-        .getFunction("find_citizen_by_user_id")
-        .selectOne("user_id" to user.id)
-
-    fun findByUsername(unsername: String): CitizenEntity? = requester
-        .getFunction("find_citizen_by_username")
-        .selectOne("username" to unsername)
-
-    fun findByEmail(email: String): CitizenEntity? = requester
-        .getFunction("find_citizen_by_email")
-        .selectOne("email" to email)
-
-    fun find(
-        page: Int = 1,
-        limit: Int = 50,
-        sort: String? = null,
-        direction: Direction? = null,
-        search: String? = null
-    ): Paginated<CitizenBasic> = requester
-            .getFunction("find_citizens")
-            .select(
-                page, limit,
-                "sort" to sort?.toSnakeCase(),
-                "direction" to direction,
-                "search" to search
-            )
-
-    fun upsert(citizen: CitizenFull): CitizenEntity? = requester
-            .getFunction("upsert_citizen")
-            .selectOne("resource" to citizen)
-
-    fun insertWithUser(citizen: CitizenFull): CitizenEntity? = requester
-            .getFunction("insert_citizen_with_user")
-            .selectOne("resource" to citizen)
-}
diff --git a/src/main/kotlin/repository/Comment.kt b/src/main/kotlin/repository/Comment.kt
deleted file mode 100644
index a27937f..0000000
--- a/src/main/kotlin/repository/Comment.kt
+++ /dev/null
@@ -1,210 +0,0 @@
-package fr.dcproject.repository
-
-import fr.dcproject.entity.ArticleRef
-import fr.dcproject.entity.ConstitutionRef
-import fr.dcproject.entity.TargetI
-import fr.dcproject.entity.TargetRef
-import fr.postgresjson.connexion.Paginated
-import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.immutable.UuidEntityI
-import fr.postgresjson.repository.RepositoryI
-import java.util.*
-import fr.dcproject.entity.Citizen as CitizenEntity
-import fr.dcproject.entity.Comment as CommentEntity
-import fr.dcproject.entity.Article as ArticleEntity
-
-abstract class Comment<T : TargetI>(override var requester: Requester) : RepositoryI {
-    abstract fun findById(id: UUID): CommentEntity<T>?
-
-    abstract fun findByCitizen(
-        citizen: CitizenEntity,
-        page: Int = 1,
-        limit: Int = 50
-    ): Paginated<CommentEntity<T>>
-
-    open fun findByParent(
-        parent: CommentEntity<T>,
-        page: Int = 1,
-        limit: Int = 50
-    ): Paginated<CommentEntity<T>> {
-        return findByParent(parent.id, page, limit)
-    }
-
-    open fun findByParent(
-        parentId: UUID,
-        page: Int = 1,
-        limit: Int = 50
-    ): Paginated<CommentEntity<T>> {
-        return requester.run {
-            getFunction("find_comments_by_parent")
-                .select(
-                    page, limit,
-                    "parent_id" to parentId
-                )
-        }
-    }
-
-    open fun findByTarget(
-        target: UuidEntityI,
-        page: Int = 1,
-        limit: Int = 50,
-        sort: CommentArticle.Sort = CommentArticle.Sort.CREATED_AT
-    ): Paginated<CommentEntity<T>> {
-        return findByTarget(target.id, page, limit, sort)
-    }
-
-    open fun findByTarget(
-        targetId: UUID,
-        page: Int = 1,
-        limit: Int = 50,
-        sort: CommentArticle.Sort = CommentArticle.Sort.CREATED_AT
-    ): Paginated<CommentEntity<T>> {
-        return requester.run {
-            getFunction("find_comments_by_target")
-                .select(
-                    page, limit,
-                    "target_id" to targetId,
-                    "sort" to sort.sql
-                )
-        }
-    }
-
-    fun <I : T> comment(comment: CommentEntity<I>) {
-        requester
-            .getFunction("comment")
-            .sendQuery(
-                "reference" to comment.target.reference,
-                "resource" to comment
-            )
-    }
-
-    fun <I : T> edit(comment: CommentEntity<I>) {
-        requester
-            .getFunction("edit_comment")
-            .sendQuery(
-                "id" to comment.id,
-                "content" to comment.content
-            )
-    }
-}
-
-class CommentGeneric(requester: Requester) : Comment<TargetRef>(requester) {
-    override fun findById(id: UUID): CommentEntity<TargetRef>? {
-        return requester
-            .getFunction("find_comment_by_id")
-            .selectOne(mapOf("id" to id))
-    }
-
-    override fun findByCitizen(
-        citizen: CitizenEntity,
-        page: Int,
-        limit: Int
-    ): Paginated<CommentEntity<TargetRef>> {
-        return requester.run {
-            getFunction("find_comments_by_citizen")
-                .select(
-                    page, limit,
-                    "created_by_id" to citizen.id
-                )
-        }
-    }
-
-    override fun findByParent(
-        parentId: UUID,
-        page: Int,
-        limit: Int
-    ): Paginated<CommentEntity<TargetRef>> {
-        return requester.run {
-            getFunction("find_comments_by_parent")
-                .select(
-                    page, limit,
-                    "parent_id" to parentId
-                )
-        }
-    }
-}
-
-class CommentArticle(requester: Requester) : Comment<ArticleEntity>(requester) {
-    override fun findById(id: UUID): CommentEntity<ArticleEntity>? {
-        return requester
-            .getFunction("find_comment_by_id")
-            .selectOne(mapOf("id" to id))
-    }
-
-    override fun findByCitizen(
-        citizen: CitizenEntity,
-        page: Int,
-        limit: Int
-    ): Paginated<CommentEntity<ArticleEntity>> {
-        return requester.run {
-            getFunction("find_comments_by_citizen")
-                .select(
-                    page, limit,
-                    "created_by_id" to citizen.id,
-                    "reference" to TargetI.getReference(ArticleRef::class)
-                )
-        }
-    }
-
-    override fun findByTarget(
-        target: UuidEntityI,
-        page: Int,
-        limit: Int,
-        sort: Sort
-    ): Paginated<CommentEntity<ArticleEntity>> = requester
-        .getFunction("find_comments_by_target")
-        .select(
-            page, limit,
-            "target_id" to target.id,
-            "sort" to sort.sql
-        )
-
-    enum class Sort(val sql: String) {
-        CREATED_AT("created_at"), VOTES("votes");
-
-        companion object {
-            fun fromString(string: String): Sort? {
-                return values().firstOrNull { it.sql == string }
-            }
-        }
-    }
-}
-
-class CommentConstitution(requester: Requester) : Comment<ConstitutionRef>(requester) {
-    override fun findById(id: UUID): CommentEntity<ConstitutionRef>? {
-        return requester
-            .getFunction("find_comment_by_id")
-            .selectOne(mapOf("id" to id))
-    }
-
-    override fun findByCitizen(
-        citizen: CitizenEntity,
-        page: Int,
-        limit: Int
-    ): Paginated<CommentEntity<ConstitutionRef>> {
-        return requester.run {
-            getFunction("find_comments_by_citizen")
-                .select(
-                    page, limit,
-                    "created_by_id" to citizen.id,
-                    "reference" to TargetI.getReference(ConstitutionRef::class)
-                )
-        }
-    }
-
-    override fun findByTarget(
-        target: UuidEntityI,
-        page: Int,
-        limit: Int,
-        sort: CommentArticle.Sort
-    ): Paginated<CommentEntity<ConstitutionRef>> {
-        return requester.run {
-            getFunction("find_comments_by_target")
-                .select(
-                    page, limit,
-                    "target_id" to target.id,
-                    "sort" to sort.sql
-                )
-        }
-    }
-}
diff --git a/src/main/kotlin/routes/Article.kt b/src/main/kotlin/routes/Article.kt
deleted file mode 100644
index 4a26a0d..0000000
--- a/src/main/kotlin/routes/Article.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.citizenOrNull
-import fr.dcproject.entity.ArticleForUpdate
-import fr.dcproject.entity.CitizenRef
-import fr.dcproject.entity.WorkgroupRef
-import fr.dcproject.entity.WorkgroupSimple
-import fr.dcproject.event.ArticleUpdate
-import fr.dcproject.event.raiseEvent
-import fr.dcproject.repository.Article.Filter
-import fr.dcproject.repository.Workgroup as WorkgroupRepository
-import fr.dcproject.security.voter.ArticleVoter.Action.CREATE
-import fr.dcproject.security.voter.ArticleVoter.Action.VIEW
-import fr.dcproject.views.ArticleViewManager
-import fr.ktorVoter.assertCan
-import fr.postgresjson.repository.RepositoryI
-import io.ktor.application.ApplicationCall
-import io.ktor.application.call
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.locations.post
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import kotlinx.coroutines.launch
-import org.koin.core.KoinComponent
-import org.koin.core.inject
-import java.util.*
-import fr.dcproject.entity.Article as ArticleEntity
-import fr.dcproject.repository.Article as ArticleRepository
-
-@KtorExperimentalLocationsAPI
-object ArticlesPaths {
-    @Location("/articles")
-    class ArticlesRequest(
-        page: Int = 1,
-        limit: Int = 50,
-        val sort: String? = null,
-        val direction: RepositoryI.Direction? = null,
-        val search: String? = null,
-        val createdBy: String? = null,
-        val workgroup: String? = null
-    ) {
-        val page: Int = if (page < 1) 1 else page
-        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
-    }
-
-    @Location("/articles/{article}")
-    class ArticleRequest(val article: ArticleEntity)
-
-    @Location("/articles/{article}/versions")
-    class ArticleVersionsRequest(
-        val article: ArticleEntity,
-        page: Int = 1,
-        limit: Int = 50,
-        val sort: String? = null,
-        val direction: RepositoryI.Direction? = null,
-        val search: String? = null
-    ) {
-        val page: Int = if (page < 1) 1 else page
-        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
-    }
-
-    @Location("/articles")
-    class PostArticleRequest : KoinComponent {
-        class Article(
-            val id: UUID?,
-            val title: String,
-            val anonymous: Boolean = true,
-            val content: String,
-            val description: String,
-            val tags: List<String> = emptyList(),
-            val draft: Boolean = false,
-            val versionId: UUID?,
-            val workgroup: WorkgroupRef? = null
-        )
-
-        private val workgroupRepository: WorkgroupRepository by inject()
-
-        suspend fun getNewArticle(call: ApplicationCall): ArticleForUpdate = call.receive<Article>().run {
-            ArticleForUpdate(
-                id ?: UUID.randomUUID(),
-                title,
-                anonymous,
-                content,
-                description,
-                tags,
-                draft,
-                createdBy = call.citizen,
-                workgroup = if (workgroup != null) workgroupRepository.findById(workgroup.id) as WorkgroupSimple<CitizenRef> else null
-            ).also {
-                it.versionId = versionId ?: UUID.randomUUID()
-            }
-        }
-    }
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.article(repo: ArticleRepository, viewManager: ArticleViewManager) {
-    get<ArticlesPaths.ArticlesRequest> {
-        val articles = repo.find(
-            it.page,
-            it.limit,
-            it.sort,
-            it.direction,
-            it.search,
-            Filter(createdById = it.createdBy, workgroupId = it.workgroup)
-        )
-        assertCan(VIEW, articles.result)
-        call.respond(articles)
-    }
-
-    get<ArticlesPaths.ArticleRequest> {
-        assertCan(VIEW, it.article)
-
-        it.article.views = viewManager.getViewsCount(it.article)
-
-        call.respond(it.article)
-
-        launch {
-            viewManager.addView(call.request.local.remoteHost, it.article, citizenOrNull)
-        }
-    }
-
-    get<ArticlesPaths.ArticleVersionsRequest> {
-        assertCan(VIEW, it.article)
-
-        repo.findVerionsByVersionsId(it.page, it.limit, it.article.versionId).let {
-            call.respond(it)
-        }
-    }
-
-    post<ArticlesPaths.PostArticleRequest> {
-        it.getNewArticle(call).also { article ->
-            assertCan(CREATE, article)
-            val newArticle = repo.upsert(article) ?: error("Article not updated")
-            call.respond(article)
-            raiseEvent(ArticleUpdate.event, ArticleUpdate(newArticle))
-        }
-    }
-}
diff --git a/src/main/kotlin/routes/Auth.kt b/src/main/kotlin/routes/Auth.kt
deleted file mode 100644
index e65cae9..0000000
--- a/src/main/kotlin/routes/Auth.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package fr.dcproject.routes
-
-import com.fasterxml.jackson.databind.exc.MismatchedInputException
-import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
-import fr.dcproject.JwtConfig
-import fr.dcproject.entity.UserI.Roles.ROLE_USER
-import fr.dcproject.messages.SsoManager
-import fr.dcproject.routes.AuthPaths.LoginRequest
-import fr.dcproject.routes.AuthPaths.RegisterRequest
-import fr.dcproject.routes.AuthPaths.SsoRequest
-import io.ktor.application.call
-import io.ktor.auth.UserPasswordCredential
-import io.ktor.features.BadRequestException
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.post
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.response.respondText
-import io.ktor.routing.Route
-import io.ktor.util.KtorExperimentalAPI
-import fr.dcproject.entity.Citizen as CitizenEntity
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.User as UserRepository
-
-@KtorExperimentalLocationsAPI
-object AuthPaths {
-    @Location("/login")
-    class LoginRequest
-
-    @Location("/register")
-    class RegisterRequest
-
-    @Location("/sso")
-    class SsoRequest {
-        data class Content(val email: String, val url: String)
-    }
-}
-
-@KtorExperimentalLocationsAPI
-@KtorExperimentalAPI
-fun Route.auth(
-    userRepo: UserRepository,
-    citizenRepo: CitizenRepository,
-    ssoManager: SsoManager
-) {
-    post<LoginRequest> {
-        try {
-            val credentials = call.receive<UserPasswordCredential>()
-            val user = userRepo.findByCredentials(credentials) ?: throw WrongLoginOrPassword()
-            call.respondText(JwtConfig.makeToken(user))
-        } catch (e: MismatchedInputException) {
-            call.respond(HttpStatusCode.BadRequest, "You must be send name and password to the request")
-        } catch (e: WrongLoginOrPassword) {
-            call.respond(HttpStatusCode.BadRequest, e.message)
-        }
-    }
-
-    post<RegisterRequest> {
-        try {
-            val citizen = call.receive<CitizenEntity>()
-            citizen.user.roles = listOf(ROLE_USER)
-            val created = citizenRepo.insertWithUser(citizen)?.user ?: throw BadRequestException("Bad request")
-            call.respondText(JwtConfig.makeToken(created))
-        } catch (e: MissingKotlinParameterException) {
-            call.respond(HttpStatusCode.BadRequest)
-        }
-    }
-
-    post<SsoRequest> {
-        val content = call.receive<SsoRequest.Content>()
-        try {
-            ssoManager.sendEmail(content.email, content.url)
-        } catch (e: SsoManager.EmailNotFound) {
-            call.respond(HttpStatusCode.NotFound)
-        }
-
-        call.respond(HttpStatusCode.NoContent)
-    }
-}
-
-class WrongLoginOrPassword(override val message: String = "Username not exist or password is wrong") : Exception()
diff --git a/src/main/kotlin/routes/Citizen.kt b/src/main/kotlin/routes/Citizen.kt
deleted file mode 100644
index b693882..0000000
--- a/src/main/kotlin/routes/Citizen.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package fr.dcproject.routes
-
-import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
-import fr.dcproject.citizen
-import fr.dcproject.citizenOrNull
-import fr.dcproject.entity.Citizen
-import fr.dcproject.routes.CitizenPaths.ChangePasswordCitizenRequest
-import fr.dcproject.routes.CitizenPaths.CitizenRequest
-import fr.dcproject.routes.CitizenPaths.CitizensRequest
-import fr.dcproject.routes.CitizenPaths.CurrentCitizenRequest
-import fr.dcproject.security.voter.CitizenVoter.Action.CHANGE_PASSWORD
-import fr.dcproject.security.voter.CitizenVoter.Action.VIEW
-import fr.ktorVoter.assertCan
-import fr.postgresjson.repository.RepositoryI.Direction
-import io.ktor.application.call
-import io.ktor.auth.UserPasswordCredential
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.locations.put
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.User as UserRepository
-
-@KtorExperimentalLocationsAPI
-object CitizenPaths {
-    @Location("/citizens")
-    class CitizensRequest(
-        page: Int = 1,
-        limit: Int = 50,
-        val sort: String? = null,
-        val direction: Direction? = null,
-        val search: String? = null
-    ) {
-        val page: Int = if (page < 1) 1 else page
-        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
-    }
-
-    @Location("/citizens/{citizen}")
-    class CitizenRequest(val citizen: Citizen)
-
-    @Location("/citizens/current")
-    class CurrentCitizenRequest
-
-    @Location("/citizens/{citizen}/password/change")
-    class ChangePasswordCitizenRequest(val citizen: Citizen) {
-        data class Content(val oldPassword: String, val newPassword: String)
-    }
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.citizen(
-    repo: CitizenRepository,
-    userRepository: UserRepository
-) {
-    get<CitizensRequest> {
-        val citizens = repo.find(it.page, it.limit, it.sort, it.direction, it.search)
-        assertCan(VIEW, citizens.result)
-        call.respond(citizens)
-    }
-
-    get<CitizenRequest> {
-        assertCan(VIEW, it.citizen)
-
-        call.respond(it.citizen)
-    }
-
-    get<CurrentCitizenRequest> {
-        if (citizenOrNull === null) {
-            call.respond(HttpStatusCode.Unauthorized)
-        } else {
-            assertCan(VIEW, citizen)
-            call.respond(citizen)
-        }
-    }
-
-    put<ChangePasswordCitizenRequest> {
-        assertCan(CHANGE_PASSWORD, it.citizen)
-        try {
-            val content = call.receive<ChangePasswordCitizenRequest.Content>()
-            val currentUser = userRepository.findByCredentials(UserPasswordCredential(citizen.user.username, content.oldPassword))
-            val user = it.citizen.user
-            if (currentUser == null || currentUser.id != user.id) {
-                call.respond(HttpStatusCode.BadRequest, "Bad password")
-            } else {
-                user.plainPassword = content.newPassword
-                userRepository.changePassword(user)
-
-                call.respond(HttpStatusCode.Created)
-            }
-        } catch (e: MissingKotlinParameterException) {
-            call.respond(HttpStatusCode.BadRequest, "Request format is not correct")
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/routes/Comment.kt b/src/main/kotlin/routes/Comment.kt
deleted file mode 100644
index 36e0f59..0000000
--- a/src/main/kotlin/routes/Comment.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.Comment
-import fr.dcproject.entity.CommentRef
-import fr.dcproject.routes.CommentPaths.CreateCommentRequest.Content
-import fr.dcproject.security.voter.CommentVoter.Action.*
-import fr.ktorVoter.assertCan
-import io.ktor.application.call
-import io.ktor.features.NotFoundException
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.*
-import io.ktor.request.receive
-import io.ktor.request.receiveText
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.util.KtorExperimentalAPI
-import java.util.*
-import fr.dcproject.repository.CommentGeneric as CommentRepository
-
-@KtorExperimentalLocationsAPI
-object CommentPaths {
-    @Location("/comments/{comment}")
-    class CommentRequest(val comment: CommentRef)
-
-    @Location("/comments/{comment}/children")
-    class CommentChildrenRequest(
-        val comment: UUID,
-        page: Int = 1,
-        limit: Int = 50,
-        val search: String? = null
-    ) {
-        val page: Int = if (page < 1) 1 else page
-        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
-    }
-
-    @Location("/comments/{comment}/children")
-    class CreateCommentRequest(val comment: CommentRef) {
-        class Content(val content: String)
-    }
-}
-
-@KtorExperimentalAPI
-@KtorExperimentalLocationsAPI
-fun Route.comment(repo: CommentRepository) {
-    get<CommentPaths.CommentRequest> {
-        val comment = repo.findById(it.comment.id)!!
-        assertCan(VIEW, comment)
-
-        call.respond(HttpStatusCode.OK, comment)
-    }
-
-    get<CommentPaths.CommentChildrenRequest> {
-        val comments =
-            repo.findByParent(
-                it.comment,
-                it.page,
-                it.limit
-            )
-
-        assertCan(VIEW, comments.result)
-
-        call.respond(HttpStatusCode.OK, comments)
-    }
-
-    post<CommentPaths.CreateCommentRequest> {
-        val parent = repo.findById(it.comment.id) ?: throw NotFoundException("Comment not found")
-        val newComment = Comment(
-            content = call.receive<Content>().content,
-            createdBy = citizen,
-            parent = parent
-        )
-
-        assertCan(CREATE, newComment)
-        repo.comment(newComment)
-
-        call.respond(HttpStatusCode.Created, newComment)
-    }
-
-    put<CommentPaths.CommentRequest> {
-        val comment = repo.findById(it.comment.id)!!
-        assertCan(UPDATE, comment)
-
-        comment.content = call.receiveText()
-        repo.edit(comment)
-
-        call.respond(HttpStatusCode.OK, comment)
-    }
-}
diff --git a/src/main/kotlin/routes/CommentArticle.kt b/src/main/kotlin/routes/CommentArticle.kt
deleted file mode 100644
index 6222f0f..0000000
--- a/src/main/kotlin/routes/CommentArticle.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.Article
-import fr.dcproject.entity.Citizen
-import fr.dcproject.repository.CommentArticle.Sort
-import fr.dcproject.security.voter.CommentVoter.Action.CREATE
-import fr.dcproject.security.voter.CommentVoter.Action.VIEW
-import fr.ktorVoter.assertCan
-import io.ktor.application.ApplicationCall
-import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.locations.post
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import fr.dcproject.entity.Comment as CommentEntity
-import fr.dcproject.repository.CommentArticle as CommentArticleRepository
-
-@KtorExperimentalLocationsAPI
-object CommentArticlePaths {
-    @Location("/articles/{article}/comments")
-    class ArticleCommentRequest(
-        val article: Article,
-        page: Int = 1,
-        limit: Int = 50,
-        val search: String? = null,
-        sort: String = Sort.CREATED_AT.sql
-    ) {
-        val page: Int = if (page < 1) 1 else page
-        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
-        val sort: Sort = Sort.fromString(sort) ?: Sort.CREATED_AT
-    }
-
-    @Location("/articles/{article}/comments")
-    class PostArticleCommentRequest(
-        val article: Article
-    ) {
-        class Comment(
-            val content: String
-        )
-
-        suspend fun getComment(call: ApplicationCall) = call.receive<Comment>().run {
-            CommentEntity(
-                target = article,
-                createdBy = call.citizen,
-                content = content
-            )
-        }
-    }
-
-    @Location("/citizens/{citizen}/comments/articles")
-    class CitizenCommentArticleRequest(val citizen: Citizen)
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.commentArticle(repo: CommentArticleRepository) {
-    get<CommentArticlePaths.ArticleCommentRequest> {
-        val comment = repo.findByTarget(it.article, it.page, it.limit, it.sort)
-        if (comment.result.isNotEmpty()) {
-            assertCan(VIEW, comment.result)
-        }
-        call.respond(HttpStatusCode.OK, comment)
-    }
-
-    post<CommentArticlePaths.PostArticleCommentRequest> {
-        it.getComment(call).let { comment ->
-            assertCan(CREATE, comment)
-            repo.comment(comment)
-            call.respond(HttpStatusCode.Created, comment)
-        }
-    }
-
-    get<CommentArticlePaths.CitizenCommentArticleRequest> {
-        repo.findByCitizen(it.citizen).let { comments ->
-            assertCan(VIEW, comments.result)
-            call.respond(comments)
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/routes/CommentConstitution.kt b/src/main/kotlin/routes/CommentConstitution.kt
deleted file mode 100644
index 889b9ad..0000000
--- a/src/main/kotlin/routes/CommentConstitution.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.Citizen
-import fr.dcproject.entity.ConstitutionRef
-import fr.dcproject.security.voter.CommentVoter.Action.CREATE
-import fr.dcproject.security.voter.CommentVoter.Action.VIEW
-import fr.ktorVoter.assertCan
-import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.locations.post
-import io.ktor.request.receiveText
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import fr.dcproject.entity.Comment as CommentEntity
-import fr.dcproject.repository.CommentConstitution as CommentConstitutionRepository
-
-@KtorExperimentalLocationsAPI
-object CommentConstitutionPaths {
-    @Location("/constitutions/{constitution}/comments")
-    class ConstitutionCommentRequest(val constitution: ConstitutionRef)
-
-    @Location("/citizens/{citizen}/comments/constitutions")
-    class CitizenCommentConstitutionRequest(val citizen: Citizen)
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.commentConstitution(repo: CommentConstitutionRepository) {
-    get<CommentConstitutionPaths.ConstitutionCommentRequest> {
-        val comments = repo.findByTarget(it.constitution)
-        assertCan(VIEW, comments.result)
-        call.respond(HttpStatusCode.OK, comments)
-    }
-
-    post<CommentConstitutionPaths.ConstitutionCommentRequest> {
-        val content = call.receiveText()
-        val comment = CommentEntity(
-            target = it.constitution,
-            createdBy = citizen,
-            content = content
-        )
-        assertCan(CREATE, comment)
-        repo.comment(comment)
-
-        call.respond(HttpStatusCode.Created, comment)
-    }
-
-    get<CommentConstitutionPaths.CitizenCommentConstitutionRequest> {
-        val comments = repo.findByCitizen(it.citizen)
-        assertCan(VIEW, comments.result)
-        call.respond(comments)
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/routes/Constitution.kt b/src/main/kotlin/routes/Constitution.kt
deleted file mode 100644
index a78765a..0000000
--- a/src/main/kotlin/routes/Constitution.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.ArticleRef
-import fr.dcproject.entity.CitizenSimple
-import fr.dcproject.entity.ConstitutionSimple
-import fr.dcproject.security.voter.ConstitutionVoter.Action.CREATE
-import fr.dcproject.security.voter.ConstitutionVoter.Action.VIEW
-import fr.ktorVoter.assertCan
-import fr.postgresjson.entity.immutable.UuidEntity
-import fr.postgresjson.repository.RepositoryI
-import io.ktor.application.ApplicationCall
-import io.ktor.application.call
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.locations.post
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import java.util.*
-import fr.dcproject.entity.Constitution as ConstitutionEntity
-import fr.dcproject.repository.Constitution as ConstitutionRepository
-
-@KtorExperimentalLocationsAPI
-object ConstitutionPaths {
-    @Location("/constitutions")
-    class ConstitutionsRequest(
-        page: Int = 1,
-        limit: Int = 50,
-        val sort: String? = null,
-        val direction: RepositoryI.Direction? = null,
-        val search: String? = null
-    ) {
-        val page: Int = if (page < 1) 1 else page
-        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
-    }
-
-    @Location("/constitutions/{constitution}")
-    class ConstitutionRequest(val constitution: ConstitutionEntity)
-
-    @Location("/constitutions")
-    class PostConstitutionRequest {
-        class Constitution(
-            var title: String,
-            var anonymous: Boolean = true,
-            var titles: MutableList<Title> = mutableListOf(),
-            var draft: Boolean = false,
-            var lastVersion: Boolean = false,
-            var versionId: UUID = UUID.randomUUID()
-        ) {
-            init {
-                titles.forEachIndexed { index, title ->
-                    title.rank = index
-                }
-            }
-
-            class Title(
-                id: UUID = UUID.randomUUID(),
-                var name: String,
-                var rank: Int? = null,
-                var articles: MutableList<ArticleRef> = mutableListOf()
-            ) : UuidEntity(id) {
-                fun create(): ConstitutionSimple.TitleSimple<ArticleRef> =
-                    ConstitutionSimple.TitleSimple(
-                        id, name, rank, articles
-                    )
-            }
-
-            fun List<Title>.create(): MutableList<ConstitutionSimple.TitleSimple<ArticleRef>> =
-                map { it.create() }.toMutableList()
-        }
-
-        suspend fun getNewConstitution(call: ApplicationCall): ConstitutionSimple<CitizenSimple, ConstitutionSimple.TitleSimple<ArticleRef>> = call.receive<Constitution>().run {
-            ConstitutionSimple(
-                title = title,
-                titles = titles.create(),
-                createdBy = call.citizen,
-                versionId = versionId
-            )
-        }
-    }
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.constitution(repo: ConstitutionRepository) {
-    get<ConstitutionPaths.ConstitutionsRequest> {
-        val constitutions = repo.find(it.page, it.limit, it.sort, it.direction, it.search)
-        assertCan(VIEW, constitutions.result)
-        call.respond(constitutions)
-    }
-
-    get<ConstitutionPaths.ConstitutionRequest> {
-        assertCan(VIEW, it.constitution)
-        call.respond(it.constitution)
-    }
-
-    post<ConstitutionPaths.PostConstitutionRequest> {
-        it.getNewConstitution(call).let { constitution ->
-            assertCan(CREATE, constitution)
-            repo.upsert(constitution)
-            call.respond(constitution)
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/routes/FollowArticle.kt b/src/main/kotlin/routes/FollowArticle.kt
deleted file mode 100644
index 8ae7b15..0000000
--- a/src/main/kotlin/routes/FollowArticle.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.ArticleRef
-import fr.dcproject.entity.Citizen
-import fr.dcproject.security.voter.FollowVoter.Action.*
-import fr.ktorVoter.assertCan
-import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.*
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import fr.dcproject.entity.Follow as FollowEntity
-import fr.dcproject.repository.FollowArticle as FollowArticleRepository
-
-@KtorExperimentalLocationsAPI
-object FollowArticlePaths {
-    @Location("/articles/{article}/follows")
-    class ArticleFollowRequest(val article: ArticleRef)
-
-    @Location("/citizens/{citizen}/follows/articles")
-    class CitizenFollowArticleRequest(val citizen: Citizen)
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.followArticle(repo: FollowArticleRepository) {
-    post<FollowArticlePaths.ArticleFollowRequest> {
-        val follow = FollowEntity(target = it.article, createdBy = this.citizen)
-        assertCan(CREATE, follow)
-        repo.follow(follow)
-        call.respond(HttpStatusCode.Created)
-    }
-
-    delete<FollowArticlePaths.ArticleFollowRequest> {
-        val follow = FollowEntity(target = it.article, createdBy = this.citizen)
-        assertCan(DELETE, follow)
-        repo.unfollow(follow)
-        call.respond(HttpStatusCode.NoContent)
-    }
-
-    get<FollowArticlePaths.ArticleFollowRequest> {
-        repo.findFollow(citizen, it.article)?.let { follow ->
-            assertCan(VIEW, follow)
-            call.respond(follow)
-        } ?: call.respond(HttpStatusCode.NoContent)
-    }
-
-    get<FollowArticlePaths.CitizenFollowArticleRequest> {
-        val follows = repo.findByCitizen(it.citizen)
-        if (follows.result.isNotEmpty()) {
-            assertCan(VIEW, follows.result)
-        }
-        call.respond(follows)
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/routes/FollowConstitution.kt b/src/main/kotlin/routes/FollowConstitution.kt
deleted file mode 100644
index 1b7e8b4..0000000
--- a/src/main/kotlin/routes/FollowConstitution.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.CitizenRef
-import fr.dcproject.entity.ConstitutionRef
-import fr.dcproject.security.voter.FollowVoter.Action.*
-import fr.ktorVoter.assertCan
-import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.*
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import fr.dcproject.entity.Follow as FollowEntity
-import fr.dcproject.repository.FollowConstitution as FollowConstitutionRepository
-
-@KtorExperimentalLocationsAPI
-object FollowConstitutionPaths {
-    @Location("/constitutions/{constitution}/follows")
-    class ConstitutionFollowRequest(val constitution: ConstitutionRef)
-
-    @Location("/citizens/{citizen}/follows/constitutions")
-    class CitizenFollowConstitutionRequest(val citizen: CitizenRef)
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.followConstitution(repo: FollowConstitutionRepository) {
-    post<FollowConstitutionPaths.ConstitutionFollowRequest> {
-        val follow = FollowEntity(target = it.constitution, createdBy = this.citizen)
-        assertCan(CREATE, follow)
-        repo.follow(follow)
-        call.respond(HttpStatusCode.Created)
-    }
-
-    delete<FollowConstitutionPaths.ConstitutionFollowRequest> {
-        val follow = FollowEntity(target = it.constitution, createdBy = this.citizen)
-        assertCan(DELETE, follow)
-        repo.unfollow(follow)
-        call.respond(HttpStatusCode.NoContent)
-    }
-
-    get<FollowConstitutionPaths.ConstitutionFollowRequest> {
-        repo.findFollow(citizen, it.constitution)?.let { follow ->
-            assertCan(VIEW, follow)
-            call.respond(follow)
-        } ?: call.respond(HttpStatusCode.NotFound)
-    }
-
-    get<FollowConstitutionPaths.CitizenFollowConstitutionRequest> {
-        val follows = repo.findByCitizen(it.citizen)
-        assertCan(VIEW, follows.result)
-        call.respond(follows)
-    }
-}
diff --git a/src/main/kotlin/routes/Notification.kt b/src/main/kotlin/routes/Notification.kt
deleted file mode 100644
index c79bedf..0000000
--- a/src/main/kotlin/routes/Notification.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.event.Event
-import fr.postgresjson.serializer.deserialize
-import io.ktor.client.HttpClient
-import io.ktor.http.cio.websocket.Frame
-import io.ktor.http.cio.websocket.readText
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.routing.Route
-import io.ktor.websocket.webSocket
-import io.lettuce.core.Range
-import io.lettuce.core.api.async.RedisAsyncCommands
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.launch
-
-@ExperimentalCoroutinesApi
-@KtorExperimentalLocationsAPI
-fun Route.notificationArticle(redis: RedisAsyncCommands<String, String>, client: HttpClient) {
-    webSocket("/notifications") {
-        val citizenId = call.citizen.id
-
-        launch {
-            incoming.consumeAsFlow().mapNotNull { it as? Frame.Text }.collect {
-                val notificationMessage = it.readText().deserialize<Event>() ?: error("unable to deserialize message")
-
-                redis.zremrangebyscore(
-                    "notification:$citizenId",
-                    Range.from(
-                        Range.Boundary.including(notificationMessage.id),
-                        Range.Boundary.including(notificationMessage.id)
-                    )
-                )
-            }
-        }
-
-        var score = 0.0
-        while (!outgoing.isClosedForSend) {
-            val result = redis.zrangebyscoreWithScores(
-                "notification:$citizenId",
-                Range.from(
-                    Range.Boundary.excluding(score),
-                    Range.Boundary.including(Double.POSITIVE_INFINITY)
-                )
-            )
-
-            result.get().forEach {
-                outgoing.send(Frame.Text(it.value))
-                if (it.score > score) score = it.score
-            }
-            delay(1000)
-        }
-    }
-}
diff --git a/src/main/kotlin/routes/OpinionArticle.kt b/src/main/kotlin/routes/OpinionArticle.kt
deleted file mode 100644
index 5e6c666..0000000
--- a/src/main/kotlin/routes/OpinionArticle.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.CitizenRef
-import fr.dcproject.entity.OpinionChoiceRef
-import fr.dcproject.security.voter.OpinionVoter.Action.CREATE
-import fr.dcproject.security.voter.OpinionVoter.Action.VIEW
-import fr.ktorVoter.assertCan
-import fr.dcproject.utils.toUUID
-import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.locations.put
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.util.KtorExperimentalAPI
-import org.koin.core.KoinComponent
-import org.koin.core.get
-import java.util.*
-import fr.dcproject.entity.Article as ArticleEntity
-import fr.dcproject.entity.Citizen as CitizenEntity
-import fr.dcproject.repository.OpinionArticle as OpinionArticleRepository
-
-@KtorExperimentalLocationsAPI
-object OpinionArticlePaths {
-    /**
-     * Get paginated opinions of citizen for all articles
-     */
-    @Location("/citizens/{citizen}/opinions/articles")
-    class CitizenOpinionArticleRequest(
-        val citizen: CitizenRef,
-        page: Int = 1,
-        limit: Int = 50
-    ) : PaginatedRequestI by PaginatedRequest(page, limit)
-
-    /**
-     * Put an opinion on one article
-     */
-    @Location("/articles/{article}/opinions")
-    @KtorExperimentalAPI
-    class ArticleOpinion(val article: ArticleEntity) {
-        class Body(ids: List<String>) {
-            val ids = ids.map { OpinionChoiceRef(it.toUUID()) }
-        }
-    }
-
-    /**
-     * Get all Opinion of citizen on targets by target ids
-     */
-    @Location("/citizens/{citizen}/opinions")
-    class CitizenOpinions(val citizen: CitizenEntity, id: List<String>) : KoinComponent {
-        val id: List<UUID> = id.toUUID()
-        val opinionsEntities = get<OpinionArticleRepository>()
-            .findCitizenOpinionsByTargets(citizen, this.id)
-    }
-}
-
-@KtorExperimentalAPI
-@KtorExperimentalLocationsAPI
-fun Route.opinionArticle(repo: OpinionArticleRepository) {
-    get<OpinionArticlePaths.CitizenOpinionArticleRequest> {
-        val opinions = repo.findCitizenOpinions(citizen, it.page, it.limit)
-        call.respond(opinions)
-    }
-
-    get<OpinionArticlePaths.CitizenOpinions> {
-        assertCan(VIEW, it.opinionsEntities)
-
-        call.respond(it.opinionsEntities)
-    }
-
-    put<OpinionArticlePaths.ArticleOpinion> {
-        call.receive<OpinionArticlePaths.ArticleOpinion.Body>().ids.let { choices ->
-            assertCan(CREATE, it.article)
-            repo.updateOpinions(choices, citizen, it.article)
-        }.let {
-            call.respond(HttpStatusCode.Created, it)
-        }
-    }
-}
diff --git a/src/main/kotlin/routes/OpinionChoice.kt b/src/main/kotlin/routes/OpinionChoice.kt
deleted file mode 100644
index b23d714..0000000
--- a/src/main/kotlin/routes/OpinionChoice.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.entity.OpinionChoice
-import fr.dcproject.security.voter.OpinionChoiceVoter.Action.VIEW
-import fr.ktorVoter.assertCan
-import io.ktor.application.call
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository
-
-@KtorExperimentalLocationsAPI
-object OpinionChoicePaths {
-    @Location("/opinions/{opinionChoice}")
-    class OpinionChoiceRequest(val opinionChoice: OpinionChoice)
-
-    @Location("/opinions")
-    class OpinionChoicesRequest(val targets: List<String> = emptyList())
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.opinionChoice(repo: OpinionChoiceRepository) {
-    get<OpinionChoicePaths.OpinionChoiceRequest> {
-        assertCan(VIEW, it.opinionChoice)
-
-        call.respond(it.opinionChoice)
-    }
-
-    get<OpinionChoicePaths.OpinionChoicesRequest> {
-        val opinions = repo.findOpinionsChoices(it.targets)
-        assertCan(VIEW, opinions)
-
-        call.respond(opinions)
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/routes/VoteArticle.kt b/src/main/kotlin/routes/VoteArticle.kt
deleted file mode 100644
index 8aa21a0..0000000
--- a/src/main/kotlin/routes/VoteArticle.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.Citizen
-import fr.dcproject.repository.CommentGeneric
-import fr.dcproject.repository.VoteComment
-import fr.dcproject.routes.VoteArticlePaths.ArticleVoteRequest
-import fr.dcproject.routes.VoteArticlePaths.CommentVoteRequest
-import fr.dcproject.security.voter.VoteVoter.Action.CREATE
-import fr.dcproject.security.voter.VoteVoter.Action.VIEW
-import fr.ktorVoter.assertCan
-import fr.dcproject.utils.toUUID
-import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.locations.put
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import java.util.*
-import fr.dcproject.entity.Article as ArticleEntity
-import fr.dcproject.entity.Vote as VoteEntity
-import fr.dcproject.repository.VoteArticle as VoteArticleRepository
-
-@KtorExperimentalLocationsAPI
-object VoteArticlePaths {
-    @Location("/articles/{article}/vote")
-    class ArticleVoteRequest(val article: ArticleEntity) {
-        data class Content(var note: Int)
-    }
-
-    @Location("/comments/{comment}/vote")
-    class CommentVoteRequest(val comment: UUID) {
-        data class Content(var note: Int)
-    }
-
-    @Location("/citizens/{citizen}/votes/articles")
-    class CitizenVoteArticleRequest(
-        val citizen: Citizen,
-        page: Int = 1,
-        limit: Int = 50,
-        val search: String? = null
-    ) : PaginatedRequestI by PaginatedRequest(page, limit)
-
-    @Location("/citizens/{citizen}/votes")
-    class CitizenVotesByIdsRequest(val citizen: Citizen, id: List<String>) {
-        val id: List<UUID> = id.toUUID()
-    }
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.voteArticle(repo: VoteArticleRepository, voteCommentRepo: VoteComment, commentRepo: CommentGeneric) {
-    put<ArticleVoteRequest> {
-        val content = call.receive<ArticleVoteRequest.Content>()
-        val vote = VoteEntity(
-            target = it.article,
-            note = content.note,
-            createdBy = this.citizen
-        )
-        assertCan(CREATE, vote)
-        val votes = repo.vote(vote)
-        call.respond(HttpStatusCode.Created, votes)
-    }
-
-    put<CommentVoteRequest> {
-        val comment = commentRepo.findById(it.comment)!!
-        val content = call.receive<CommentVoteRequest.Content>()
-        val vote = VoteEntity(
-            target = comment,
-            note = content.note,
-            createdBy = this.citizen
-        )
-        assertCan(CREATE, vote)
-        val votes = voteCommentRepo.vote(vote)
-        call.respond(HttpStatusCode.Created, votes)
-    }
-
-    get<VoteArticlePaths.CitizenVoteArticleRequest> {
-        val votes = repo.findByCitizen(it.citizen, it.page, it.limit)
-        assertCan(VIEW, votes.result)
-
-        call.respond(votes)
-    }
-
-    get<VoteArticlePaths.CitizenVotesByIdsRequest> {
-        val votes = repo.findCitizenVotesByTargets(it.citizen, it.id)
-        if (votes.isNotEmpty()) {
-            assertCan(VIEW, votes)
-        }
-        call.respond(votes)
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/routes/VoteConstitution.kt b/src/main/kotlin/routes/VoteConstitution.kt
deleted file mode 100644
index 240aa49..0000000
--- a/src/main/kotlin/routes/VoteConstitution.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.Citizen
-import fr.dcproject.routes.VoteConstitutionPaths.ConstitutionVoteRequest.Content
-import fr.dcproject.security.voter.VoteVoter.Action.CREATE
-import fr.ktorVoter.assertCan
-import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.put
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import fr.dcproject.entity.Constitution as ConstitutionEntity
-import fr.dcproject.entity.Vote as VoteEntity
-import fr.dcproject.repository.VoteConstitution as VoteConstitutionRepository
-
-@KtorExperimentalLocationsAPI
-object VoteConstitutionPaths {
-    @Location("/constitutions/{constitution}/vote")
-    class ConstitutionVoteRequest(val constitution: ConstitutionEntity) {
-        data class Content(var note: Int)
-    }
-
-    @Location("/citizens/{citizen}/votes/constitutions")
-    class CitizenVoteConstitutionRequest(val citizen: Citizen)
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.voteConstitution(repo: VoteConstitutionRepository) {
-    put<VoteConstitutionPaths.ConstitutionVoteRequest> {
-        val content = call.receive<Content>()
-        val vote = VoteEntity(
-            target = it.constitution,
-            note = content.note,
-            createdBy = this.citizen
-        )
-        assertCan(CREATE, vote)
-        repo.vote(vote)
-        call.respond(HttpStatusCode.Created)
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/routes/Workgroup.kt b/src/main/kotlin/routes/Workgroup.kt
deleted file mode 100644
index b198d88..0000000
--- a/src/main/kotlin/routes/Workgroup.kt
+++ /dev/null
@@ -1,185 +0,0 @@
-package fr.dcproject.routes
-
-import fr.dcproject.citizen
-import fr.dcproject.entity.CitizenRef
-import fr.dcproject.entity.WorkgroupSimple
-import fr.dcproject.entity.WorkgroupWithMembersI.Member
-import fr.dcproject.entity.WorkgroupWithMembersI.Member.Role
-import fr.dcproject.repository.Workgroup.Filter
-import fr.dcproject.security.voter.WorkgroupVoter.Action.CREATE
-import fr.dcproject.security.voter.WorkgroupVoter.Action.UPDATE
-import fr.dcproject.security.voter.WorkgroupVoter.Action.VIEW
-import fr.dcproject.utils.toUUID
-import fr.ktorVoter.assertCan
-import fr.postgresjson.repository.RepositoryI
-import io.ktor.application.ApplicationCall
-import io.ktor.application.call
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.*
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import java.util.*
-import fr.dcproject.entity.Workgroup as WorkgroupEntity
-import fr.dcproject.repository.Workgroup as WorkgroupRepository
-import fr.dcproject.security.voter.WorkgroupVoter.ActionMembers.ADD as ADD_MEMBERS
-import fr.dcproject.security.voter.WorkgroupVoter.ActionMembers.REMOVE as REMOVE_MEMBERS
-import fr.dcproject.security.voter.WorkgroupVoter.ActionMembers.UPDATE as UPDATE_MEMBERS
-
-@KtorExperimentalLocationsAPI
-object WorkgroupsPaths {
-    @Location("/workgroups")
-    class WorkgroupsRequest(
-        page: Int = 1,
-        limit: Int = 50,
-        val sort: String? = null,
-        val direction: RepositoryI.Direction? = null,
-        val search: String? = null,
-        val createdBy: String? = null,
-        members: List<String?>? = null
-    ) {
-        val page: Int = if (page < 1) 1 else page
-        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
-        val members: List<UUID>? = members?.toUUID()
-    }
-
-    @Location("/workgroups/{workgroup}")
-    class WorkgroupRequest(val workgroup: WorkgroupEntity)
-
-    @Location("/workgroups")
-    open class PostWorkgroupRequest {
-        class Body(
-            val id: UUID?,
-            val name: String,
-            val description: String,
-            val logo: String?,
-            val anonymous: Boolean?
-        )
-
-        suspend fun getNewWorkgroup(call: ApplicationCall): WorkgroupSimple<CitizenRef> = call.receive<Body>().run {
-            WorkgroupSimple(
-                id ?: UUID.randomUUID(),
-                name,
-                description,
-                logo,
-                anonymous ?: true,
-                call.citizen
-            )
-        }
-    }
-
-    @Location("/workgroups/{workgroup}")
-    class PutWorkgroupRequest(val workgroup: WorkgroupEntity) {
-        class Body(
-            val name: String?,
-            val description: String?,
-            val logo: String?,
-            val anonymous: Boolean?
-        )
-
-        suspend fun updateWorkgroup(call: ApplicationCall): Unit = call.receive<Body>().run {
-            name?.let { workgroup.name = it }
-            description?.let { workgroup.description = it }
-            logo?.let { workgroup.logo = it }
-            anonymous?.let { workgroup.anonymous = it }
-        }
-    }
-
-    @Location("/workgroups/{workgroup}")
-    class DeleteWorkgroupRequest(val workgroup: WorkgroupEntity)
-}
-
-@KtorExperimentalLocationsAPI
-object WorkgroupsMembersPaths {
-    @Location("/workgroups/{workgroup}/members")
-    class WorkgroupsMembersRequest(val workgroup: WorkgroupEntity) {
-        class Body : MutableList<Body.Item> by mutableListOf() {
-            class Item(val citizen: CitizenRef, roles: List<String> = emptyList()) {
-                val roles: List<Role> = roles.map {
-                    Role.valueOf(it)
-                }
-            }
-        }
-
-        suspend fun getMembers(call: ApplicationCall): List<Member<CitizenRef>> = call.receive<Body>().map {
-            Member(
-                citizen = it.citizen,
-                roles = it.roles
-            )
-        }
-    }
-}
-
-@KtorExperimentalLocationsAPI
-fun Route.workgroup(repo: WorkgroupRepository) {
-    get<WorkgroupsPaths.WorkgroupsRequest> {
-        val workgroups =
-            repo.find(it.page, it.limit, it.sort, it.direction, it.search, Filter(createdById = it.createdBy, members = it.members))
-        assertCan(VIEW, workgroups.result)
-        call.respond(workgroups)
-    }
-
-    get<WorkgroupsPaths.WorkgroupRequest> {
-        assertCan(VIEW, it.workgroup)
-
-        call.respond(it.workgroup)
-    }
-
-    post<WorkgroupsPaths.PostWorkgroupRequest> {
-        it.getNewWorkgroup(call)
-            .let { workgroup ->
-                assertCan(CREATE, workgroup)
-                repo.upsert(workgroup)
-            }.let {
-                call.respond(HttpStatusCode.Created, it)
-            }
-    }
-
-    put<WorkgroupsPaths.PutWorkgroupRequest> {
-        it.updateWorkgroup(call).let { workgroup ->
-            assertCan(UPDATE, workgroup)
-            repo.upsert(workgroup as WorkgroupSimple<CitizenRef>)
-        }.let {
-            call.respond(HttpStatusCode.OK, it)
-        }
-    }
-
-    delete<WorkgroupsPaths.DeleteWorkgroupRequest> {
-        assertCan(UPDATE, it.workgroup)
-        repo.delete(it.workgroup)
-        call.respond(HttpStatusCode.NoContent, it)
-    }
-
-    /* Add members to workgroup */
-    post<WorkgroupsMembersPaths.WorkgroupsMembersRequest> {
-        it.getMembers(call)
-            .let { members ->
-                assertCan(ADD_MEMBERS, it.workgroup)
-                repo.addMembers(it.workgroup, members)
-            }.let { members ->
-                call.respond(HttpStatusCode.Created, members)
-            }
-    }
-
-    /* Delete members of workgroup */
-    delete<WorkgroupsMembersPaths.WorkgroupsMembersRequest> {
-        it.getMembers(call)
-            .let { members ->
-                assertCan(REMOVE_MEMBERS, it.workgroup)
-                repo.removeMembers(it.workgroup, members)
-            }.let { members ->
-                call.respond(HttpStatusCode.OK, members)
-            }
-    }
-
-    /* Update members of workgroup */
-    put<WorkgroupsMembersPaths.WorkgroupsMembersRequest> {
-        it.getMembers(call)
-            .let { members ->
-                assertCan(UPDATE_MEMBERS, it.workgroup)
-                repo.updateMembers(it.workgroup, members)
-            }.let { members ->
-                call.respond(HttpStatusCode.OK, members)
-            }
-    }
-}
diff --git a/src/main/kotlin/utils/DateTime.kt b/src/main/kotlin/utils/DateTime.kt
deleted file mode 100644
index b720614..0000000
--- a/src/main/kotlin/utils/DateTime.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package fr.dcproject.utils
-
-import org.joda.time.DateTime
-import org.joda.time.format.ISODateTimeFormat
-
-fun DateTime.toIso() = ISODateTimeFormat.dateTime().print(this)
\ No newline at end of file
diff --git a/src/main/kotlin/utils/Resources.kt b/src/main/kotlin/utils/Resources.kt
deleted file mode 100644
index fda23ea..0000000
--- a/src/main/kotlin/utils/Resources.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package fr.dcproject.utils
-
-fun String.readResource(callbak: (String) -> Unit = {}): String {
-    val content = callbak::class.java.getResource(this).readText()
-    callbak(content)
-    return content
-}
\ No newline at end of file
diff --git a/src/main/kotlin/views/ViewManager.kt b/src/main/kotlin/views/ViewManager.kt
deleted file mode 100644
index 95a0887..0000000
--- a/src/main/kotlin/views/ViewManager.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package fr.dcproject.views
-
-import fr.dcproject.entity.CitizenRef
-import fr.dcproject.entity.ViewAggregation
-import org.elasticsearch.client.Response
-import org.joda.time.DateTime
-
-interface ViewManager <T> {
-    fun addView(ip: String, entity: T, citizen: CitizenRef? = null, dateTime: DateTime = DateTime.now()): Response?
-    fun getViewsCount(entity: T): ViewAggregation
-}
\ No newline at end of file
diff --git a/src/main/kotlin/voter/ArticleVoter.kt b/src/main/kotlin/voter/ArticleVoter.kt
deleted file mode 100644
index eae16bd..0000000
--- a/src/main/kotlin/voter/ArticleVoter.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.ArticleAuthI
-import fr.dcproject.entity.ArticleI
-import fr.dcproject.entity.UserI
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import fr.ktorVoter.checkClass
-import io.ktor.application.ApplicationCall
-import fr.dcproject.entity.Comment as CommentEntity
-import fr.dcproject.entity.Vote as VoteEntity
-
-class ArticleVoter : Voter {
-    enum class Action : ActionI {
-        CREATE,
-        UPDATE,
-        VIEW,
-        DELETE
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return (action is Action || action is CommentVoter.Action || action is VoteVoter.Action)
-            .and(subject is ArticleI? || subject is VoteEntity<*> || subject is CommentEntity<*>)
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        val user = call.user
-        if (action == Action.CREATE && user is UserI) return Vote.GRANTED
-        if (action == Action.VIEW) return view(subject, user)
-        if (action == Action.DELETE) return delete(subject, user)
-        if (action == Action.UPDATE) return update(subject, user)
-        if (action is CommentVoter.Action) return voteForComment(action, subject)
-        if (action is VoteVoter.Action) return voteForVote(action, subject)
-        if (action is Action) return Vote.DENIED
-
-        return Vote.ABSTAIN
-    }
-
-    private fun view(subject: Any?, user: UserI?): Vote {
-        checkClass(ArticleAuthI::class, subject)
-        if (subject is ArticleAuthI<*>) {
-            return if (subject.isDeleted()) Vote.DENIED
-            else if (subject.draft && (user == null || subject.createdBy.user.id != user.id)) Vote.DENIED
-            else Vote.GRANTED
-        }
-        return Vote.DENIED
-    }
-
-    private fun delete(subject: Any?, user: UserI?): Vote {
-        checkClass(ArticleAuthI::class, subject)
-        if (subject is ArticleAuthI<*>) {
-            if (user is UserI && subject.createdBy.user.id == user.id) {
-                return Vote.GRANTED
-            }
-        }
-        return Vote.DENIED
-    }
-
-    private fun update(subject: Any?, user: UserI?): Vote {
-        checkClass(ArticleAuthI::class, subject)
-        if (subject is ArticleAuthI<*>) {
-            if (user is UserI && subject.createdBy.user.id == user.id) {
-                return Vote.GRANTED
-            }
-        }
-        return Vote.DENIED
-    }
-
-    private fun voteForVote(action: VoteVoter.Action, subject: Any?): Vote {
-        if (action == VoteVoter.Action.CREATE && subject is VoteEntity<*>) {
-            val target = subject.target
-            if (target is ArticleAuthI<*>) {
-                if (target.isDeleted()) {
-                    return Vote.DENIED
-                }
-            } else if (target is ArticleI) {
-                return Vote.DENIED
-            }
-        }
-        return Vote.ABSTAIN
-    }
-
-    private fun voteForComment(action: CommentVoter.Action, subject: Any?): Vote {
-        if (subject is CommentEntity<*>) {
-            val target = subject.target
-            if (target is ArticleAuthI<*>) {
-                if (target.isDeleted()) {
-                    return Vote.DENIED
-                }
-            } else if (target is ArticleI) {
-                return Vote.DENIED
-            }
-            if (action == CommentVoter.Action.CREATE) {
-                return Vote.GRANTED
-            }
-
-            if (action == CommentVoter.Action.VIEW) {
-                return Vote.GRANTED
-            }
-        } else {
-            return Vote.DENIED
-        }
-
-        return Vote.ABSTAIN
-    }
-}
diff --git a/src/main/kotlin/voter/CitizenVoter.kt b/src/main/kotlin/voter/CitizenVoter.kt
deleted file mode 100644
index 9e2c8c2..0000000
--- a/src/main/kotlin/voter/CitizenVoter.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.CitizenBasicI
-import fr.dcproject.entity.UserI
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import io.ktor.application.ApplicationCall
-import io.ktor.locations.KtorExperimentalLocationsAPI
-
-@KtorExperimentalLocationsAPI
-class CitizenVoter : Voter {
-    enum class Action : ActionI {
-        CREATE,
-        UPDATE,
-        VIEW,
-        DELETE,
-        CHANGE_PASSWORD
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return (action is Action)
-            .and(subject is CitizenBasicI?)
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        val user = call.user
-        if (action == Action.CREATE && user != null) {
-            return Vote.GRANTED
-        }
-
-        if (action == Action.VIEW) {
-            if (user == null) return Vote.DENIED
-            if (subject is CitizenBasicI) {
-                return if (subject.isDeleted()) Vote.DENIED
-                else Vote.GRANTED
-            }
-            return Vote.DENIED
-        }
-
-        if (action == Action.DELETE) {
-            return Vote.DENIED
-        }
-
-        if (action == Action.UPDATE &&
-            user is UserI &&
-            subject is CitizenBasicI &&
-            subject.user.id == user.id
-        ) {
-            return Vote.GRANTED
-        }
-
-        if (action == Action.CHANGE_PASSWORD && user != null && subject is CitizenBasicI) {
-            val userToChange = subject.user
-            return if (user.id == userToChange.id) {
-                Vote.GRANTED
-            } else {
-                Vote.ABSTAIN
-            }
-        }
-
-        if (action is Action) {
-            return Vote.DENIED
-        }
-
-        return Vote.ABSTAIN
-    }
-}
diff --git a/src/main/kotlin/voter/CommentVoter.kt b/src/main/kotlin/voter/CommentVoter.kt
deleted file mode 100644
index 8f8bc41..0000000
--- a/src/main/kotlin/voter/CommentVoter.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.Comment
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import io.ktor.application.ApplicationCall
-
-class CommentVoter : Voter {
-    enum class Action : ActionI {
-        CREATE,
-        UPDATE,
-        VIEW,
-        DELETE
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return (action is Action)
-            .and(subject is Comment<*>?)
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        val user = call.user
-
-        if (subject !is Comment<*>) {
-            return Vote.DENIED
-        }
-
-        if (action == Action.CREATE) {
-            if (user == null) {
-                return Vote.DENIED
-            }
-            if (subject.createdBy.user.id != user.id) {
-                return Vote.DENIED
-            }
-            return Vote.GRANTED
-        }
-
-        if (action == Action.VIEW) {
-            return if (subject.isDeleted()) Vote.DENIED
-            else Vote.GRANTED
-        }
-
-        if (action == Action.UPDATE && user != null && user.id == subject.createdBy.user.id) {
-            return Vote.GRANTED
-        }
-
-        if (action == Action.DELETE) {
-            return Vote.DENIED
-        }
-
-        if (action is Action) {
-            return Vote.DENIED
-        }
-
-        return Vote.ABSTAIN
-    }
-}
diff --git a/src/main/kotlin/voter/ConstitutionVoter.kt b/src/main/kotlin/voter/ConstitutionVoter.kt
deleted file mode 100644
index 2bbcbe9..0000000
--- a/src/main/kotlin/voter/ConstitutionVoter.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.Comment
-import fr.dcproject.entity.ConstitutionSimple
-import fr.dcproject.entity.UserI
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import io.ktor.application.ApplicationCall
-import fr.dcproject.entity.Vote as VoteEntity
-
-class ConstitutionVoter : Voter {
-    enum class Action : ActionI {
-        CREATE,
-        UPDATE,
-        VIEW,
-        DELETE
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return (action is Action || action is CommentVoter.Action || action is VoteVoter.Action)
-            .and(subject is ConstitutionSimple<*, *>? || subject is VoteEntity<*> || subject is Comment<*>)
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        val user = call.user
-        if (action == Action.CREATE && user != null) {
-            return Vote.GRANTED
-        }
-
-        if (action == Action.VIEW) {
-            if (subject is ConstitutionSimple<*, *>) {
-                return if (subject.isDeleted()) Vote.DENIED
-                else Vote.GRANTED
-            }
-            return Vote.DENIED
-        }
-
-        if (action == Action.DELETE && user is UserI && subject is ConstitutionSimple<*, *> && subject.createdBy.user.id == user.id) {
-            return Vote.GRANTED
-        }
-
-        if (action == Action.UPDATE && user is UserI && subject is ConstitutionSimple<*, *> && subject.createdBy.user.id == user.id) {
-            return Vote.GRANTED
-        }
-
-        if (action is CommentVoter.Action) return voteForComment(action)
-        if (action is VoteVoter.Action) return voteForVote(action, subject)
-
-        if (action is Action) {
-            return Vote.DENIED
-        }
-
-        return Vote.ABSTAIN
-    }
-
-    private fun voteForVote(action: VoteVoter.Action, subject: Any?): Vote {
-        if (action == VoteVoter.Action.CREATE && subject is VoteEntity<*>) {
-            val target = subject.target
-            if (target !is ConstitutionSimple<*, *>) {
-                return Vote.ABSTAIN
-            }
-            if (target.isDeleted()) {
-                return Vote.DENIED
-            }
-        }
-        return Vote.ABSTAIN
-    }
-
-    private fun voteForComment(action: CommentVoter.Action): Vote {
-        if (action == CommentVoter.Action.CREATE) {
-            return Vote.GRANTED
-        }
-
-        if (action == CommentVoter.Action.VIEW) {
-            return Vote.GRANTED
-        }
-
-        return Vote.ABSTAIN
-    }
-}
diff --git a/src/main/kotlin/voter/FollowVoter.kt b/src/main/kotlin/voter/FollowVoter.kt
deleted file mode 100644
index 312c2cc..0000000
--- a/src/main/kotlin/voter/FollowVoter.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import io.ktor.application.ApplicationCall
-import fr.dcproject.entity.Follow as FollowEntity
-import fr.dcproject.entity.User as UserEntity
-
-class FollowVoter : Voter {
-    enum class Action : ActionI {
-        CREATE,
-        DELETE,
-        VIEW
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return (action is Action)
-            .and(subject is FollowEntity<*>?)
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        val user = call.user
-        if (action == Action.CREATE) {
-            return if (user != null) Vote.GRANTED
-            else Vote.DENIED
-        }
-
-        if (action == Action.DELETE) {
-            return if (user != null) Vote.GRANTED
-            else Vote.DENIED
-        }
-
-        if (action == Action.VIEW) {
-            if (subject is FollowEntity<*>) {
-                return voteView(user, subject)
-            }
-            return Vote.DENIED
-        }
-
-        return Vote.ABSTAIN
-    }
-
-    private fun voteView(user: UserEntity?, subject: FollowEntity<*>): Vote {
-        return if ((user != null && subject.createdBy.user.id == user.id) || !subject.createdBy.followAnonymous) Vote.GRANTED
-        else Vote.DENIED
-    }
-}
diff --git a/src/main/kotlin/voter/OpinionChoiceVoter.kt b/src/main/kotlin/voter/OpinionChoiceVoter.kt
deleted file mode 100644
index 280e8d6..0000000
--- a/src/main/kotlin/voter/OpinionChoiceVoter.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.OpinionChoice
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import io.ktor.application.ApplicationCall
-
-class OpinionChoiceVoter : Voter {
-    enum class Action : ActionI {
-        VIEW
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return (action is Action)
-            .and(subject is OpinionChoice?)
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        if (action == Action.VIEW) {
-            if (subject is OpinionChoice) {
-                return Vote.GRANTED
-            }
-            return Vote.DENIED
-        }
-
-        return Vote.ABSTAIN
-    }
-}
diff --git a/src/main/kotlin/voter/OpinionVoter.kt b/src/main/kotlin/voter/OpinionVoter.kt
deleted file mode 100644
index 571b165..0000000
--- a/src/main/kotlin/voter/OpinionVoter.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.ArticleAuthI
-import fr.dcproject.entity.Opinion
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import io.ktor.application.ApplicationCall
-
-class OpinionVoter : Voter {
-    enum class Action : ActionI {
-        CREATE,
-        VIEW,
-        DELETE
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return (action is Action)
-            .and(subject is Opinion<*>? || subject is ArticleAuthI<*>)
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        val user = call.user
-        if (action == Action.CREATE) {
-            return if (user != null && (
-                (subject is ArticleAuthI<*> && !subject.isDeleted()) ||
-                (subject is Opinion<*> && subject.createdBy.user.id == user.id)
-            )) Vote.GRANTED
-            else Vote.DENIED
-        }
-
-        if (action == Action.VIEW) {
-            if (subject is Opinion<*>) {
-                return Vote.GRANTED
-            }
-            return Vote.DENIED
-        }
-
-        if (action == Action.DELETE) {
-            return if (subject is Opinion<*> &&
-                user != null &&
-                subject.createdBy.user.id == user.id
-            )
-                Vote.GRANTED
-            else Vote.DENIED
-        }
-
-        return Vote.ABSTAIN
-    }
-}
diff --git a/src/main/kotlin/voter/VoteVoter.kt b/src/main/kotlin/voter/VoteVoter.kt
deleted file mode 100644
index bd1e7f2..0000000
--- a/src/main/kotlin/voter/VoteVoter.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import io.ktor.application.ApplicationCall
-import fr.dcproject.entity.Vote as VoteEntity
-
-class VoteVoter : Voter {
-    enum class Action : ActionI {
-        CREATE,
-        VIEW
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return action is Action && subject is VoteEntity<*>?
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        val user = call.user
-        if (action == Action.CREATE && user != null) {
-            return Vote.GRANTED
-        }
-
-        if (action == Action.VIEW && user != null) {
-            if (subject is VoteEntity<*>) {
-                return if (subject.createdBy.user.id != user.id) {
-                    Vote.DENIED
-                } else {
-                    Vote.GRANTED
-                }
-            }
-            return Vote.DENIED
-        }
-
-        return Vote.ABSTAIN
-    }
-}
diff --git a/src/main/kotlin/voter/WorkgroupVoter.kt b/src/main/kotlin/voter/WorkgroupVoter.kt
deleted file mode 100644
index 5192c77..0000000
--- a/src/main/kotlin/voter/WorkgroupVoter.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.*
-import fr.dcproject.entity.WorkgroupWithMembersI.Member.Role
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.Vote
-import fr.ktorVoter.Voter
-import fr.ktorVoter.VoterException
-import io.ktor.application.ApplicationCall
-
-class WorkgroupVoter : Voter {
-    enum class Action : ActionI {
-        CREATE,
-        UPDATE,
-        VIEW,
-        DELETE,
-    }
-
-    enum class ActionMembers : ActionI {
-        ADD,
-        UPDATE,
-        VIEW,
-        REMOVE,
-    }
-
-    override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
-        return (action is Action || action is ActionMembers)
-            .and(subject is WorkgroupI?)
-    }
-
-    override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
-        val user = call.user
-        if (subject is WorkgroupI && action == Action.CREATE && user is UserI) {
-            return Vote.GRANTED
-        }
-
-        if (action == Action.VIEW) {
-            if (subject is WorkgroupWithAuthI<*>) {
-                return if (subject.isDeleted()) Vote.DENIED
-                else if (!subject.anonymous) Vote.GRANTED
-                else if (subject.anonymous && user != null && subject.isMember(user)) Vote.GRANTED
-                else Vote.DENIED
-            }
-            return Vote.DENIED
-        }
-
-        if (subject is WorkgroupWithAuthI<*>) {
-            if (action == Action.DELETE && user is UserI && subject.hasRole(Role.MASTER, user)) {
-                return Vote.GRANTED
-            }
-
-            if (action == Action.UPDATE && user is UserI && subject.hasRole(Role.MASTER, user)) {
-                return Vote.GRANTED
-            }
-
-            return Vote.DENIED
-        } else if (subject !is WorkgroupWithAuthI<*> && (action == Action.DELETE || action == Action.UPDATE)) {
-            throw object :
-                VoterException("Unable to define if your are granted, the subject must implement 'WorkgroupWithAuthI'") {}
-        }
-
-        if (action == ActionMembers.ADD) {
-            // TODO create ROLES
-            return Vote.isGranted {
-                user is UserI &&
-                subject is WorkgroupWithAuthI<*> &&
-                subject.hasRole(Role.MASTER, user)
-            }
-        }
-
-        if (action == ActionMembers.UPDATE) {
-            // TODO create ROLES
-            return Vote.isGranted {
-                user is UserI &&
-                subject is WorkgroupWithAuthI<*> &&
-                subject.hasRole(Role.MASTER, user)
-            }
-        }
-
-        if (action == ActionMembers.REMOVE) {
-            // TODO create ROLES
-            return Vote.isGranted {
-                user is UserI &&
-                subject is WorkgroupWithAuthI<*> &&
-                subject.hasRole(Role.MASTER, user)
-            }
-        }
-
-        return Vote.ABSTAIN
-    }
-}
diff --git a/src/main/resources/openapi.yaml b/src/main/resources/openapi.yaml
index d213cc9..9e7d336 100644
--- a/src/main/resources/openapi.yaml
+++ b/src/main/resources/openapi.yaml
@@ -1,4 +1,4 @@
-openapi: 3.0.1
+openapi: 3.0.0
 info:
   version: '0.1'
   title: 'DC Project'
@@ -37,12 +37,16 @@ paths:
             text/plain:
               example:
                 eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJBdXRoZW50aWNhdGlvbiIsImlzcyI6ImRjLXByb2plY3QuZnIiLCJpZCI6ImQ1NDRhNmE4LWJhYjgtNDU2MC05NWIxLThhZjAyMDNkOTEwNCIsImV4cCI6MTU2NzA3Mzc0Mn0.0VTetv8fZFjVgpJ-bwJpidGNHJUOmgj8vuZcZXzwnLa7TtFwcXWvh3bDPYHqB66nmOfXyM57XnHDbmRwtipCag
-  /sso:
+  /auth/passwordless:
     post:
-      summary: Send email with JWT
+      summary: Send a connexion link by email
+      description: Send a connexion link by email with the token required to the connexion
+      externalDocs:
+        description: Explanation of Passwordless auth
+        url: https://en.wikipedia.org/wiki/Passwordless_authentication
       tags:
         - authentification
-      operationId: sso
+      operationId: passwordless
       requestBody:
         content:
           application/json:
@@ -58,7 +62,7 @@ paths:
                   type: string
                   description: url tu redirect with the token
                   example:
-                    http://dc-project.fr/sso
+                    http://dc-project.fr/auth/passwordless
 
       responses:
         204:
@@ -153,17 +157,18 @@ paths:
         content:
           application/json:
             schema:
+              required:
+                - old_password
+                - new_password
               properties:
                 old_password:
                   type: string
                   format: password
-                  required: true
                   example:
                     azerty
                 new_password:
                   type: string
                   format: password
-                  required: true
                   example:
                     qwerty
       responses:
@@ -239,7 +244,37 @@ paths:
                       result:
                         type: array
                         items:
-                          $ref: '#/components/schemas/ArticleResponse'
+                          properties:
+                            id:
+                              type: string
+                              format: uuid
+                            title:
+                              type: string
+                            created_by:
+                              type: object
+                              properties:
+                                id:
+                                  type: string
+                                  format: uuid
+                                name:
+                                  type: object
+                                  properties:
+                                    first_name:
+                                      type: string
+                                    last_name:
+                                      type: string
+                                email:
+                                  type: string
+                            workgroup:
+                              type: object
+                              properties:
+                                id:
+                                  type: string
+                                  format: uuid
+                                name:
+                                  type: string
+                            draft:
+                              type: boolean
     post:
       security:
         - JWTAuth: []
@@ -728,6 +763,8 @@ paths:
     parameters:
       - $ref: '#/components/parameters/opinion'
     get:
+      security:
+        - {}
       summary: Get one opinion Choices
       tags:
         - opinion
@@ -889,6 +926,8 @@ paths:
         content:
           application/json:
             schema:
+              required:
+                - name
               properties:
                 id:
                   type: string
@@ -897,7 +936,6 @@ paths:
                 name:
                   type: string
                   example: Les partisants du RIC
-                  required: true
                 description:
                   type: string
                   example: Group formé pour la conception d'un RIC
@@ -966,11 +1004,12 @@ paths:
         content:
           application/json:
             schema:
+              required:
+                - name
               properties:
                 name:
                   type: string
                   example: Les partisants du RIC
-                  required: true
                 description:
                   type: string
                   example: Group formé pour la conception d'un RIC
@@ -1280,7 +1319,6 @@ components:
       properties:
         last_version:
           type: boolean
-          required: false
           default: false
 
     Paginated:
@@ -1311,10 +1349,11 @@ components:
           example: 1
 
     UserBase:
+      required:
+        - username
       properties:
         username:
           type: string
-          required: true
           example:
             john-doe
     UserResponse:
@@ -1325,10 +1364,11 @@ components:
       allOf:
         - $ref: '#/components/schemas/UserBase'
         - type: object
+          required:
+            - password
           properties:
-            plain_password:
+            password:
               type: string
-              required: true
               example:
                 azerty
               format: password
@@ -1342,22 +1382,21 @@ components:
           properties:
             user:
               $ref: '#/components/schemas/UserResponse'
-            workgroups:
-              $ref: '#/components/schemas/WorkgroupSimple'
     CitizenBase:
       type: object
+      required:
+        - first_name
+        - last_name
       properties:
         name:
           type: object
           properties:
             first_name:
               type: string
-              required: true
               example:
                 john
             last_name:
               type: string
-              required: true
               example:
                 Doe
         birthday:
@@ -1375,24 +1414,23 @@ components:
           properties:
             user:
               $ref: '#/components/schemas/UserRequest'
-            workgroups:
-              $ref: '#/components/schemas/UuidEntity'
 
     RegisterRequest:
       $ref: '#/components/schemas/CitizenRequest'
 
     LoginRequest:
+      required:
+        - name
+        - password
       properties:
         name:
           type: string
           description: username
-          required: true
           example:
             john-doe
         password:
           type: string
           description: Pasword
-          required: true
           example:
             azerty
 
@@ -1400,41 +1438,41 @@ components:
       type: object
       allOf:
         - type: object
+          required:
+            - title
+            - content
+            - description
+            - tags
+            - anonymous
+            - draft
           properties:
             title:
               type: string
-              required: true
               example:
                 Limit power of press
             content:
               type: string
-              required: true
               example:
                 Lorem upsum...
             description:
               type: string
-              required: true
               example:
                 I think is the bether choice
             tags:
               type: array
               items:
                 type: string
-              required: false
               default: []
               example: [power, press]
-            annonymous:
+            anonymous:
               type: boolean
-              required: false
               default: true
             draft:
               type: boolean
-              required: false
               default: false
             workgroup:
               allOf:
                 - $ref: '#/components/schemas/UuidEntity'
-                - required: false
                 - default: null
         - $ref: '#/components/schemas/versionId'
     ArticleResponse:
@@ -1455,25 +1493,23 @@ components:
       type: object
       allOf:
         - type: object
+          required:
+            - title
           properties:
             title:
               type: string
-              required: true
               example:
                 Constitution for the liberty
             titles:
               type: array
-              required: false
               default: []
               items:
                 $ref: '#/components/schemas/TitleBase'
-            annonymous:
+            anonymous:
               type: boolean
-              required: false
               default: true
             draft:
               type: boolean
-              required: false
               default: false
         - $ref: '#/components/schemas/versionId'
     ConstitutionResponse:
@@ -1501,10 +1537,11 @@ components:
 
     TitleBase:
       type: object
+      required:
+        - name
       properties:
         name:
           type: string
-          required: true
           example:
             The liberties
         rank:
@@ -1552,10 +1589,11 @@ components:
       type: object
       allOf:
         - type: object
+          required:
+            - content
           properties:
             content:
               type: string
-              required: true
               example:
                 Lorem ipsum...
     CommentRequest:
@@ -1569,14 +1607,15 @@ components:
         - $ref: '#/components/schemas/Extra'
         - $ref: '#/components/schemas/Votable'
         - type: object
+          required:
+            - parent_ids
+            - parent
           properties:
             parents_ids:
               type: array
-              required: false
               items:
                 $ref: '#/components/schemas/UUID'
             parent:
-              required: false
               allOf:
                 - $ref: '#/components/schemas/UUID'
 
@@ -1591,12 +1630,13 @@ components:
     VoteBase:
       allOf:
         - type: object
+          required:
+            - note
           properties:
             note:
               type: integer
               minimum: -1
               maximum: 1
-              required: true
     VoteRequest:
       allOf:
         - $ref: '#/components/schemas/VoteBase'
@@ -1658,6 +1698,8 @@ components:
       description: Opinion Choice
       allOf:
         - type: object
+          required:
+            - name
           properties:
             id:
               type: string
@@ -1667,7 +1709,6 @@ components:
               example: opinion1
             target:
               type: array
-              required: false
               nullable: true
               items:
                 type: string
@@ -1689,12 +1730,12 @@ components:
             target:
               type: object
               properties:
-                  id:
-                    type: string
-                    format: uuid
-                  reference:
-                    type: string
-                    example: article
+                id:
+                  type: string
+                  format: uuid
+                reference:
+                  type: string
+                  example: article
             choice:
               type: object
               allOf:
diff --git a/src/main/resources/openapi2.yaml b/src/main/resources/openapi2.yaml
new file mode 100644
index 0000000..e016f54
--- /dev/null
+++ b/src/main/resources/openapi2.yaml
@@ -0,0 +1,2217 @@
+openapi: 3.0.2
+info:
+  version: ''
+  title: 'DC Project'
+  description: 'A free community program for create constitution'
+
+paths:
+  /articles:
+    get:
+      summary: Get all articles
+      tags:
+        - article
+      operationId: getArticles
+      parameters:
+        - $ref: '#/components/parameters/page'
+        - $ref: '#/components/parameters/limit'
+        - $ref: '#/components/parameters/articleSort'
+        - $ref: '#/components/parameters/direction'
+        - $ref: '#/components/parameters/search'
+        - $ref: '#/components/parameters/createdBy'
+        - name: workgroup
+          in: query
+          description: ID of workgroup
+          example: 82a0e60a-bb55-dbc0-1c3d-0a804df2b5df
+          required: false
+          schema:
+            type: string
+            format: uuid
+      responses:
+        200:
+          description: The Article objects
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        maxItems: 50
+                        items:
+                          $ref: '#/components/schemas/ArticleListingResponse'
+    post:
+      security:
+        - JWTAuth: []
+      summary: Create new Article
+      tags:
+        - article
+      operationId: insertArticle
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              required:
+                - title
+                - content
+                - description
+                - tags
+              properties:
+                title:
+                  type: string
+                  example:
+                    Limit power of press
+                content:
+                  type: string
+                  example:
+                    Lorem upsum...
+                description:
+                  type: string
+                  example:
+                    I think is the bether choice
+                tags:
+                  type: array
+                  items:
+                    type: string
+                  default: [ ]
+                  example: [ power, press ]
+                anonymous:
+                  type: boolean
+                  default: true
+                draft:
+                  type: boolean
+                  default: false
+                workgroup:
+                  default: null
+                  additionalProperties: false
+                  required:
+                    - id
+                  properties:
+                    id:
+                      $ref: "#/components/schemas/UUID"
+      responses:
+        200:
+          description: Article created
+          content:
+            application/json:
+              schema:
+                properties:
+                  id:
+                    type: string
+                    format: uuid
+                  versionId:
+                    type: string
+                    format: uuid
+                  versionNumber:
+                    type: integer
+        401:
+          $ref: '#/components/responses/401'
+  /articles/{article}:
+    parameters:
+      - $ref: '#/components/parameters/article'
+    get:
+      security:
+        - JWTAuth: []
+      summary: Get one article
+      tags:
+        - article
+      operationId: getArticle
+      responses:
+        200:
+          description: The Article objects
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ArticleResponse'
+  /articles/{article}/versions:
+    parameters:
+      - $ref: '#/components/parameters/article'
+    get:
+      summary: Get all versions of articles
+      tags:
+        - article
+      operationId: getArticleVersions
+      responses:
+        200:
+          description: The versions of Article
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          additionalProperties: false
+                          properties:
+                            id:
+                              type: string
+                              format: uuid
+                            title:
+                              type: string
+                            draft:
+                              type: boolean
+                            lastVersion:
+                              type: boolean
+                            createdBy:
+                              type: object
+                              additionalProperties: false
+                              properties:
+                                id:
+                                  type: string
+                                  format: uuid
+                                name:
+                                  type: object
+                                  properties:
+                                    firstName:
+                                      type: string
+                                    lastName:
+                                      type: string
+                                email:
+                                  type: string
+                            workgroup:
+                              type: object
+                              nullable: true
+                              additionalProperties: false
+                              properties:
+                                id:
+                                  type: string
+                                  format: uuid
+                                name:
+                                  type: string
+
+  /login:
+    post:
+      summary: sign in
+      tags:
+        - authentification
+      operationId: login
+      requestBody:
+        description: Login
+        required: true
+        content:
+          application/json:
+            schema:
+              required:
+                - username
+                - password
+              properties:
+                username:
+                  type: string
+                  description: username
+                  example:
+                    john-doe
+                password:
+                  type: string
+                  description: Pasword
+                  example:
+                    azerty
+      responses:
+        200:
+          description: return JWT
+          content:
+            text/plain:
+              schema:
+                type: string
+                format: byte
+                example:
+                  'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJBdXRoZW50aWNhdGlvbiIsImlzcyI6ImRjLXByb2plY3QuZnIiLCJpZCI6ImQ1NDRhNmE4LWJhYjgtNDU2MC05NWIxLThhZjAyMDNkOTEwNCIsImV4cCI6MTU2NzA3Mzc0Mn0.0VTetv8fZFjVgpJ-bwJpidGNHJUOmgj8vuZcZXzwnLa7TtFwcXWvh3bDPYHqB66nmOfXyM57XnHDbmRwtipCag'
+            application/json:
+              schema:
+                properties:
+                  token:
+                    type: string
+                    example:
+                      'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJBdXRoZW50aWNhdGlvbiIsImlzcyI6ImRjLXByb2plY3QuZnIiLCJpZCI6ImQ1NDRhNmE4LWJhYjgtNDU2MC05NWIxLThhZjAyMDNkOTEwNCIsImV4cCI6MTU2NzA3Mzc0Mn0.0VTetv8fZFjVgpJ-bwJpidGNHJUOmgj8vuZcZXzwnLa7TtFwcXWvh3bDPYHqB66nmOfXyM57XnHDbmRwtipCag'
+  /register:
+    post:
+      summary: Create account
+      tags:
+        - authentification
+      operationId: register
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - name
+                - birthday
+                - email
+                - user
+              properties:
+                name:
+                  type: object
+                  required:
+                    - firstName
+                    - lastName
+                  properties:
+                    firstName:
+                      type: string
+                      example:
+                        john
+                    lastName:
+                      type: string
+                      example:
+                        Doe
+                birthday:
+                  type: string
+                  format: 'date'
+                  example: '1984-12-25'
+                email:
+                  type: string
+                  format: email
+                  example: my.email@dc-project.fr
+                user:
+                  type: object
+                  required:
+                    - username
+                    - password
+                  properties:
+                    username:
+                      type: string
+                      example:
+                        john-doe
+                    password:
+                      type: string
+                      example:
+                        azerty
+                      format: password
+      responses:
+        200:
+          description: User created and JWT returned
+          content:
+            text/plain:
+              example:
+                'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJBdXRoZW50aWNhdGlvbiIsImlzcyI6ImRjLXByb2plY3QuZnIiLCJpZCI6ImQ1NDRhNmE4LWJhYjgtNDU2MC05NWIxLThhZjAyMDNkOTEwNCIsImV4cCI6MTU2NzA3Mzc0Mn0.0VTetv8fZFjVgpJ-bwJpidGNHJUOmgj8vuZcZXzwnLa7TtFwcXWvh3bDPYHqB66nmOfXyM57XnHDbmRwtipCag'
+            application/json:
+              schema:
+                properties:
+                  token:
+                    type: string
+                    example:
+                      'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJBdXRoZW50aWNhdGlvbiIsImlzcyI6ImRjLXByb2plY3QuZnIiLCJpZCI6ImQ1NDRhNmE4LWJhYjgtNDU2MC05NWIxLThhZjAyMDNkOTEwNCIsImV4cCI6MTU2NzA3Mzc0Mn0.0VTetv8fZFjVgpJ-bwJpidGNHJUOmgj8vuZcZXzwnLa7TtFwcXWvh3bDPYHqB66nmOfXyM57XnHDbmRwtipCag'
+        400:
+          description: Bad request
+          content:
+            application/json:
+              schema:
+                description: sdf
+  /auth/passwordless:
+    post:
+      summary: Send a connexion link by email
+      description: Send a connexion link by email with the token required to the connexion
+      externalDocs:
+        description: Explanation of Passwordless auth
+        url: https://en.wikipedia.org/wiki/Passwordless_authentication
+      tags:
+        - authentification
+      operationId: passwordless
+      requestBody:
+        content:
+          application/json:
+            schema:
+              properties:
+                email:
+                  type: string
+                  format: email
+                  description: email to send the token
+                  example:
+                    my.email@dc-project.fr
+                url:
+                  type: string
+                  description: url tu redirect with the token
+                  example:
+                    http://dc-project.fr/auth/passwordless
+      responses:
+        204:
+          description: email send
+        404:
+          description: no user with this email
+
+  /citizens:
+    get:
+      security:
+        - JWTAuth: []
+      summary: Get all citizens
+      tags:
+        - citizen
+      operationId: getCitizens
+      parameters:
+        - $ref: '#/components/parameters/page'
+        - $ref: '#/components/parameters/limit'
+        - $ref: '#/components/parameters/sort'
+        - $ref: '#/components/parameters/direction'
+        - $ref: '#/components/parameters/search'
+      responses:
+        200:
+          description: The Citizen objects
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/CitizenListResponse'
+        401:
+          $ref: '#/components/responses/401'
+  /citizens/current:
+    get:
+      security:
+        - JWTAuth: []
+      summary: Get Citizen
+      tags:
+        - citizen
+      operationId: getCurrentCitizen
+      responses:
+        200:
+          description: The Citizen object
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CitizenResponse'
+  /citizens/{citizen}:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: []
+      summary: Get Citizen
+      tags:
+        - citizen
+      operationId: getCitizen
+      responses:
+        200:
+          description: The Citizen object
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CitizenResponse'
+        404:
+          description: Citizen not found
+        401:
+          $ref: '#/components/responses/401'
+  /citizens/{citizen}/password/change:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    put:
+      security:
+        - JWTAuth: [ ]
+      summary: Change Citizen Password
+      tags:
+        - citizen
+      operationId: changePassword
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              required:
+                - oldPassword
+                - newPassword
+              properties:
+                oldPassword:
+                  type: string
+                  format: password
+                  example:
+                    azerty
+                newPassword:
+                  type: string
+                  format: password
+                  example:
+                    qwerty
+      responses:
+        201:
+          description: Password changed
+        400:
+          description: Bad request
+        401:
+          $ref: '#/components/responses/401'
+        404:
+          description: Citizen not found
+
+  /articles/{article}/comments:
+    parameters:
+      - $ref: '#/components/parameters/article'
+    get:
+      summary: Get comments of one article
+      tags:
+        - comment
+        - article
+      parameters:
+        - $ref: '#/components/parameters/page'
+        - $ref: '#/components/parameters/limit'
+        - $ref: '#/components/parameters/search'
+        - name: sort
+          in: query
+          required: false
+          example:
+            - created_at
+            - votes
+          schema:
+            type: string
+            default: created_at
+            enum:
+              - created_at
+              - votes
+      responses:
+        200:
+          description: Return paginated comments of article
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/CommentResponse'
+    post:
+      security:
+        - JWTAuth: [ ]
+      summary: Create Comment to article
+      tags:
+        - comment
+        - article
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - content
+              properties:
+                content:
+                  type: string
+                  example:
+                    Lorem ipsum...
+      responses:
+        201:
+          description: Return created Comment
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CommentResponse'
+        401:
+          $ref: '#/components/responses/401'
+  /comments/{comment}:
+    parameters:
+      - $ref: '#/components/parameters/comment'
+    get:
+      summary: Get Comment by Comment ID
+      tags:
+        - comment
+      responses:
+        200:
+          description: Return Comment
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CommentResponse'
+    put:
+      security:
+        - JWTAuth: []
+      summary: Edit existing comment
+      tags:
+        - comment
+      requestBody:
+        content:
+          application/json:
+            schema:
+              required:
+                - content
+              properties:
+                content:
+                  type: string
+                  example:
+                    Lorem ipsum...
+      responses:
+        200:
+          description: Return updated comment
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CommentResponse'
+        401:
+          $ref: '#/components/responses/401'
+  /comments/{comment}/children:
+    parameters:
+      - $ref: '#/components/parameters/comment'
+    get:
+      summary: Get Comment children by Comment ID
+      tags:
+        - comment
+      responses:
+        200:
+          description: Return Comment children
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/CommentResponse'
+  /citizens/{citizen}/comments/articles:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: []
+      summary: all article comments for one citizen
+      tags:
+        - comment
+        - article
+        - citizen
+      responses:
+        200:
+          description: Comments
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/CommentResponse'
+        401:
+          $ref: '#/components/responses/401'
+  /citizens/{citizen}/comments/constitutions:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: []
+      summary: all constitution comments for one citizen
+      tags:
+        - comment
+        - constitution
+        - citizen
+      responses:
+        200:
+          description: Comments
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/CommentResponse'
+        401:
+          $ref: '#/components/responses/401'
+  /constitutions/{constitution}/comments:
+    parameters:
+      - $ref: '#/components/parameters/constitution'
+    get:
+      summary: Get comment and children of one constitution
+      tags:
+        - comment
+        - constitution
+      responses:
+        200:
+          description: Return Comment and children
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CommentResponse'
+    post:
+      security:
+        - JWTAuth: []
+      summary: Create Comment to constitution
+      tags:
+        - comment
+        - constitution
+      requestBody:
+        content:
+          application/json:
+            schema:
+              required:
+                - content
+              properties:
+                content:
+                  type: string
+                  example:
+                    Lorem ipsum...
+      responses:
+        201:
+          description: Return created comment
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CommentResponse'
+        401:
+          $ref: '#/components/responses/401'
+
+  /constitutions:
+    get:
+      summary: Get all constitutions
+      tags:
+        - constitution
+      operationId: getConstitutions
+      parameters:
+        - $ref: '#/components/parameters/page'
+        - $ref: '#/components/parameters/limit'
+        - $ref: '#/components/parameters/sort'
+        - $ref: '#/components/parameters/direction'
+        - $ref: '#/components/parameters/search'
+      responses:
+        200:
+          description: The Constitution objects
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/ConstitutionListingResponse'
+    post:
+      security:
+        - JWTAuth: [ ]
+      summary: Create new Constitution
+      tags:
+        - constitution
+      operationId: insertConstitution
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ConstitutionRequest'
+
+      responses:
+        201:
+          description: Constitution created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ConstitutionResponse'
+        401:
+          $ref: '#/components/responses/401'
+        400:
+          $ref: '#/components/responses/400'
+  /constitutions/{constitution}:
+    parameters:
+      - $ref: '#/components/parameters/constitution'
+    get:
+      summary: Get all constitutions
+      tags:
+        - constitution
+      operationId: getConstitutions
+      responses:
+        200:
+          description: The Constitution objects
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ConstitutionResponse'
+
+  /articles/{article}/follows:
+    parameters:
+      - $ref: '#/components/parameters/article'
+    get:
+      security:
+        - JWTAuth: [ ]
+      summary: Return Follow or nothing if you not follow
+      tags:
+        - follow
+        - article
+      responses:
+        200:
+          description: Return your follow
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/FollowResponse'
+        404:
+          description: You not follow this article
+    post:
+      security:
+        - JWTAuth: [ ]
+      summary: Follow one article
+      tags:
+        - follow
+        - article
+      responses:
+        201:
+          description: Return only http status 201 on success
+    delete:
+      security:
+        - JWTAuth: [ ]
+      summary: Unfollow one article
+      tags:
+        - follow
+        - article
+      responses:
+        204:
+          description: Return only http status 204 on success
+        401:
+          $ref: '#/components/responses/401'
+  /citizens/{citizen}/follows/articles:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: [ ]
+      summary: Return Follow or nothing if you not follow
+      tags:
+        - follow
+        - article
+        - citizen
+      responses:
+        200:
+          description: Return your follows
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/FollowResponse'
+  /constitutions/{constitution}/follows:
+    parameters:
+      - $ref: '#/components/parameters/constitution'
+    get:
+      security:
+        - JWTAuth: [ ]
+      summary: Return Follow or nothing if you not follow
+      tags:
+        - follow
+        - constitution
+      responses:
+        200:
+          description: Return your follow
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/FollowResponse'
+        404:
+          description: You not follow this constitution
+    post:
+      security:
+        - JWTAuth: [ ]
+      summary: Follow one constitution
+      tags:
+        - follow
+        - constitution
+      responses:
+        201:
+          description: Return only http status 201 on success
+        401:
+          $ref: '#/components/responses/401'
+    delete:
+      security:
+        - JWTAuth: [ ]
+      summary: Unfollow one constitution
+      tags:
+        - follow
+        - constitution
+      responses:
+        204:
+          description: Return only http status 204 on success
+        401:
+          $ref: '#/components/responses/401'
+  /citizens/{citizen}/follows/constitutions:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: [ ]
+      summary: Return Follow or nothing if you not follow
+      tags:
+        - follow
+        - constitution
+        - citizen
+      responses:
+        200:
+          description: Return your follows
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/FollowResponse'
+
+  /opinions:
+    get:
+      summary: Get all opinions choices
+      tags:
+        - opinion
+      parameters:
+        - in: query
+          required: false
+          name: targets
+          description: opinion available for defined target
+          example:
+            - article
+          schema:
+            type: array
+            items:
+              type: string
+      responses:
+        200:
+          description: return
+          content:
+            application/json:
+              schema:
+                description: Opinion Choice
+                type: array
+                items:
+                  $ref: '#/components/schemas/OpinionChoice'
+  /opinions/{opinion}:
+    parameters:
+      - $ref: '#/components/parameters/opinion'
+    get:
+      summary: Get one opinion Choices
+      tags:
+        - opinion
+      responses:
+        200:
+          description: return
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OpinionChoice'
+  /citizens/{citizen}/opinions:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: [ ]
+      summary: Get all opinions of citizen filtered by target ids
+      tags:
+        - opinion
+        - citizen
+      parameters:
+        - in: query
+          required: true
+          name: id
+          description: target ids
+          example:
+            - 9226c1a3-8091-c3fa-7d0d-c2e98c9bee7b
+          schema:
+            type: array
+            items:
+              type: string
+              format: uuid
+      responses:
+        200:
+          description: Opinions
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Opinion'
+  /citizens/{citizen}/opinions/articles:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: []
+      summary: Get all opinions of one citizen
+      tags:
+        - opinion
+        - citizen
+      responses:
+        200:
+          description: Opinions
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/Opinion'
+  /articles/{article}/opinions:
+    parameters:
+      - $ref: '#/components/parameters/article'
+    put:
+      security:
+        - JWTAuth: []
+      summary: Add Opinion on one article
+      tags:
+        - opinion
+        - article
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                ids:
+                  type: array
+                  items:
+                    type: string
+                    format: uuid
+                    example: 6e978eb5-3c48-0def-b093-e01f43983adb
+      responses:
+        201:
+          description: Return the opinion
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Opinion'
+        401:
+          $ref: '#/components/responses/401'
+
+  /constitutions/{constitution}/vote:
+    parameters:
+      - $ref: '#/components/parameters/constitution'
+    put:
+      security:
+        - JWTAuth: [ ]
+      summary: Vote for one constitution
+      tags:
+        - vote
+        - constitution
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/VoteRequest'
+      responses:
+        201:
+          description: Return only http status 201 on success
+  /citizens/{citizen}/votes:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: [ ]
+      summary: Get Citizen
+      tags:
+        - vote
+        - citizen
+      operationId: getCitizenVotes
+      parameters:
+        - name: id
+          in: query
+          required: true
+          example:
+            - 1329ab90-edae-cfed-f863-c8cb069fa327
+            - cab54e50-ce85-bba0-da23-fc9f75feeaf5
+          schema:
+            type: array
+            items:
+              type: string
+              format: uuid
+      responses:
+        200:
+          description: The Votes objects
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/VoteResponse'
+        404:
+          description: Citizen not found
+        401:
+          $ref: '#/components/responses/401'
+  /comments/{comment}/vote:
+    parameters:
+      - $ref: '#/components/parameters/comment'
+    put:
+      security:
+        - JWTAuth: []
+      summary: Vote for a comment
+      tags:
+        - vote
+        - comment
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/VoteRequest'
+      responses:
+        201:
+          description: Return votes aggregation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/VoteAggregation'
+        401:
+          $ref: '#/components/responses/401'
+  /citizens/{citizen}/votes/articles:
+    parameters:
+      - $ref: '#/components/parameters/citizen'
+    get:
+      security:
+        - JWTAuth: [ ]
+      summary: all article vote for one citizen
+      tags:
+        - vote
+        - article
+        - citizen
+      responses:
+        200:
+          description: Votes
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/VoteResponse'
+        401:
+          $ref: '#/components/responses/401'
+  /articles/{article}/vote:
+    parameters:
+      - $ref: '#/components/parameters/article'
+    put:
+      security:
+        - JWTAuth: [ ]
+      summary: Vote for one article
+      tags:
+        - vote
+        - article
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/VoteRequest'
+      responses:
+        201:
+          description: Return only http status 201 on success
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/VoteAggregation'
+        401:
+          $ref: '#/components/responses/401'
+
+  /workgroups:
+    get:
+      summary: Get all Workgroup (Paginated)
+      security:
+        - JWTAuth: [ ]
+      tags:
+        - workgroup
+      parameters:
+        - $ref: '#/components/parameters/page'
+        - $ref: '#/components/parameters/limit'
+        - $ref: '#/components/parameters/workgroupSort'
+        - $ref: '#/components/parameters/direction'
+        - $ref: '#/components/parameters/search'
+        - $ref: '#/components/parameters/createdBy'
+      responses:
+        200:
+          description: paginated list of workgroup
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Paginated'
+                  - type: object
+                    properties:
+                      result:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/WorkgroupListing'
+    post:
+      summary: Create new Workgroup
+      security:
+        - JWTAuth: [ ]
+      tags:
+        - workgroup
+      requestBody:
+        content:
+          application/json:
+            schema:
+              required:
+                - name
+              properties:
+                id:
+                  type: string
+                  format: uuid
+                  nullable: true
+                name:
+                  type: string
+                  example: Les partisants du RIC
+                description:
+                  type: string
+                  example: Group formé pour la conception d'un RIC
+                logo:
+                  type: string
+                  nullable: true
+                anonymous:
+                  type: boolean
+                  example: false
+                  nullable: true
+                  default: true
+      responses:
+        201:
+          description: Workgroup created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Workgroup'
+  /workgroups/{workgroup}:
+    parameters:
+      - $ref: '#/components/parameters/workgroup'
+    get:
+      summary: Get one workgroup by ID
+      security:
+        - JWTAuth: [ ]
+      tags:
+        - workgroup
+      responses:
+        200:
+          description: Workgroup
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Workgroup'
+        404:
+          description: Workshop not exist or are deleted
+    put:
+      summary: Edit one workgroup
+      security:
+        - JWTAuth: [ ]
+      tags:
+        - workgroup
+      requestBody:
+        content:
+          application/json:
+            schema:
+              properties:
+                name:
+                  type: string
+                  example: Les partisants du RIC
+                description:
+                  type: string
+                  example: Group formé pour la conception d'un RIC
+                logo:
+                  type: string
+                  nullable: true
+                anonymous:
+                  type: boolean
+                  example: false
+                  nullable: true
+                  default: true
+      responses:
+        200:
+          description: Workgroup updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Workgroup'
+    delete:
+      summary: Delete one workgroup
+      security:
+        - JWTAuth: [ ]
+      tags:
+        - workgroup
+      responses:
+        204:
+          description: Workgroup deleted
+        404:
+          description: Workshop not exist or are already deleted
+  /workgroups/{workgroup}/members:
+    parameters:
+      - $ref: '#/components/parameters/workgroup'
+    post:
+      summary: Add members to the workgroup
+      security:
+        - JWTAuth: []
+      tags:
+        - workgroup
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/MembersRequest'
+      responses:
+        201:
+          description: the list of members
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MembersResponse'
+    put:
+      summary: Updates ALL members.
+      description: ⚠ PLEASE NOTE ⚠ This request removes all members who are not in request!
+      security:
+        - JWTAuth: []
+      tags:
+        - workgroup
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/MembersRequest'
+      responses:
+        200:
+          description: the list of members
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MembersResponse'
+        400:
+          $ref: '#/components/responses/400'
+    delete:
+      summary: Delete members of workgroup
+      security:
+        - JWTAuth: []
+      tags:
+        - workgroup
+      requestBody:
+        content:
+          application/json:
+            schema:
+              description: members of workgroup
+              type: array
+              items:
+                type: object
+                properties:
+                  citizen:
+                    required:
+                      - id
+                    properties:
+                      id:
+                        $ref: '#/components/schemas/UUID'
+      responses:
+        200:
+          description: the list of members
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MembersResponse'
+        400:
+          $ref: '#/components/responses/400'
+
+components:
+  parameters:
+    page:
+      name: page
+      in: query
+      description: The current page
+      example: 1
+      required: false
+      schema:
+        default: 1
+        type: integer
+        minimum: 1
+    limit:
+      name: limit
+      in: query
+      description: The number of object per page
+      example: 50
+      required: false
+      schema:
+        default: 50
+        type: integer
+        minimum: 1
+        maximum: 50
+    sort:
+      name: sort
+      in: query
+      description: The sort field name
+      example: firstName
+      required: false
+      schema:
+        type: string
+    articleSort:
+      name: sort
+      in: query
+      description: The sort field name
+      example: createdAt
+      required: false
+      schema:
+        type: string
+        enum:
+          - title
+          - createdAt
+          - vote
+          - popularity
+    workgroupSort:
+      name: sort
+      in: query
+      description: The sort field name
+      example: createdAt
+      required: false
+      schema:
+        type: string
+        enum:
+          - name
+          - createdAt
+    direction:
+      name: direction
+      in: query
+      description: The sort direction
+      example: asc
+      required: false
+      schema:
+        type: string
+        default: asc
+        enum: [asc, desc]
+    search:
+      name: search
+      in: query
+      description: A text to seach
+      example: content50
+      required: false
+      schema:
+        type: string
+    createdBy:
+      name: createdBy
+      in: query
+      description: filter by Author
+      example: 4d673bfa-eaef-4290-b52f-85a9c8a7eba5
+      required: false
+      schema:
+        type: string
+        format: uuid
+
+    article:
+      name: article
+      in: path
+      required: true
+      description: the ID of article
+      example: d91aa0cd-61d6-83cc-41bb-8d5656e130f7
+      schema:
+        type: string
+        format: uuid
+
+    citizen:
+      name: citizen
+      in: path
+      description: ID of citizen
+      example: 6434f4f9-f570-f22a-c134-8668350651ff
+      required: true
+      schema:
+        type: string
+        format: uuid
+
+    comment:
+      name: comment
+      in: path
+      description: The ID of comment
+      example: 701dc504-db49-7e3a-2c0a-32542507ea57
+      required: true
+      schema:
+        type: string
+        format: uuid
+
+    constitution:
+      name: constitution
+      in: path
+      required: true
+      description: the ID of constitution
+      example: e74be8e4-6823-47c4-bd1b-789725b2fa8e
+      schema:
+        type: string
+        format: uuid
+
+    opinion:
+      in: path
+      required: true
+      name: opinion
+      description: Opinion ID
+      example: 6e978eb5-3c48-0def-b093-e01f43983adb
+      schema:
+        type: string
+        format: uuid
+
+    workgroup:
+      name: workgroup
+      in: path
+      description: ID of workgroup
+      example: 82a0e60a-bb55-dbc0-1c3d-0a804df2b5df
+      required: true
+      schema:
+        type: string
+        format: uuid
+
+
+  responses:
+    401:
+      description: Unautorized
+      content:
+        application/json:
+          schema:
+            description: noting
+    400:
+      description: BadReqest
+      content:
+        application/json:
+          schema:
+            description: noting
+
+  schemas:
+    UUID:
+      type: string
+      pattern: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+      description: UUID
+      format: uuid
+      example:
+        e74be8e4-6823-47c4-bd1b-789725b2fa8e
+    Paginated:
+      required:
+        - total
+        - count
+        - currentPage
+        - limit
+        - offset
+        - result
+      properties:
+        result:
+          type: array
+          maxItems: 50
+          items:
+            required:
+              - id
+            properties:
+              id:
+                $ref: '#/components/schemas/UUID'
+        count:
+          type: integer
+          minimum: 0
+          example: 1
+        currentPage:
+          type: integer
+          minimum: 0
+          example: 1
+        limit:
+          type: integer
+          minimum: 0
+          maximum: 50
+          example: 50
+        offset:
+          type: integer
+          minimum: 0
+          example: 1
+        total:
+          type: integer
+          minimum: 0
+          example: 1
+    ArticleResponse:
+      additionalProperties: false
+      required:
+        - id
+        - versionId
+        - versionNumber
+        - title
+        - anonymous
+        - content
+        - description
+        - tags
+        - draft
+        - lastVersion
+        - createdBy
+        - views
+        - opinions
+        - votes
+      properties:
+        id:
+          type: string
+          format: uuid
+        versionId:
+          type: string
+          format: uuid
+        versionNumber:
+          type: integer
+          minimum: 0
+        title:
+          type: string
+        anonymous:
+          type: boolean
+        content:
+          type: string
+        description:
+          type: string
+        tags:
+          type: array
+          items:
+            type: string
+        draft:
+          type: boolean
+        lastVersion:
+          type: boolean
+        createdAt:
+          type: string
+          format: 'date-time'
+        createdBy:
+          type: object
+          additionalProperties: false
+          required:
+            - id
+            - name
+            - email
+          properties:
+            id:
+              type: string
+              format: uuid
+            name:
+              type: object
+              required:
+                - firstName
+                - lastName
+              properties:
+                firstName:
+                  type: string
+                lastName:
+                  type: string
+            email:
+              type: string
+        workgroup:
+          type: object
+          nullable: true
+          additionalProperties: false
+          properties:
+            id:
+              type: string
+              format: uuid
+            name:
+              type: string
+        views:
+          additionalProperties: false
+          required:
+            - total
+            - unique
+          properties:
+            total:
+              type: integer
+            unique:
+              type: integer
+        opinions:
+          additionalProperties:
+            type: integer
+          example:
+            'good writed': 5
+            'to short': 19
+        votes:
+          additionalProperties: false
+          required:
+            - up
+            - neutral
+            - down
+            - total
+            - score
+          properties:
+            up:
+              type: integer
+            neutral:
+              type: integer
+            down:
+              type: integer
+            total:
+              type: integer
+            score:
+              type: integer
+    ArticleListingResponse:
+      required:
+        - id
+        - title
+        - createdBy
+        - workgroup
+        - draft
+      properties:
+        id:
+          type: string
+          format: uuid
+        title:
+          type: string
+        createdBy:
+          $ref: '#/components/schemas/CitizenCreator'
+        workgroup:
+          type: object
+          nullable: true
+          additionalProperties: false
+          properties:
+            id:
+              type: string
+              format: uuid
+            name:
+              type: string
+        draft:
+          type: boolean
+
+    CitizenListResponse:
+      additionalProperties: false
+      type: object
+      required:
+        - id
+        - name
+        - email
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        name:
+          type: object
+          required:
+            - firstName
+            - lastName
+          properties:
+            firstName:
+              type: string
+              example:
+                john
+            lastName:
+              type: string
+              example:
+                Doe
+        email:
+          type: string
+          format: email
+          example: my.email@dc-project.fr
+    CitizenResponse:
+      additionalProperties: false
+      type: object
+      required:
+        - id
+        - name
+        - email
+        - createdAt
+        - user
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        name:
+          type: object
+          required:
+            - firstName
+            - lastName
+          properties:
+            firstName:
+              type: string
+              example:
+                john
+            lastName:
+              type: string
+              example:
+                Doe
+        email:
+          type: string
+          format: email
+          example: my.email@dc-project.fr
+        birthday:
+          type: string
+          format: 'date'
+          example: '1984-12-25'
+        createdAt:
+          type: string
+          format: 'date-time'
+        user:
+          type: object
+          required:
+            - username
+          properties:
+            username:
+              type: string
+              example:
+                john-doe
+    CitizenCreator:
+      additionalProperties: false
+      type: object
+      required:
+        - id
+        - name
+        - user
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        name:
+          type: object
+          required:
+            - firstName
+            - lastName
+          properties:
+            firstName:
+              type: string
+              example:
+                john
+            lastName:
+              type: string
+              example:
+                Doe
+        user:
+          type: object
+          required:
+            - username
+          properties:
+            username:
+              type: string
+              example:
+                john-doe
+
+    CommentResponse:
+      additionalProperties: false
+      type: object
+      required:
+        - id
+        - content
+        - parent
+        - createdAt
+        - createdBy
+        - votes
+        - target
+        - childrenCount
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        content:
+          type: string
+          example:
+            Lorem ipsum...
+        parent:
+          nullable: true
+          properties:
+            id:
+              $ref: '#/components/schemas/UUID'
+            reference:
+              type: string
+        createdBy:
+          $ref: '#/components/schemas/CitizenCreator'
+        createdAt:
+          type: string
+          format: 'date-time'
+        updatedAt:
+          type: string
+          format: 'date-time'
+        target:
+          additionalProperties: false
+          properties:
+            id:
+              $ref: '#/components/schemas/UUID'
+            reference:
+              type: string
+        childrenCount:
+          type: integer
+          minimum: 0
+        votes:
+          properties:
+            up:
+              type: number
+              minimum: 0
+            neutral:
+              type: number
+              minimum: 0
+            down:
+              type: number
+              minimum: 0
+            total:
+              type: number
+              minimum: 0
+            score:
+              type: number
+    ConstitutionRequest:
+      additionalProperties: false
+      description: The versionId field must be defined for update contitution
+      type: object
+      required:
+        - title
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        title:
+          type: string
+          example:
+            Constitution for the liberty
+        titles:
+          type: array
+          default: [ ]
+          items:
+            additionalProperties: false
+            type: object
+            required:
+              - name
+            properties:
+              id:
+                $ref: '#/components/schemas/UUID'
+              name:
+                type: string
+                example:
+                  The liberties
+              articles:
+                type: array
+                items:
+                  required:
+                    - id
+                  properties:
+                    id:
+                      $ref: '#/components/schemas/UUID'
+        anonymous:
+          type: boolean
+          default: true
+        draft:
+          type: boolean
+          default: false
+        versionId:
+          $ref: '#/components/schemas/UUID'
+    ConstitutionResponse:
+      additionalProperties: false
+      type: object
+      required:
+        - id
+        - title
+        - titles
+        - anonymous
+        - draft
+        - versionId
+        - createdBy
+        - createdAt
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        title:
+          type: string
+          example:
+            Constitution for the liberty
+        titles:
+          type: array
+          default: [ ]
+          items:
+            additionalProperties: false
+            type: object
+            required:
+              - id
+              - name
+              - rank
+              - articles
+            properties:
+              id:
+                $ref: '#/components/schemas/UUID'
+              name:
+                type: string
+                example:
+                  The liberties
+              rank:
+                type: integer
+                minimum: 0
+                example: 0
+              createdBy:
+                $ref: '#/components/schemas/CitizenCreator'
+              createdAt:
+                type: string
+                format: 'date-time'
+              articles:
+                type: array
+                items:
+                  $ref: '#/components/schemas/ArticleListingResponse'
+        anonymous:
+          type: boolean
+          default: true
+        draft:
+          type: boolean
+          default: false
+        versionId:
+          $ref: '#/components/schemas/UUID'
+        createdBy:
+          $ref: '#/components/schemas/CitizenCreator'
+        createdAt:
+          type: string
+          format: 'date-time'
+    ConstitutionListingResponse:
+      additionalProperties: false
+      type: object
+      required:
+        - id
+        - title
+        - versionId
+        - createdAt
+        - createdBy
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        title:
+          type: string
+          example:
+            Constitution for the liberty
+        versionId:
+          $ref: '#/components/schemas/UUID'
+        createdBy:
+          $ref: '#/components/schemas/CitizenCreator'
+        createdAt:
+          type: string
+          format: 'date-time'
+
+    FollowResponse:
+      additionalProperties: false
+      required:
+        - id
+        - createdBy
+        - createdAt
+        - target
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        createdBy:
+          $ref: '#/components/schemas/CitizenCreator'
+        createdAt:
+          type: string
+          format: 'date-time'
+        target:
+          required:
+            - id
+            - reference
+          additionalProperties: false
+          properties:
+            id:
+              $ref: '#/components/schemas/UUID'
+            reference:
+              type: string
+
+    OpinionChoice:
+      description: Opinion Choice
+      type: object
+      required:
+        - name
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+          example: opinion1
+        target:
+          type: array
+          nullable: true
+          items:
+            type: string
+            description: the name of the target
+    Opinion:
+      description: Opinion
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+          example: opinion1
+        target:
+          type: object
+          properties:
+            id:
+              type: string
+              format: uuid
+            reference:
+              type: string
+              example: article
+        choice:
+          type: object
+          allOf:
+            - $ref: '#/components/schemas/OpinionChoice'
+        reference:
+          type: string
+          example: opinion_on_article
+        createdBy:
+          $ref: '#/components/schemas/CitizenCreator'
+        createdAt:
+          type: string
+          format: 'date-time'
+
+    VoteRequest:
+      type: object
+      additionalProperties: false
+      required:
+        - note
+      properties:
+        note:
+          type: integer
+          minimum: -1
+          maximum: 1
+    VoteResponse:
+      type: object
+      additionalProperties: false
+      required:
+        - id
+        - note
+        - createdAt
+        - createdBy
+        - target
+      properties:
+        id:
+          $ref: '#/components/schemas/UUID'
+        note:
+          type: integer
+          minimum: -1
+          maximum: 1
+        createdAt:
+          type: string
+          format: 'date-time'
+        createdBy:
+          $ref: '#/components/schemas/CitizenCreator'
+        target:
+          required:
+            - id
+            - reference
+          properties:
+            id:
+              $ref: '#/components/schemas/UUID'
+            reference:
+              type: string
+    VoteAggregation:
+      additionalProperties: false
+      type: object
+      required:
+        - up
+        - neutral
+        - down
+        - total
+        - score
+        - updatedAt
+      properties:
+        up:
+          type: number
+          minimum: 0
+        neutral:
+          type: number
+          minimum: 0
+        down:
+          type: number
+          minimum: 0
+        total:
+          type: number
+          minimum: 0
+        score:
+          type: number
+        updatedAt:
+          type: string
+          format: 'date-time'
+
+    WorkgroupListing:
+      description: Workgroup
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+          example: Les partisants du RIC
+        description:
+          type: string
+          example: Group formé pour la conception d'un RIC
+        logo:
+          type: string
+          nullable: true
+    Workgroup:
+      description: Workgroup
+      type: object
+      required:
+        - id
+        - name
+        - description
+        - logo
+        - anonymous
+        - createdBy
+        - members
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+          example: Les partisants du RIC
+        description:
+          type: string
+          example: Group formé pour la conception d'un RIC
+        logo:
+          type: string
+          nullable: true
+        anonymous:
+          type: boolean
+        createdBy:
+          $ref: '#/components/schemas/CitizenCreator'
+        members:
+          $ref: '#/components/schemas/MembersResponse'
+
+    MembersRequest:
+      description: members of workgroup
+      type: array
+      items:
+        type: object
+        properties:
+          citizen:
+            required:
+              - id
+            properties:
+              id:
+                $ref: '#/components/schemas/UUID'
+          roles:
+            type: array
+            items:
+              type: string
+              enum:
+                - MASTER
+                - MANAGER
+                - EDITOR
+                - REPORTER
+              example: MASTER
+    MembersResponse:
+      description: members of workgroup
+      type: array
+      items:
+        description: Member of workgroup
+        type: object
+        properties:
+          citizen:
+            $ref: '#/components/schemas/CitizenCreator'
+          roles:
+            type: array
+            items:
+              type: string
+              enum:
+                - MASTER
+                - MANAGER
+                - EDITOR
+                - REPORTER
+              example: MASTER
+
+  securitySchemes:
+    JWTAuth:
+      type: http
+      scheme: bearer
+      description: call /login to get token
+      bearerFormat: JWT
+
+servers:
+  - description: localhost
+    url: http://localhost:8080
+  - description: production
+    url: http://dc-project.fr
\ No newline at end of file
diff --git a/src/main/resources/sql/fixtures/fixtures.sh b/src/main/resources/sql/fixtures/fixtures.sh
index 3ce9606..e32f1e4 100644
--- a/src/main/resources/sql/fixtures/fixtures.sh
+++ b/src/main/resources/sql/fixtures/fixtures.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 awk 'FNR==1{print "--------------------"}1' `dirname $0`/*.sql > ./allSQL.sql
-docker exec -i postgresql_dc-project psql dc-project dc-project -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+docker exec -i dc-project_postgresql psql dc-project dc-project -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
 rm ./allSQL.sql
 echo "End fixtures"
\ No newline at end of file
diff --git a/src/main/resources/sql/functions/article/find_article_by_id.sql b/src/main/resources/sql/functions/article/find_article_by_id.sql
index 29d9d6c..74cbc17 100644
--- a/src/main/resources/sql/functions/article/find_article_by_id.sql
+++ b/src/main/resources/sql/functions/article/find_article_by_id.sql
@@ -6,7 +6,16 @@ begin
     select to_json(t)
     from (
         select
-            a.*,
+            a.id,
+            a.version_number,
+            a.version_id,
+            a.title,
+            a.anonymous,
+            a.content,
+            a.description,
+            a.tags,
+            a.draft,
+            a.last_version,
             find_citizen_by_id_with_user(a.created_by_id) as created_by,
             find_workgroup_by_id(a.workgroup_id) as workgroup,
             count_vote(a.id) as votes,
diff --git a/src/main/resources/sql/functions/article/find_articles.sql b/src/main/resources/sql/functions/article/find_articles.sql
index f9ad471..75164b2 100644
--- a/src/main/resources/sql/functions/article/find_articles.sql
+++ b/src/main/resources/sql/functions/article/find_articles.sql
@@ -21,11 +21,13 @@ begin
     into resource, total
     from (
         select
-            a.*,
+            a.id,
+            a.title,
+            a.deleted_at,
+            a.draft,
             find_citizen_by_id_with_user(a.created_by_id) as created_by,
             find_workgroup_by_id(a.workgroup_id) as workgroup,
             count_vote(a.id) as votes,
-            count_opinion(a.id) as opinions,
             zdb.score(a.ctid) _score
         from article as a
         left join vote_cache ca using (id)
diff --git a/src/main/resources/sql/functions/article/find_articles_versions_by_version_id.sql b/src/main/resources/sql/functions/article/find_articles_versions_by_version_id.sql
index 30bd7c4..25cff2c 100644
--- a/src/main/resources/sql/functions/article/find_articles_versions_by_version_id.sql
+++ b/src/main/resources/sql/functions/article/find_articles_versions_by_version_id.sql
@@ -13,10 +13,17 @@ begin
     into resource, total
     from (
         select
-            a.*,
-            find_citizen_by_id_with_user(a.created_by_id) as created_by,
-            find_workgroup_by_id(a.workgroup_id) as workgroup,
-            count_vote(a.id) as votes
+           a.id,
+           a.created_at,
+           find_citizen_by_id_with_user(a.created_by_id) as created_by,
+           find_workgroup_by_id(a.workgroup_id) as workgroup,
+           a.version_id,
+           a.version_number,
+           a.title,
+           a.deleted_at,
+           a.draft,
+           a.last_version,
+           count_vote(a.id) as votes
         from article as a
         where a.version_id = _version_id
         order by a.version_number desc
diff --git a/src/main/resources/sql/functions/article/upsert_article.sql b/src/main/resources/sql/functions/article/upsert_article.sql
index 9b69688..2c53cf3 100644
--- a/src/main/resources/sql/functions/article/upsert_article.sql
+++ b/src/main/resources/sql/functions/article/upsert_article.sql
@@ -54,10 +54,10 @@ begin
 
         insert into article_relations (source_id, target_id, created_by_id)
         select
-            (resource->>'id')::uuid,
+            (rel->>'id')::uuid,
             id,
-            (resource#>>'{created_by, id}')::uuid
-        from json_populate_recordset(null::article, resource->>'relations');
+            (rel#>>'{created_by, id}')::uuid
+        from json_populate_recordset(null::article, resource->>'relations') rel;
     end if;
 
     select find_article_by_id(new_id) into resource;
diff --git a/src/main/resources/sql/functions/citizen/find_citizen_by_id.sql b/src/main/resources/sql/functions/citizen/find_citizen_by_id.sql
index 001619a..8671f8c 100644
--- a/src/main/resources/sql/functions/citizen/find_citizen_by_id.sql
+++ b/src/main/resources/sql/functions/citizen/find_citizen_by_id.sql
@@ -8,7 +8,6 @@ begin
          select
             z.*
          from citizen as z
-         left join citizen_in_workgroup ciw on z.id = ciw.citizen_id
          where z.id = _id
          group by z.id
      ) as t;
diff --git a/src/main/resources/sql/functions/citizen/find_citizen_by_id_with_user.sql b/src/main/resources/sql/functions/citizen/find_citizen_by_id_with_user.sql
index d6cfc55..7af1959 100644
--- a/src/main/resources/sql/functions/citizen/find_citizen_by_id_with_user.sql
+++ b/src/main/resources/sql/functions/citizen/find_citizen_by_id_with_user.sql
@@ -9,7 +9,6 @@ begin
             z.*,
             find_user_by_id(z.user_id) as "user"
          from citizen as z
-         left join citizen_in_workgroup ciw on z.id = ciw.citizen_id
          where z.id = _id
          group by z.id
      ) as t;
diff --git a/src/main/resources/sql/functions/citizen/find_citizen_by_name.sql b/src/main/resources/sql/functions/citizen/find_citizen_by_name.sql
new file mode 100644
index 0000000..cf9d3b4
--- /dev/null
+++ b/src/main/resources/sql/functions/citizen/find_citizen_by_name.sql
@@ -0,0 +1,16 @@
+create or replace function find_citizen_by_name(_name json, out resource json) language plpgsql as
+$$
+begin
+    select to_json(t) into resource
+    from (
+        select
+            z.*,
+            find_user_by_id(u.id) as "user"
+        from citizen as z
+        join "user" as u on z.user_id = u.id
+        where z.name->>'first_name' = _name->>'first_name'
+          and z.name->>'last_name' = _name->>'last_name'
+    ) as t;
+end;
+$$;
+
diff --git a/src/main/resources/sql/functions/comment/find_comment_by_id.sql b/src/main/resources/sql/functions/comment/find_comment_by_id.sql
index 6a30401..20d1340 100644
--- a/src/main/resources/sql/functions/comment/find_comment_by_id.sql
+++ b/src/main/resources/sql/functions/comment/find_comment_by_id.sql
@@ -9,6 +9,8 @@ begin
     from (
         select
             com.*,
+            (select count(*) from "comment" c2 where c2.parents_ids @> array[com.id]) as children_count,
+            find_comment_parent_by_id(com.parent_id) as parent,
             find_reference_by_id(com.target_id, com.target_reference) as target,
             find_citizen_by_id_with_user(com.created_by_id) as created_by,
             count_vote(com.id) as votes
diff --git a/src/main/resources/sql/functions/comment/find_comment_parent_by_id.sql b/src/main/resources/sql/functions/comment/find_comment_parent_by_id.sql
new file mode 100644
index 0000000..b46ca17
--- /dev/null
+++ b/src/main/resources/sql/functions/comment/find_comment_parent_by_id.sql
@@ -0,0 +1,20 @@
+create or replace function find_comment_parent_by_id(
+    _parent_id uuid,
+    out resource json
+) language plpgsql as
+$$
+begin
+    select to_json(t)
+    into resource
+    from (
+        select
+            id,
+            deleted_at,
+            json_build_object('id', target_id, 'reference', target_reference) as target
+        from "comment" cp
+        where id = _parent_id
+    ) as t;
+end;
+$$;
+
+
diff --git a/src/main/resources/sql/functions/comment/find_comments_by_citizen.sql b/src/main/resources/sql/functions/comment/find_comments_by_citizen.sql
index ce3dd5b..5e84a68 100644
--- a/src/main/resources/sql/functions/comment/find_comments_by_citizen.sql
+++ b/src/main/resources/sql/functions/comment/find_comments_by_citizen.sql
@@ -20,6 +20,8 @@ begin
     from (
         select
             com.*,
+            (select count(*) from "comment" c2 where c2.parents_ids @> array[com.id]) as children_count,
+            find_comment_parent_by_id(com.parent_id) as parent,
             find_reference_by_id(com.target_id, _reference) as target,
             find_citizen_by_id_with_user(com.created_by_id) as created_by,
             count_vote(com.id) as votes
diff --git a/src/main/resources/sql/functions/comment/find_comments_by_parent.sql b/src/main/resources/sql/functions/comment/find_comments_by_parent.sql
index 1ae9058..a575fc9 100644
--- a/src/main/resources/sql/functions/comment/find_comments_by_parent.sql
+++ b/src/main/resources/sql/functions/comment/find_comments_by_parent.sql
@@ -13,6 +13,7 @@ begin
         select
             com.*,
             (select count(*) from "comment" c2 where c2.parents_ids @> array[com.id]) as children_count,
+            find_comment_parent_by_id(com.parent_id) as parent,
             find_reference_by_id(com.target_id, com.target_reference) as target,
             find_citizen_by_id_with_user(com.created_by_id) as created_by,
             count_vote(com.id) as votes
diff --git a/src/main/resources/sql/functions/comment/find_comments_by_target.sql b/src/main/resources/sql/functions/comment/find_comments_by_target.sql
index b51eab5..8a78bdc 100644
--- a/src/main/resources/sql/functions/comment/find_comments_by_target.sql
+++ b/src/main/resources/sql/functions/comment/find_comments_by_target.sql
@@ -14,6 +14,7 @@ begin
         select
             com.*,
             (select count(c2) from "comment" c2 where c2.parent_comment_id = com.id) as children_count,
+            find_comment_parent_by_id(com.parent_id) as parent,
             find_reference_by_id(com.target_id, com.target_reference) as target,
             find_citizen_by_id_with_user(com.created_by_id) as created_by,
             count_vote(com.id) as votes
diff --git a/src/main/resources/sql/functions/constitution/find_constitutions.sql b/src/main/resources/sql/functions/constitution/find_constitutions.sql
index b407d03..1dae8c0 100644
--- a/src/main/resources/sql/functions/constitution/find_constitutions.sql
+++ b/src/main/resources/sql/functions/constitution/find_constitutions.sql
@@ -15,7 +15,6 @@ begin
         select
             c.*,
             find_citizen_by_id_with_user(c.created_by_id) as created_by,
-            find_constitution_titles_by_id(c.id) as titles,
             zdb.score(c.ctid) _score
         from constitution as c
         where _search is null or _search = '' or c ==> dsl.multi_match('{title^3, intro}', _search)
diff --git a/src/main/resources/sql/functions/helpers/json_to_array.sql b/src/main/resources/sql/functions/helpers/json_to_array.sql
new file mode 100644
index 0000000..d62e15e
--- /dev/null
+++ b/src/main/resources/sql/functions/helpers/json_to_array.sql
@@ -0,0 +1,5 @@
+create or replace function json_to_array(json json) returns text[] language sql
+    immutable parallel safe as
+$$
+    select array(select json_array_elements_text(json))
+$$;
\ No newline at end of file
diff --git a/src/main/resources/sql/functions/user/change_user_password.sql b/src/main/resources/sql/functions/user/change_user_password.sql
index e1e8593..8c5b77f 100644
--- a/src/main/resources/sql/functions/user/change_user_password.sql
+++ b/src/main/resources/sql/functions/user/change_user_password.sql
@@ -2,7 +2,7 @@ create or replace function change_user_password(resource json) returns void lang
 $$
 begin
     update "user"
-    set password = crypt(resource->>'plain_password', gen_salt('bf', 8))
+    set password = crypt(resource->>'password', gen_salt('bf', 8))
     where id = (resource->>'id')::uuid;
 
     return;
diff --git a/src/main/resources/sql/functions/user/check_user.sql b/src/main/resources/sql/functions/user/check_user.sql
index 8cfcec0..c84a49b 100644
--- a/src/main/resources/sql/functions/user/check_user.sql
+++ b/src/main/resources/sql/functions/user/check_user.sql
@@ -1,7 +1,5 @@
-create or replace function check_user(in username text, in plain_password text, out resource json) language plpgsql as
+create or replace function check_user(in _username text, in _password text, out resource json) language plpgsql as
 $$
-declare
-    _username alias for username;
 begin
     select
        case when count(u) = 1
@@ -10,7 +8,7 @@ begin
     into resource
     from "user" as u
     where u.username = lower(_username)
-      and u.password = crypt(plain_password, u.password)
+      and u.password = crypt(_password, u.password)
     group by u;
 end;
 $$;
diff --git a/src/main/resources/sql/functions/user/insert_user.sql b/src/main/resources/sql/functions/user/insert_user.sql
index 1b50dd6..bdc8763 100644
--- a/src/main/resources/sql/functions/user/insert_user.sql
+++ b/src/main/resources/sql/functions/user/insert_user.sql
@@ -7,7 +7,7 @@ begin
     select
         coalesce(t.id, uuid_generate_v4()),
         t.username,
-        crypt(resource->>'plain_password', gen_salt('bf', 8)),
+        crypt(resource->>'password', gen_salt('bf', 8)),
         case when t.blocked_at is not null then now() else null end,
         t.roles
     from json_populate_record(null::"user", resource) t
diff --git a/src/main/resources/sql/functions/vote/vote.sql b/src/main/resources/sql/functions/vote/vote.sql
index 7d7a928..ba24ae9 100644
--- a/src/main/resources/sql/functions/vote/vote.sql
+++ b/src/main/resources/sql/functions/vote/vote.sql
@@ -1,31 +1,32 @@
-create or replace function vote(reference regclass, _target_id uuid, _created_by_id uuid, _note int, _anonymous bool default true, out resource json)
+create or replace function vote(reference regclass, _target_id uuid, _created_by_id uuid, _note int, _anonymous bool default null, out resource json)
     language plpgsql as
 $$
+declare _anonymous_conf bool = coalesce(_anonymous, (select vote_anonymous from citizen where id = _created_by_id));
 begin
     if reference = 'article'::regclass then
         insert into vote_for_article (created_by_id, target_id, note, anonymous)
-        values (_created_by_id, _target_id, _note, _anonymous)
+        values (_created_by_id, _target_id, _note, _anonymous_conf)
         on conflict (created_by_id, target_id) do update set
           note = excluded.note,
           anonymous = excluded.anonymous,
           updated_at = now();
     elseif reference = 'constitution'::regclass then
         insert into vote_for_constitution (created_by_id, target_id, note, anonymous)
-        values (_created_by_id, _target_id, _note, _anonymous)
+        values (_created_by_id, _target_id, _note, _anonymous_conf)
         on conflict (created_by_id, target_id) do update set
           note = excluded.note,
           anonymous = excluded.anonymous,
           updated_at = now();
     elseif reference = 'comment_on_article'::regclass then
         insert into vote_for_comment_on_article (created_by_id, target_id, note, anonymous)
-        values (_created_by_id, _target_id, _note, _anonymous)
+        values (_created_by_id, _target_id, _note, _anonymous_conf)
         on conflict (created_by_id, target_id) do update set
           note = excluded.note,
           anonymous = excluded.anonymous,
           updated_at = now();
     elseif reference = 'comment_on_constitution'::regclass then
         insert into vote_for_comment_on_constitution (created_by_id, target_id, note, anonymous)
-        values (_created_by_id, _target_id, _note, _anonymous)
+        values (_created_by_id, _target_id, _note, _anonymous_conf)
         on conflict (created_by_id, target_id) do update set
           note = excluded.note,
           anonymous = excluded.anonymous,
diff --git a/src/main/resources/sql/functions/workgroup/upsert_workgroup.sql b/src/main/resources/sql/functions/workgroup/upsert_workgroup.sql
index 797ed71..00e1fbb 100644
--- a/src/main/resources/sql/functions/workgroup/upsert_workgroup.sql
+++ b/src/main/resources/sql/functions/workgroup/upsert_workgroup.sql
@@ -3,7 +3,7 @@ create or replace function upsert_workgroup(inout resource json)
 $$
 declare
     new_id uuid = coalesce((resource->>'id')::uuid, uuid_generate_v4());
-    exists boolean = case when (select true from workgroup where id = new_id) is null then true else false end;
+    exists boolean = case when (select true from workgroup where id = new_id) is null then false else true end;
 begin
     insert into workgroup (id, created_by_id, name, description, anonymous, logo)
     select
@@ -20,15 +20,25 @@ begin
         anonymous = excluded.anonymous,
         logo = excluded.logo;
 
+    -- remove old members
+    delete from citizen_in_workgroup cw
+    where cw.workgroup_id = new_id
+      and cw.citizen_id not in (
+          select (m#>>'{citizen,id}')::uuid
+          from json_array_elements(resource->'members') m
+      );
+
+    -- insert new members
     insert into citizen_in_workgroup (workgroup_id, citizen_id, roles)
     select
         new_id::uuid,
-        citizen_id,
-        roles
-    from json_populate_recordset(null::citizen_in_workgroup, resource->'members') m;
+        (m#>>'{citizen,id}')::uuid,
+        json_to_array(m#>'{roles}')
+    from json_array_elements(resource->'members') m
+    on conflict do nothing;
 
     -- insert master if no members
-    if (exists) then
+    if (exists = false) then
         insert into citizen_in_workgroup (workgroup_id, citizen_id, roles)
         select
             new_id::uuid,
diff --git a/src/main/resources/sql/migrations/0000-init_schema.down.sql b/src/main/resources/sql/migrations/0000-init_schema.down.sql
index 8793336..34f0da4 100644
--- a/src/main/resources/sql/migrations/0000-init_schema.down.sql
+++ b/src/main/resources/sql/migrations/0000-init_schema.down.sql
@@ -11,6 +11,7 @@ drop table if exists follow_constitution;
 drop table if exists follow_citizen;
 drop table if exists follow;
 
+drop table if exists vote_cache;
 drop table if exists vote_for_article;
 drop table if exists vote_for_constitution;
 drop table if exists vote_for_comment_on_article;
diff --git a/src/main/resources/sql/resetDB.sh b/src/main/resources/sql/resetDB.sh
index 15b3399..80366ee 100644
--- a/src/main/resources/sql/resetDB.sh
+++ b/src/main/resources/sql/resetDB.sh
@@ -4,6 +4,6 @@ awk 'FNR==1{print "--------------------"}1' \
   ./migrations/*.down.sql \
   ./migrations/*.up.sql \
   ./functions/*/*.sql > ./allSQL.sql
-docker exec -i postgresql_dc-project psql dc-project dc-project -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+docker exec -i dc-project_postgresql psql dc-project dc-project -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
 rm ./allSQL.sql
 echo "End reset"
\ No newline at end of file
diff --git a/src/test/kotlin/ArticleTest.kt b/src/test/kotlin/ArticleTest.kt
deleted file mode 100644
index 3d447c6..0000000
--- a/src/test/kotlin/ArticleTest.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-import fr.dcproject.entity.Article
-import fr.dcproject.entity.CitizenBasic
-import fr.dcproject.entity.CitizenI
-import fr.dcproject.entity.User
-import fr.postgresjson.serializer.deserialize
-import fr.postgresjson.serializer.serialize
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.util.KtorExperimentalAPI
-import org.amshove.kluent.`should equal`
-import org.amshove.kluent.shouldBe
-import org.intellij.lang.annotations.Language
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
-
-@KtorExperimentalLocationsAPI
-@KtorExperimentalAPI
-@TestInstance(PER_CLASS)
-class ArticleTest {
-    @Language("JSON")
-    private val articleJson: String = """
-    {
-      "id": "83b0b60a-5ab3-44f2-b243-1dc469a7564f",
-      "title": "Hello world!",
-      "anonymous": true,
-      "content": "bla bla bla",
-      "description": "this is the changement !",
-      "tags": [],
-      "draft": false,
-      "last_version": false,
-      "created_by": {
-        "id": "94a0d350-7eab-4a6e-9f84-0c2e7635b67c",
-        "name": {
-          "first_name": "Jaque",
-          "last_name": "Bono",
-          "civility": null
-        },
-        "email": "jaque.bono@gmail.com",
-        "birthday": "2020-03-16T01:48:27.020Z",
-        "vote_anonymous": true,
-        "follow_anonymous": true,
-        "user": {
-          "id": "2bc356a2-4d3e-46ff-91f4-ae30fb7fa67d",
-          "username": "jaque",
-          "blocked_at": null,
-          "plain_password": "azerty",
-          "roles": [],
-          "created_at": "2020-03-16T01:48:24.153Z",
-          "updated_at": "2020-03-16T01:48:24.516Z"
-        },
-        "deleted_at": null,
-        "deleted": false
-      },
-      "reference": "article",
-      "views": {
-        "total": 0,
-        "unique": 0,
-        "updated_at": "2020-03-16T01:48:31.070Z"
-      },
-      "version_id": "27cb4f5d-d425-4e10-95ca-6c50fac73408",
-      "version_number": null,
-      "created_at": "2020-03-16T01:48:31.004Z",
-      "deleted_at": null,
-      "deleted": false,
-      "votes": {
-        "up": 0,
-        "neutral": 0,
-        "down": 0,
-        "total": 0,
-        "score": 0,
-        "updated_at": null
-      },
-      "opinions": {}
-    }
-    """.trimIndent()
-
-    @Test
-    fun `test Article serialize`() {
-        val user = User(username = "jaque", plainPassword = "azerty")
-        val citizen = CitizenBasic(
-            name = CitizenI.Name("Jaque", "Bono"),
-            birthday = DateTime.now(),
-            email = "jaque.bono@gmail.com",
-            user = user
-        )
-        val article = Article(
-            title = "Hello world!",
-            content = "bla bla bla",
-            description = "this is the changement !",
-            createdBy = citizen
-        )
-        article.serialize().contains("""Hello world!""") shouldBe true
-    }
-
-    @Test
-    fun `test Article Deserialize`() {
-        val article2: Article = articleJson.deserialize()!!
-        article2.id.toString() `should equal` "83b0b60a-5ab3-44f2-b243-1dc469a7564f"
-    }
-}
diff --git a/src/test/kotlin/ConstitutionTest.kt b/src/test/kotlin/ConstitutionTest.kt
deleted file mode 100644
index bd69fff..0000000
--- a/src/test/kotlin/ConstitutionTest.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-import fr.dcproject.entity.CitizenBasic
-import fr.dcproject.entity.CitizenI
-import fr.dcproject.entity.Constitution
-import fr.dcproject.entity.User
-import fr.postgresjson.serializer.deserialize
-import fr.postgresjson.serializer.serialize
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.util.KtorExperimentalAPI
-import org.amshove.kluent.`should equal`
-import org.amshove.kluent.shouldBe
-import org.intellij.lang.annotations.Language
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
-
-@KtorExperimentalLocationsAPI
-@KtorExperimentalAPI
-@TestInstance(PER_CLASS)
-class ConstitutionTest {
-    @Language("JSON")
-    private val constitutionJson: String = """{  
-       "id":"15814bb6-8d90-4c6a-a456-c3939a8ec75e",
-       "title":"Hello world!",
-       "anonymous":true,
-       "titles":[  
-          {  
-             "id":"8156b66f-a9c8-4fd9-8375-a8a1f42ccfd2",
-             "name":"plop",
-             "rank":0,
-             "created_by":{  
-                "id":"18902d22-245d-4d44-b23d-9f0e82688612",
-                "name":{  
-                   "first_name":"Jaque",
-                   "last_name":"Bono",
-                   "civility":null
-                },
-                "email": "jaque.bono@gmail.com",
-                "birthday":"2019-08-07T20:34:08.013Z",
-                "user_id":null,
-                "vote_anonymous":null,
-                "follow_anonymous":null,
-                "user":{  
-                   "id":"257abe9f-be17-4ad3-ae6a-b1dc9706d5d7",
-                   "username":"jaque",
-                   "blocked_at":null,
-                   "plain_password":"azerty",
-                   "created_at":null,
-                   "updated_at":null
-                },
-                "created_at":null
-             },
-             "created_at":null
-          }
-       ],
-       "created_by":{  
-          "id":"18902d22-245d-4d44-b23d-9f0e82688612",
-          "name":{  
-             "first_name":"Jaque",
-             "last_name":"Bono",
-             "civility":null
-          },
-          "email": "jaque.bono@gmail.com",
-          "birthday":"2019-08-07T20:34:08.013Z",
-          "user_id":null,
-          "vote_anonymous":null,
-          "follow_anonymous":null,
-          "user":{  
-             "id":"257abe9f-be17-4ad3-ae6a-b1dc9706d5d7",
-             "username":"jaque",
-             "plain_password":"azerty"
-          }
-       },
-       "created_at":null,
-       "version_id":"3311a7af-2a62-4e31-b4cd-889f8ead9737",
-       "version_number":null
-    }""".trimIndent()
-
-    @Test
-    fun `test Constitution serialize`() {
-        val user = User(username = "jaque", plainPassword = "azerty")
-        val citizen = CitizenBasic(
-            name = CitizenI.Name("Jaque", "Bono"),
-            email = "jaque.bono@gmail.com",
-            birthday = DateTime.now(),
-            user = user
-        )
-        val title1 = Constitution.Title(
-            name = "plop"
-        )
-        val constitution = Constitution(
-            title = "Hello world!",
-            anonymous = true,
-            titles = mutableListOf(title1),
-            createdBy = citizen
-        )
-        println(constitution.serialize())
-        constitution.serialize().contains("""Hello world!""") shouldBe true
-    }
-
-    @Test
-    fun `test Constitution Deserialize`() {
-        val constitution2: Constitution = constitutionJson.deserialize()!!
-        constitution2.id.toString() `should equal` "15814bb6-8d90-4c6a-a456-c3939a8ec75e"
-    }
-}
diff --git a/src/test/kotlin/FollowTest.kt b/src/test/kotlin/FollowTest.kt
deleted file mode 100644
index 49a7cff..0000000
--- a/src/test/kotlin/FollowTest.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-import fr.dcproject.entity.*
-import fr.postgresjson.serializer.deserialize
-import fr.postgresjson.serializer.serialize
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.util.KtorExperimentalAPI
-import org.amshove.kluent.`should equal`
-import org.amshove.kluent.shouldBe
-import org.intellij.lang.annotations.Language
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
-
-@KtorExperimentalLocationsAPI
-@KtorExperimentalAPI
-@TestInstance(PER_CLASS)
-class FollowTest {
-    @Language("JSON")
-    private val followJson: String = """{  
-       "id":"bae81585-d985-4d7a-9b58-3a13e911688a",
-       "created_by":{  
-          "id":"4a87ad24-187a-46a8-97ab-00b30a24e561",
-          "name":{  
-             "first_name":"Jaque",
-             "last_name":"Bono",
-             "civility":null
-          },
-          "email": "jaque.bono@gmail.com",
-          "birthday":"2019-08-09T11:42:47.168Z",
-          "user_id":null,
-          "vote_anonymous":null,
-          "follow_anonymous":null,
-          "user":{  
-             "id":"721db690-d050-46e6-92b0-056f2e8ba993",
-             "username":"jaque",
-             "blocked_at":null,
-             "plain_password":"azerty",
-             "created_at":"2019-08-09T11:42:47.168Z",
-             "updated_at":"2019-08-09T11:42:47.168Z"
-          },
-          "created_at":"2019-08-09T11:42:47.168Z"
-       },
-       "target":{  
-          "id":"34588ea7-c180-4694-801b-1b5c5a6ed73f",
-          "title":"Hello world!",
-          "anonymous":true,
-          "content":"bla bla bla",
-          "description":"this is the changement !",
-          "tags":[  
-    
-          ],
-          "created_by":{
-             "id":"4a87ad24-187a-46a8-97ab-00b30a24e561",
-             "name":{  
-                "first_name":"Jaque",
-                "last_name":"Bono",
-                "civility":null
-             },
-             "email": "jaque.bono@gmail.com",
-             "birthday":"2019-08-09T11:42:47.168Z",
-             "user_id":null,
-             "vote_anonymous":null,
-             "follow_anonymous":null,
-             "user":{  
-                "id":"721db690-d050-46e6-92b0-056f2e8ba993",
-                "username":"jaque",
-                "blocked_at":null,
-                "plain_password":"azerty",
-                "created_at":"2019-08-09T11:42:47.168Z",
-                "updated_at":"2019-08-09T11:42:47.168Z"
-             }
-          },
-          "version_id":"a4aa7dd4-d174-42d2-9ba5-ae6f1129ffce",
-          "version_number":null,
-          "created_at":null
-       },
-       "created_at":"2019-08-09T11:42:47.168Z"
-    }""".trimIndent()
-
-    @Test
-    fun `test Follow Article serialize`() {
-        val user = User(username = "jaque", plainPassword = "azerty")
-        val citizen = CitizenBasic(
-            name = CitizenI.Name("Jaque", "Bono"),
-            email = "jaque.bono@gmail.com",
-            birthday = DateTime.now(),
-            user = user
-        )
-        val article = Article(
-            title = "Hello world!",
-            content = "bla bla bla",
-            description = "this is the changement !",
-            createdBy = citizen
-        )
-        val follow = Follow(
-            createdBy = citizen,
-            target = article
-        )
-        follow.serialize().contains("""Hello world!""") shouldBe true
-        println(follow.serialize())
-    }
-
-    @Test
-    fun `test Follow Article Deserialize`() {
-        val follow: Follow<ArticleSimple> = followJson.deserialize()!!
-        follow.id.toString() `should equal` "bae81585-d985-4d7a-9b58-3a13e911688a"
-    }
-}
diff --git a/src/test/kotlin/RunCucumberTest.kt b/src/test/kotlin/RunCucumberTest.kt
deleted file mode 100644
index 75578c5..0000000
--- a/src/test/kotlin/RunCucumberTest.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-import feature.KtorServerContext
-import fr.dcproject.Config
-import fr.dcproject.Env.CUCUMBER
-import fr.dcproject.module
-import fr.dcproject.utils.LoggerDelegate
-import fr.postgresjson.connexion.Connection
-import fr.postgresjson.connexion.Requester
-import fr.postgresjson.migration.Migrations
-import io.cucumber.java8.En
-import io.cucumber.java8.Scenario
-import io.cucumber.junit.Cucumber
-import io.cucumber.junit.CucumberOptions
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.server.testing.withTestApplication
-import io.ktor.util.KtorExperimentalAPI
-import kotlinx.coroutines.InternalCoroutinesApi
-import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.get
-import org.slf4j.Logger
-
-var unitialized: Boolean = false
-
-@InternalCoroutinesApi
-@KtorExperimentalAPI
-@KtorExperimentalLocationsAPI
-@RunWith(Cucumber::class)
-@CucumberOptions(plugin = ["pretty"], strict = true)
-class RunCucumberTest : En, KoinTest {
-    private val logger: Logger? by LoggerDelegate()
-
-    @InternalCoroutinesApi
-    val ktorContext = KtorServerContext {
-        module(CUCUMBER)
-    }
-
-    init {
-        if (!unitialized) {
-            Config.database = "test"
-            Config.username = "test"
-            Config.password = "test"
-
-            withTestApplication({ module(CUCUMBER) }) {
-                migrations()
-            }
-            unitialized = true
-        }
-
-        Before(-1) { _: Scenario ->
-            Config.database = "test"
-            Config.username = "test"
-            Config.password = "test"
-            ktorContext.start()
-            //language=PostgreSQL
-            get<Connection>().sendQuery("start transaction;", listOf())
-        }
-
-        After { _: Scenario ->
-            //language=PostgreSQL
-            get<Connection>().sendQuery("rollback;", listOf())
-            ktorContext.stop()
-        }
-    }
-
-    private fun migrations() {
-        Config.database = "test"
-        Config.username = "test"
-        Config.password = "test"
-        val migrations: Migrations = get()
-        migrations.forceAllDown()
-        migrations.run()
-    }
-
-    private fun fixtures() {
-        logger?.info("Fixtures Begin")
-
-        val connection: Connection = get()
-        //language=PostgreSQL
-        connection.sendQuery("""truncate table "user" cascade;""")
-        //language=PostgreSQL
-        connection.sendQuery("""SET fixture.quantity.multiple = '50';""")
-        getFixturesRequester()
-            .getQueries()
-            .sortedBy { it.name }
-            .forEach { it.sendQuery() }
-        logger?.info("Fixtures Done")
-    }
-
-    private fun getFixturesRequester(): Requester {
-        return Requester.RequesterFactory(
-            connection = get(),
-            queriesDirectory = Config.Sql.fixtureFiles
-        ).createRequester()
-    }
-}
diff --git a/src/test/kotlin/VoteTest.kt b/src/test/kotlin/VoteTest.kt
deleted file mode 100644
index 0526eef..0000000
--- a/src/test/kotlin/VoteTest.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-import fr.dcproject.entity.*
-import fr.postgresjson.serializer.deserialize
-import fr.postgresjson.serializer.serialize
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.util.KtorExperimentalAPI
-import org.amshove.kluent.`should equal`
-import org.amshove.kluent.shouldBe
-import org.intellij.lang.annotations.Language
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
-
-@KtorExperimentalLocationsAPI
-@KtorExperimentalAPI
-@TestInstance(PER_CLASS)
-class VoteTest {
-    @Language("JSON")
-    private val voteJson: String = """
-    {
-      "id": "032acc3d-e8c5-4cb2-9297-bec913ff8d9b",
-      "created_by": {
-        "id": "40c65a43-f9f8-45cd-aa31-953376e7c94a",
-        "name": {
-          "first_name": "Jaque",
-          "last_name": "Bono",
-          "civility": null
-        },
-        "email": "jaque.bono@gmail.com",
-        "birthday": "2019-10-01T10:59:40.570Z",
-        "user_id": null,
-        "vote_anonymous": true,
-        "follow_anonymous": true,
-        "user": {
-          "id": "f68df389-fb0d-423e-90fd-a140a9ed29b9",
-          "username": "jaque",
-          "blocked_at": null,
-          "plain_password": "azerty",
-          "roles": [],
-          "created_at": "2019-10-01T10:59:40.570Z",
-          "updated_at": "2019-10-01T10:59:40.570Z"
-        },
-        "deleted": false,
-        "created_at": "2019-10-01T10:59:40.570Z",
-        "updated_at": "2019-10-01T10:59:40.570Z",
-        "deleted_at": null
-      },
-      "target": {
-        "id": "90f28912-7bd5-4f37-a0ea-8620e3817d51",
-        "title": "Hello world!",
-        "anonymous": true,
-        "content": "bla bla bla",
-        "description": "this is the changement !",
-        "tags": [],
-        "draft": false,
-        "last_version": false,
-        "created_by": {
-          "id": "40c65a43-f9f8-45cd-aa31-953376e7c94a",
-          "name": {
-            "first_name": "Jaque",
-            "last_name": "Bono",
-            "civility": null
-          },
-          "email": "jaque.bono@gmail.com",
-          "birthday": "2019-10-01T10:59:40.570Z",
-          "user_id": null,
-          "vote_anonymous": true,
-          "follow_anonymous": true,
-          "user": {
-            "id": "f68df389-fb0d-423e-90fd-a140a9ed29b9",
-            "username": "jaque",
-            "blocked_at": null,
-            "plain_password": "azerty",
-            "roles": [],
-            "created_at": "2019-08-09T11:42:47.168Z",
-            "updated_at": "2019-08-09T11:42:47.168Z"
-          },
-          "deleted": false,
-          "created_at": "2019-08-09T11:42:47.168Z",
-          "deleted_at": "2019-08-09T11:42:47.168Z"
-        },
-        "votes": {
-          "up": 0,
-          "neutral": 0,
-          "down": 0,
-          "updated_at": null
-        },
-        "version_id": "48dad61e-c54b-4f4c-9f66-428f90b94045",
-        "version_number": null,
-        "deleted": false,
-        "created_at": "2019-10-01T10:59:40.570Z",
-        "deleted_at": "2019-10-01T10:59:40.570Z"
-      },
-      "note": -1,
-      "anonymous": true,
-      "updated_at": "2019-10-01T10:59:40.570Z",
-      "created_at": "2019-10-01T10:59:40.570Z"
-    }""".trimIndent()
-
-    @Test
-    fun `test Vote Article serialize`() {
-        val user = User(username = "jaque", plainPassword = "azerty")
-        val citizen = CitizenBasic(
-            name = CitizenI.Name("Jaque", "Bono"),
-            email = "jaque.bono@gmail.com",
-            birthday = DateTime.now(),
-            user = user
-        )
-        val article = Article(
-            title = "Hello world!",
-            content = "bla bla bla",
-            description = "this is the changement !",
-            createdBy = citizen
-        )
-        val vote = Vote(
-            createdBy = citizen,
-            target = article,
-            note = -1
-        )
-        vote.serialize().contains("""Hello world!""") shouldBe true
-        vote.serialize().contains("-1") shouldBe true
-        println(vote.serialize())
-    }
-
-    @Test
-    fun `test Vote Article Deserialize`() {
-        val vote: Vote<Article> = voteJson.deserialize()!!
-        vote.id.toString() `should equal` "032acc3d-e8c5-4cb2-9297-bec913ff8d9b"
-        vote.note.toString() `should equal` "-1"
-    }
-}
diff --git a/src/test/kotlin/assert/Numbers.kt b/src/test/kotlin/assert/Numbers.kt
new file mode 100644
index 0000000..6089078
--- /dev/null
+++ b/src/test/kotlin/assert/Numbers.kt
@@ -0,0 +1,16 @@
+package assert
+
+import kotlin.test.assertTrue
+
+fun <T : Number> T.assertGreaterThan(expected: T, message: String) {
+    assertTrue(expected.toDouble() > this.toDouble(), message)
+}
+infix fun <T : Number> T.assertGreaterThan(expected: T) {
+    assertTrue(expected.toDouble() >= this.toDouble(), "Expected $this greater than $expected")
+}
+fun <T : Number> T.assertLessThan(expected: T, message: String) {
+    assertTrue(expected.toDouble() <= this.toDouble(), message)
+}
+infix fun <T : Number> T.assertLessThan(expected: T) {
+    assertTrue(expected.toDouble() <= this.toDouble(), "Expected $this less than $expected")
+}
diff --git a/src/test/kotlin/feature/ArticleSteps.kt b/src/test/kotlin/feature/ArticleSteps.kt
deleted file mode 100644
index 744c4bf..0000000
--- a/src/test/kotlin/feature/ArticleSteps.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package feature
-
-import fr.dcproject.entity.*
-import fr.dcproject.repository.CommentArticle
-import fr.dcproject.utils.toUUID
-import io.cucumber.datatable.DataTable
-import io.cucumber.java8.En
-import org.joda.time.DateTime
-import org.koin.test.KoinTest
-import org.koin.test.get
-import java.util.*
-import fr.dcproject.entity.Article as ArticleEntity
-import fr.dcproject.entity.Comment as CommentEntity
-import fr.dcproject.entity.User as UserEntity
-import fr.dcproject.repository.Article as ArticleRepository
-import fr.dcproject.repository.Citizen as CitizenRepository
-
-class ArticleSteps : En, KoinTest {
-    init {
-        Given("I have {int} article") { nb: Int ->
-            repeat(nb) {
-                createArticle()
-            }
-        }
-
-        Given("I have article") { extraData: DataTable? ->
-            createArticle(extraData)
-        }
-
-        Given("I have article with ID {string}") { id: String ->
-            createArticle(id = UUID.fromString(id))
-        }
-
-        Given("I have article created by workgroup ID {string}") { id: String ->
-            createArticle(workgroup = WorkgroupRef(UUID.fromString(id)))
-        }
-
-        Given("I have comment created by {word} {word} on article {string}:") { firstName: String, lastName: String, articleId: String, extraData: DataTable? ->
-            commentArticle(articleId, firstName, lastName, extraData)
-        }
-        Given("I have comment created by {word} {word} on article {string}") { firstName: String, lastName: String, articleId: String ->
-            commentArticle(articleId, firstName, lastName)
-        }
-    }
-
-    private fun createArticle(extraData: DataTable? = null, id: UUID? = null, workgroup: WorkgroupRef? = null) {
-        val params = extraData?.asMap<String, String>(String::class.java, String::class.java)
-        val createdByUsername = params?.get("createdBy")
-        val username = (createdByUsername ?: "username" + UUID.randomUUID().toString())
-            .toLowerCase().replace(' ', '-')
-
-        val createdBy = if (createdByUsername != null) {
-            get<CitizenRepository>().findByUsername(username) ?: error("Citizen not exist")
-        } else {
-            val first = "firstName" + UUID.randomUUID().toString()
-            val last = "lastName" + UUID.randomUUID().toString()
-            Citizen(
-                birthday = DateTime.now(),
-                name = CitizenI.Name(
-                    first,
-                    last
-                ),
-                email = "$first@fakeemail.com",
-                user = UserEntity(username = username, plainPassword = "azerty")
-            ).also {
-                get<CitizenRepository>().insertWithUser(it)
-            }
-        }
-
-        val article = ArticleForUpdate(
-            id = id ?: params?.get("id")?.toUUID(),
-            title = "hello",
-            content = "bla bla bla",
-            description = "A super article",
-            createdBy = createdBy,
-            workgroup = workgroup
-        )
-        get<ArticleRepository>().upsert(article)
-    }
-
-    private fun commentArticle(articleId: String, firstName: String, lastName: String, extraData: DataTable? = null, id: UUID? = null) {
-        val params = extraData?.asMap<String, String>(String::class.java, String::class.java)
-
-        val article = get<ArticleRepository>().findById(UUID.fromString(articleId)) ?: error("Article not exist")
-
-        val citizen = get<CitizenRepository>().findByUsername(
-            ("$firstName-$lastName".toLowerCase()).toLowerCase().replace(' ', '-')
-        ) ?: error("Citizen not exist")
-
-        val comment: CommentEntity<ArticleEntity> = CommentEntity(
-            id = id ?: params?.get("id")?.let { UUID.fromString(it) } ?: UUID.randomUUID(),
-            createdBy = citizen,
-            target = article,
-            content = params?.get("content") ?: "hello"
-        )
-        get<CommentArticle>().comment(comment)
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/feature/CitizenSteps.kt b/src/test/kotlin/feature/CitizenSteps.kt
deleted file mode 100644
index fb6408b..0000000
--- a/src/test/kotlin/feature/CitizenSteps.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package feature
-
-import fr.dcproject.entity.Citizen
-import fr.dcproject.entity.CitizenI
-import fr.dcproject.entity.User
-import io.cucumber.datatable.DataTable
-import io.cucumber.java8.En
-import org.joda.time.DateTime
-import org.koin.test.KoinTest
-import org.koin.test.get
-import java.util.*
-import fr.dcproject.repository.Citizen as CitizenRepository
-
-class CitizenSteps : En, KoinTest {
-    init {
-        Given("I have citizen") { extraData: DataTable? ->
-            val params = extraData?.asMap<String, String>(String::class.java, String::class.java)
-            createCitizen(
-                params?.get("firstName") ?: "firstName" + UUID.randomUUID(),
-                params?.get("lastName") ?: "lastName" + UUID.randomUUID(),
-                extraData
-            )
-        }
-
-        Given("I have citizen {word} {word}") { firstName: String, lastName: String ->
-            createCitizen(firstName, lastName)
-        }
-
-        Given("I have citizen {word} {word} with ID {string}") { firstName: String, lastName: String, id: String ->
-            createCitizen(firstName, lastName, id = UUID.fromString(id))
-        }
-    }
-
-    private fun createCitizen(firstName: String, lastName: String, extraData: DataTable? = null, id: UUID? = null) {
-
-        val params = extraData?.asMap<String, String>(String::class.java, String::class.java)
-        val id: UUID = id ?: params?.get("id")?.let { UUID.fromString(it) } ?: UUID.randomUUID()
-        val email = params?.get("email") ?: ("$firstName-$lastName".toLowerCase()) + "@dc-project.fr"
-
-        val user = User(
-            id = id,
-            username = "$firstName-$lastName".toLowerCase(),
-            plainPassword = "azerty"
-        )
-        val citizen = Citizen(
-            id = id,
-            name = CitizenI.Name(firstName, lastName),
-            email = email,
-            birthday = DateTime.now(),
-            user = user
-        )
-
-        get<CitizenRepository>().insertWithUser(citizen)
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/feature/ConstitutionSteps.kt b/src/test/kotlin/feature/ConstitutionSteps.kt
deleted file mode 100644
index eff66c4..0000000
--- a/src/test/kotlin/feature/ConstitutionSteps.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package feature
-
-import fr.dcproject.entity.*
-import fr.dcproject.repository.CommentConstitution
-import fr.dcproject.utils.toUUID
-import io.cucumber.datatable.DataTable
-import io.cucumber.java8.En
-import org.joda.time.DateTime
-import org.koin.test.KoinTest
-import org.koin.test.get
-import java.util.*
-import fr.dcproject.entity.Comment as CommentEntity
-import fr.dcproject.entity.User as UserEntity
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.Constitution as ConstitutionRepository
-
-class ConstitutionSteps : En, KoinTest {
-    init {
-        Given("I have {int} constitution") { nb: Int ->
-            repeat(nb) {
-                createConstitution()
-            }
-        }
-
-        Given("I have constitution") { extraData: DataTable? ->
-            createConstitution(extraData)
-        }
-
-        Given("I have constitution with ID {string}") { id: String? ->
-            createConstitution(id = UUID.fromString(id))
-        }
-
-        Given("I have comment created by {word} {word} on constitution {string}:") { firstName: String, lastName: String, constitutionId: String, extraData: DataTable? ->
-            commentConstitution(constitutionId, firstName, lastName, extraData)
-        }
-        Given("I have comment created by {word} {word} on constitution {string}") { firstName: String, lastName: String, constitutionId: String ->
-            commentConstitution(constitutionId, firstName, lastName)
-        }
-    }
-
-    private fun createConstitution(extraData: DataTable? = null, id: UUID? = null) {
-        val params = extraData?.asMap<String, String>(String::class.java, String::class.java)
-        val createdByUsername = params?.get("createdBy")
-        val username = (createdByUsername ?: "username" + UUID.randomUUID().toString())
-            .toLowerCase().replace(' ', '-')
-
-        val createdBy = if (createdByUsername != null) {
-            get<CitizenRepository>().findByUsername(username) ?: error("Citizen not exist")
-        } else {
-            val first = "firstName" + UUID.randomUUID().toString()
-            val last = "lastName" + UUID.randomUUID().toString()
-            Citizen(
-                birthday = DateTime.now(),
-                name = CitizenI.Name(
-                    first,
-                    last
-                ),
-                email = "$first@fakeemail.com",
-                user = UserEntity(username = username, plainPassword = "azerty")
-            ).also {
-                get<CitizenRepository>().insertWithUser(it)
-            }
-        }
-
-        val title1 = ConstitutionSimple.TitleSimple<ArticleRef>(
-            name = "My Title"
-        )
-
-        val constitution = ConstitutionSimple<CitizenSimple, ConstitutionSimple.TitleSimple<ArticleRef>>(
-            id = id ?: params?.get("id")?.toUUID() ?: UUID.randomUUID(),
-            title = "hello",
-            titles = mutableListOf(title1),
-            anonymous = false,
-            createdBy = createdBy
-        )
-        get<ConstitutionRepository>().upsert(constitution)
-    }
-
-    private fun commentConstitution(
-        constitutionId: String,
-        firstName: String,
-        lastName: String,
-        extraData: DataTable? = null
-    ) {
-        val params = extraData?.asMap<String, String>(String::class.java, String::class.java)
-
-        val constitution =
-            get<ConstitutionRepository>().findById(UUID.fromString(constitutionId)) ?: error("Constitution not exist")
-
-        val citizen = get<CitizenRepository>().findByUsername(
-            ("$firstName-$lastName".toLowerCase()).toLowerCase().replace(' ', '-')
-        ) ?: error("Citizen not exist")
-
-        val comment: CommentEntity<ConstitutionRef> = CommentEntity(
-            id = params?.get("id")?.let { UUID.fromString(it) } ?: UUID.randomUUID(),
-            createdBy = citizen,
-            target = constitution,
-            content = params?.get("content") ?: "hello"
-        )
-        get<CommentConstitution>().comment(comment)
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/feature/FollowSteps.kt b/src/test/kotlin/feature/FollowSteps.kt
deleted file mode 100644
index 026abd5..0000000
--- a/src/test/kotlin/feature/FollowSteps.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package feature
-
-import fr.dcproject.entity.ArticleRef
-import fr.dcproject.entity.ConstitutionRef
-import fr.dcproject.entity.Follow
-import fr.dcproject.utils.toUUID
-import io.cucumber.java8.En
-import org.koin.test.KoinTest
-import org.koin.test.get
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.FollowArticle as FollowArticleRepository
-import fr.dcproject.repository.FollowConstitution as FollowConstitutionRepository
-
-class FollowSteps : En, KoinTest {
-    init {
-        Given("I have follow of {word} {word} on article {string}") { firstName: String, lastName: String, articleId: String ->
-            val username = "$firstName-$lastName".toLowerCase()
-            val citizen = get<CitizenRepository>().findByUsername(username) ?: error("Citizen not exist")
-            val follow = Follow(createdBy = citizen, target = ArticleRef(articleId.toUUID()))
-            get<FollowArticleRepository>().follow(follow)
-        }
-        Given("I have follow of {word} {word} on constitution {string}") { firstName: String, lastName: String, constitutionId: String ->
-            val username = "$firstName-$lastName".toLowerCase()
-            val citizen = get<CitizenRepository>().findByUsername(username) ?: error("Citizen not exist")
-            val follow = Follow(createdBy = citizen, target = ConstitutionRef(constitutionId.toUUID()))
-            get<FollowConstitutionRepository>().follow(follow)
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/feature/KtorServerAuthSteps.kt b/src/test/kotlin/feature/KtorServerAuthSteps.kt
deleted file mode 100644
index 0038a84..0000000
--- a/src/test/kotlin/feature/KtorServerAuthSteps.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package feature
-
-import com.auth0.jwt.JWT
-import fr.dcproject.JwtConfig
-import io.cucumber.java8.En
-import io.ktor.http.HttpHeaders
-import org.koin.test.KoinTest
-import org.koin.test.get
-import fr.dcproject.repository.Citizen as CitizenRepository
-
-class KtorServerAuthSteps : En, KoinTest {
-    init {
-        Given("I am authenticated as {word} {word}") { firstName: String, lastName: String ->
-            val username = "$firstName-$lastName".toLowerCase()
-            val citizen = get<CitizenRepository>().findByUsername(username) ?: error("Cititzen not exist with username $username")
-            val jwtAsString: String = JWT.create()
-                .withIssuer("dc-project.fr")
-                .withClaim("id", citizen.user.id.toString())
-                .sign(JwtConfig.algorithm)
-
-            KtorServerContext.defaultServer.addPreRequestSetup {
-                addHeader(HttpHeaders.Authorization, "Bearer $jwtAsString")
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/feature/KtorServerContext.kt b/src/test/kotlin/feature/KtorServerContext.kt
deleted file mode 100644
index 49751cf..0000000
--- a/src/test/kotlin/feature/KtorServerContext.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package feature
-
-import io.ktor.application.Application
-import io.ktor.server.testing.TestApplicationCall
-import io.ktor.server.testing.TestApplicationEngine
-import io.ktor.server.testing.TestApplicationRequest
-import io.ktor.server.testing.createTestEnvironment
-import java.util.concurrent.TimeUnit
-import kotlin.test.fail
-
-class KtorServerContext(useByDefault: Boolean = true, val module: Application.() -> Unit) {
-
-    init { if (useByDefault) setDefault() }
-
-    companion object {
-        lateinit var defaultServer: KtorServerContext
-    }
-
-    private val engine = TestApplicationEngine(createTestEnvironment())
-
-    private data class RequestSetup(val setup: TestApplicationRequest.() -> Unit, val keepSetup: Boolean = true)
-    private val preRequestSetup = mutableListOf<RequestSetup>()
-
-    var call: TestApplicationCall? = null
-
-    fun addPreRequestSetup(keepSetup: Boolean = true, hook: TestApplicationRequest.() -> Unit) {
-        preRequestSetup.add(RequestSetup(hook, keepSetup))
-    }
-
-    fun handleRequest(setup: TestApplicationRequest.() -> Unit) =
-        try {
-            call = engine.handleRequest {
-                preRequestSetup.forEach { it.setup(this) }
-                setup(this)
-            }
-        } catch (e: Throwable) {
-            fail("Request fail, $e")
-        } finally {
-            preRequestSetup.removeAll { !it.keepSetup }
-        }
-
-    fun setDefault() {
-        defaultServer = this
-    }
-
-    fun start() {
-        engine.start()
-        module(engine.application)
-    }
-
-    fun stop() {
-        engine.stop(0L, 0L, TimeUnit.MILLISECONDS)
-    }
-}
diff --git a/src/test/kotlin/feature/KtorServerRequestSteps.kt b/src/test/kotlin/feature/KtorServerRequestSteps.kt
deleted file mode 100644
index 298c937..0000000
--- a/src/test/kotlin/feature/KtorServerRequestSteps.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package feature
-
-import com.jayway.jsonpath.JsonPath
-import io.cucumber.datatable.DataTable
-import io.cucumber.java8.En
-import io.ktor.http.ContentType
-import io.ktor.http.HttpHeaders
-import io.ktor.http.HttpMethod
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.testing.setBody
-import io.ktor.util.KtorExperimentalAPI
-import kotlinx.serialization.ImplicitReflectionSerializer
-import kotlin.test.assertEquals
-import kotlin.test.assertNotEquals
-
-@ImplicitReflectionSerializer
-@KtorExperimentalAPI
-class KtorServerRequestSteps : En {
-    init {
-        Given("Next request as headers:") { dataTable: DataTable ->
-            KtorServerContext.defaultServer.addPreRequestSetup(false) {
-                dataTable.asMap<String, String>(String::class.java, String::class.java).forEach { key, value ->
-                    this.addHeader(key, value)
-                }
-            }
-        }
-
-        Given("I send a {word} request to {string} with body:") { method: String, uri: String, body: String ->
-            KtorServerContext.defaultServer.handleRequest {
-                this.method = HttpMethod.parse(method)
-                this.uri = uri
-                this.addHeader(HttpHeaders.ContentType, ContentType.Application.Json.toString())
-                setBody(body)
-            }
-        }
-
-        Given("I send a {word} request to {string}") { method: String, uri: String ->
-            KtorServerContext.defaultServer.handleRequest {
-                this.method = HttpMethod.parse(method.toUpperCase())
-                this.uri = uri
-            }
-        }
-
-        Then("the response status code should be {int}") { statusCode: Int ->
-            assertEquals(HttpStatusCode.fromValue(statusCode), KtorServerContext.defaultServer.call?.response?.status())
-        }
-
-        Then("the response should contain object:") { expected: DataTable ->
-            expected.asMap<String, String>(String::class.java, String::class.java).forEach { (key, valueExpected) ->
-                assertEquals(valueExpected, JsonPath.read<Any>(response, key)?.toString() ?: throw AssertionError("\"$key\" element not found on json response"))
-            }
-        }
-
-        Then("the response should not contain object:") { expected: DataTable ->
-            expected.asMap<String, String>(String::class.java, String::class.java).forEach { (key, valueExpected) ->
-                assertNotEquals(valueExpected, JsonPath.read<Any>(response, key)?.toString() ?: throw AssertionError("\"$key\" element not found on json response"))
-            }
-        }
-
-        Then("print last response") {
-            print(KtorServerContext.defaultServer.call?.response?.content)
-        }
-    }
-
-    private val response: String?
-        get() = KtorServerContext.defaultServer.call?.response?.content
-}
diff --git a/src/test/kotlin/feature/KtorServerRestSteps.kt b/src/test/kotlin/feature/KtorServerRestSteps.kt
deleted file mode 100644
index 89bb931..0000000
--- a/src/test/kotlin/feature/KtorServerRestSteps.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package feature
-
-import io.cucumber.datatable.DataTable
-import io.cucumber.java8.En
-import kotlinx.serialization.ImplicitReflectionSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.parse
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-import kotlin.test.fail
-
-@ImplicitReflectionSerializer
-class KtorServerRestSteps : En {
-    init {
-        Then("the JSON should contain:") { dataTable: DataTable ->
-            dataTable.asMap<String, String>(String::class.java, String::class.java).forEach { (key, value) ->
-                val jsonPrimitive = findJsonElement(key) as? JsonPrimitive ?: fail("\"$key\" element isn't json primitive")
-                assertEquals(jsonPrimitive.content, value)
-            }
-        }
-
-        Then("the JSON element {word} should have {int} item(s)") { node: String, count: Int ->
-            val jsonArray = findJsonElement(node) as? JsonArray ?: fail("\"$node\" element isn't json array")
-            assertEquals(count, jsonArray.size)
-        }
-
-        Then("the JSON should have {int} item(s)") { count: Int ->
-            val jsonArray = responseJsonElement as? JsonArray ?: fail("The json response isn't array")
-            assertEquals(count, jsonArray.size)
-        }
-
-        Then("the Response should be:") { body: String ->
-            assertEquals(body, response)
-        }
-
-        Then("the Response should contain:") { body: String ->
-            assertTrue(response.contains(body))
-        }
-    }
-
-    private fun findJsonElement(path: String): JsonElement {
-        var jsonElement: JsonElement = responseJsonElement
-
-        path
-            .split("].", "]", "[", ".")
-            .filter { it.trim().isNotBlank() }
-            .map { it.trim() }
-            .forEach {
-                jsonElement = if (jsonElement is JsonArray) {
-                    jsonElement.jsonArray[it.toInt()]
-                } else {
-                    jsonElement.jsonObject[it]
-                } ?: throw AssertionError("\"$path\" element not found on json response")
-            }
-
-        return jsonElement
-    }
-
-    private val responseJsonElement: JsonElement
-        get() = Json.parse(KtorServerContext.defaultServer.call?.response?.content ?: fail("The response isn't valid JSON"))
-
-    private val response: String
-        get() = KtorServerContext.defaultServer.call?.response?.content ?: fail("The response isn't valid")
-}
diff --git a/src/test/kotlin/feature/OpinionSteps.kt b/src/test/kotlin/feature/OpinionSteps.kt
deleted file mode 100644
index d94900f..0000000
--- a/src/test/kotlin/feature/OpinionSteps.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package feature
-
-import fr.dcproject.entity.OpinionArticle
-import fr.dcproject.entity.OpinionChoice
-import fr.dcproject.utils.toUUID
-import io.cucumber.datatable.DataTable
-import io.cucumber.java8.En
-import org.koin.test.KoinTest
-import org.koin.test.get
-import java.util.*
-import fr.dcproject.repository.Article as ArticleRepository
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.OpinionArticle as OpinionRepository
-import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository
-
-class OpinionSteps : En, KoinTest {
-    init {
-        Given("I have an opinion choice {string}") { name: String ->
-            val opinionChoice = OpinionChoice(
-                name = name,
-                target = listOf()
-            )
-            get<OpinionRepository>().upsertOpinionChoice(opinionChoice)
-        }
-
-        Given("I have an opinion choice {string} with ID {string}") { name: String, id: String ->
-            val opinionChoice = OpinionChoice(
-                id = id.toUUID(),
-                name = name,
-                target = listOf()
-            )
-            get<OpinionRepository>().upsertOpinionChoice(opinionChoice)
-        }
-
-        Given("I have an opinion {string} on article {string} created by {word} {word}") { opinionChoiceName: String, articleId: String, firstName: String, lastName: String ->
-            createOpinion(opinionChoiceName, articleId, firstName, lastName)
-        }
-
-        Given("I have an opinion {string} on article {string} created by {word} {word} with ID {string}") { opinionChoiceName: String, articleId: String, firstName: String, lastName: String, id: String ->
-            createOpinion(opinionChoiceName, articleId, firstName, lastName, id)
-        }
-
-        Given("I have an opinion") { extraInfo: DataTable ->
-            createOpinionOnArticle(extraInfo)
-        }
-    }
-
-    private fun createOpinion(
-        opinionChoiceName: String,
-        articleId: String,
-        firstName: String,
-        lastName: String,
-        id: String? = null
-    ) {
-        val opinion = OpinionArticle(
-            id = id?.toUUID() ?: UUID.randomUUID(),
-            choice = get<OpinionChoiceRepository>().findOpinionsChoiceByName(opinionChoiceName)
-                ?: error("Opinion Choice not exist"),
-            target = get<ArticleRepository>().findById(articleId.toUUID()) ?: error("Article not exist"),
-            createdBy = get<CitizenRepository>().findByUsername("$firstName-$lastName".toLowerCase().replace(' ', '-'))
-                ?: error("Citizen not exist")
-        )
-        get<OpinionRepository>().addOpinion(opinion)
-    }
-
-    private fun createOpinionOnArticle(extraInfo: DataTable? = null) {
-        val params = extraInfo?.asMap<String, String>(String::class.java, String::class.java)
-        val username = params?.get("createdBy")?.toLowerCase()?.replace(' ', '-')
-            ?: error("You must provide the 'createdBy' parameter")
-        val opinion = OpinionArticle(
-            choice = params["opinion"]?.let {
-                get<OpinionChoiceRepository>().findOpinionsChoiceByName(it) ?: error("Opinion Choice not exist")
-            } ?: error("You must provide the 'opinion' parameter"),
-            target = params["article"]?.let {
-                get<ArticleRepository>().findById(it.toUUID()) ?: error("Article not exist")
-            } ?: error("You must provide the 'article' parameter"),
-            createdBy = get<CitizenRepository>().findByUsername(username) ?: error("Citizen not exist")
-        )
-        get<OpinionRepository>().updateOpinions(opinion.choice, opinion.createdBy, opinion.target)
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/feature/VoteSteps.kt b/src/test/kotlin/feature/VoteSteps.kt
deleted file mode 100644
index 8fd8da7..0000000
--- a/src/test/kotlin/feature/VoteSteps.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package feature
-
-import fr.dcproject.entity.Vote
-import fr.dcproject.utils.toUUID
-import io.cucumber.java8.En
-import org.koin.test.KoinTest
-import org.koin.test.get
-import java.util.*
-import fr.dcproject.repository.Article as ArticleRepository
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.VoteArticle as VoteRepository
-
-class VoteSteps : En, KoinTest {
-    init {
-        Given("I have an vote {int} on article {string} created by {word} {word}") { note: Int, articleId: String, firstName: String, lastName: String ->
-            createVote(note, articleId, firstName, lastName)
-        }
-
-        Given("I have an vote {int} on article {string} created by {word} {word} with ID {string}") { note: Int, articleId: String, firstName: String, lastName: String, id: String ->
-            createVote(note, articleId, firstName, lastName, id)
-        }
-    }
-
-    private fun createVote(note: Int, articleId: String, firstName: String, lastName: String, id: String? = null) {
-        val vote = Vote(
-            id = id?.toUUID() ?: UUID.randomUUID(),
-            note = note,
-            target = get<ArticleRepository>().findById(articleId.toUUID()) ?: error("Article not exist"),
-            createdBy = get<CitizenRepository>().findByUsername("$firstName-$lastName".toLowerCase().replace(' ', '-')) ?: error("Citizen not exist")
-        )
-        get<VoteRepository>().vote(vote)
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/feature/WorkgroupSteps.kt b/src/test/kotlin/feature/WorkgroupSteps.kt
deleted file mode 100644
index 6c361a9..0000000
--- a/src/test/kotlin/feature/WorkgroupSteps.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package feature
-
-import fr.dcproject.entity.*
-import fr.dcproject.entity.WorkgroupWithMembersI.Member
-import fr.dcproject.utils.toUUID
-import io.cucumber.datatable.DataTable
-import io.cucumber.java8.En
-import org.joda.time.DateTime
-import org.junit.Assert
-import org.koin.test.KoinTest
-import org.koin.test.get
-import java.util.*
-import fr.dcproject.repository.Citizen as CitizenRepository
-import fr.dcproject.repository.Workgroup as WorkgroupRepository
-
-class WorkgroupSteps : En, KoinTest {
-    init {
-        When("I have members in workgroup {string}:") { workgroupId: String, members: DataTable ->
-            val membersRefs = members.asList()
-                .map { Member(
-                    citizen = CitizenRef(it.toUUID()),
-                    roles = listOf(Member.Role.MASTER)
-                ) }
-
-            get<WorkgroupRepository>().addMembers(WorkgroupRef(workgroupId.toUUID()), membersRefs)
-        }
-
-        When("I have workgroup:") { body: DataTable ->
-            val data = body.asMap<String, String>(String::class.java, String::class.java)
-
-            val creator = data["created_by"]?.let {
-                get<CitizenRepository>().findByUsername(it.toLowerCase().replace(' ', '-'))
-            } ?: kotlin.run {
-                val username = "paul-langevin".toLowerCase() + UUID.randomUUID()
-                val user = User(
-                    username = username,
-                    plainPassword = "azerty"
-                )
-                Citizen(
-                    name = CitizenI.Name("Paul", "Langevin"),
-                    email = "$username@dc-project.fr",
-                    birthday = DateTime.now(),
-                    user = user
-                ).also {
-                    get<CitizenRepository>().insertWithUser(it)
-                }
-            }
-
-            val workgroup = WorkgroupSimple<CitizenRef>(
-                id = UUID.fromString(data["id"] ?: UUID.randomUUID().toString()),
-                name = data["name"] ?: "Les Incoruptible",
-                description = data["description"] ?: "La vie est notre jeux",
-                createdBy = creator,
-                anonymous = (data["anonymous"] ?: false) == true
-            )
-
-            get<WorkgroupRepository>().upsert(workgroup)
-        }
-
-        Then("The workgroup {string} exists") { id: String ->
-            Assert.assertNotNull(get<WorkgroupRepository>().findById(id.toUUID()))
-        }
-
-        Then("The workgroup {string} not exists") { id: String ->
-            Assert.assertNull(get<WorkgroupRepository>().findById(id.toUUID()))
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/MailerTest.kt b/src/test/kotlin/functional/MailerTest.kt
similarity index 72%
rename from src/test/kotlin/MailerTest.kt
rename to src/test/kotlin/functional/MailerTest.kt
index 8118293..f6bbb6a 100644
--- a/src/test/kotlin/MailerTest.kt
+++ b/src/test/kotlin/functional/MailerTest.kt
@@ -1,14 +1,18 @@
+package functional
+
 import com.sendgrid.helpers.mail.Mail
 import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
-import fr.dcproject.Env
-import fr.dcproject.messages.Mailer
-import fr.dcproject.module
+import fr.dcproject.application.Env.TEST
+import fr.dcproject.application.module
+import fr.dcproject.common.email.Mailer
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.server.testing.withTestApplication
 import io.ktor.util.KtorExperimentalAPI
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.koin.test.AutoCloseKoinTest
@@ -18,15 +22,17 @@ import org.koin.test.get
 @KtorExperimentalLocationsAPI
 @KtorExperimentalAPI
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("functional"))
 class MailerTest : KoinTest, AutoCloseKoinTest() {
     @InternalCoroutinesApi
+    @ExperimentalCoroutinesApi
     @Test
-    @Tag("online")
+    @Tags(Tag("online"))
     fun `can be send an email`() {
-        withTestApplication({ module(Env.TEST) }) {
+        withTestApplication({ module(TEST) }) {
             get<Mailer>().sendEmail {
                 Mail(
-                    Email("sso@dc-project.fr"),
+                    Email("passwordless-auth@dc-project.fr"),
                     "Test",
                     Email("fabrice.lecomte.be@gmail.com"),
                     Content("text/plain", "Email Work !")
@@ -36,4 +42,4 @@ class MailerTest : KoinTest, AutoCloseKoinTest() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/functional/NotificationConsumerTest.kt b/src/test/kotlin/functional/NotificationConsumerTest.kt
new file mode 100644
index 0000000..85302ab
--- /dev/null
+++ b/src/test/kotlin/functional/NotificationConsumerTest.kt
@@ -0,0 +1,126 @@
+package functional
+
+import com.rabbitmq.client.ConnectionFactory
+import com.rabbitmq.client.ShutdownSignalException
+import fr.dcproject.application.Configuration
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.follow.database.FollowArticleRepository
+import fr.dcproject.component.follow.database.FollowForView
+import fr.dcproject.component.notification.ArticleUpdateNotification
+import fr.dcproject.component.notification.NotificationConsumer
+import fr.dcproject.component.notification.NotificationEmailSender
+import fr.dcproject.component.notification.Publisher
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.util.KtorExperimentalAPI
+import io.lettuce.core.RedisClient
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.slf4j.LoggerFactory
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+@Tags(Tag("functional"))
+class NotificationConsumerTest {
+    companion object {
+        @BeforeAll
+        @JvmStatic
+        fun before() {
+            val config: Configuration = Configuration("application-test.conf")
+            RedisClient.create(config.redis).connect().sync().flushall()
+
+            /* Purge rabbit notification queues */
+            ConnectionFactory()
+                .apply { setUri(config.rabbitmq) }
+                .run {
+                    newConnection().createChannel().apply {
+                        try {
+                            queuePurge("push")
+                            queuePurge("email")
+                        } catch (e: ShutdownSignalException) {
+                            LoggerFactory.getLogger(NotificationConsumerTest::class.qualifiedName).run {
+                                info("queue not exist")
+                            }
+                        }
+                    }
+                }
+        }
+    }
+
+    @InternalCoroutinesApi
+    @KtorExperimentalLocationsAPI
+    @KtorExperimentalAPI
+    @ExperimentalCoroutinesApi
+    @Test
+    fun `can be send notification`() = runBlocking {
+        val config: Configuration = Configuration("application-test.conf")
+        /* Create mocks and spy's */
+        val emailSender = mockk<NotificationEmailSender>() {
+            every { sendEmail(any()) } returns Unit
+        }
+
+        /* Init Spy on redis client */
+        val redisClient = spyk<RedisClient>(RedisClient.create(config.redis))
+        val asyncCommand = spyk(redisClient.connect().async())
+        every { redisClient.connect().async() } returns asyncCommand
+
+        val rabbitFactory: ConnectionFactory = ConnectionFactory().apply { setUri(config.rabbitmq) }
+        val followArticleRepo = mockk<FollowArticleRepository> {
+            every { findFollowsByTarget(any()) } returns flow {
+                FollowForView(
+                    createdBy = CitizenCreator(name = CitizenI.Name("John", "Doe"), email = "john.doe@dc-project.com", user = UserCreator(username = "john-doe")),
+                    target = ArticleRef(),
+                ).let { emit(it) }
+            }
+        }
+
+        /* Config consumer */
+        val consumer = NotificationConsumer(
+            rabbitFactory = rabbitFactory,
+            redisClient = redisClient,
+            followArticleRepo = followArticleRepo,
+            followConstitutionRepo = mockk(),
+            notificationEmailSender = emailSender,
+            exchangeName = "notification",
+        ).apply { start() }
+
+        /* Push message */
+        Publisher(
+            factory = rabbitFactory,
+            exchangeName = "notification",
+        ).publish(
+            ArticleUpdateNotification(
+                ArticleForView(
+                    title = "MyTitle",
+                    content = "myContent",
+                    description = "myDescription",
+                    createdBy = CitizenCreator(
+                        name = CitizenI.Name(firstName = "", lastName = ""),
+                        email = "",
+                        user = UserCreator(username = ""),
+                    )
+                )
+            )
+        ).await()
+
+        /* Check if notifications sent */
+        verify(timeout = 2000) { followArticleRepo.findFollowsByTarget(any()) }
+        verify(timeout = 2000) { emailSender.sendEmail(any()) }
+        verify(timeout = 2000) { asyncCommand.zadd(any<String>(), any<Double>(), any<String>()) }
+
+        consumer.close()
+    }
+}
diff --git a/src/test/kotlin/functional/NotificationsPushTest.kt b/src/test/kotlin/functional/NotificationsPushTest.kt
new file mode 100644
index 0000000..9c266d7
--- /dev/null
+++ b/src/test/kotlin/functional/NotificationsPushTest.kt
@@ -0,0 +1,120 @@
+package functional
+
+import com.rabbitmq.client.ConnectionFactory
+import fr.dcproject.application.Configuration
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.notification.ArticleUpdateNotification
+import fr.dcproject.component.notification.Notification
+import fr.dcproject.component.notification.NotificationsPush
+import io.lettuce.core.RedisClient
+import io.mockk.every
+import io.mockk.spyk
+import io.mockk.verify
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.runBlocking
+import org.amshove.kluent.`should be equal to`
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
+
+@Tags(Tag("functional"))
+internal class NotificationsPushTest {
+    companion object {
+        @BeforeAll
+        @JvmStatic
+        fun before() {
+            val config: Configuration = Configuration("application-test.conf")
+            RedisClient.create(config.redis).connect().sync().flushall()
+
+            /* Purge rabbit notification queues */
+            ConnectionFactory()
+                .apply { setUri(config.rabbitmq) }
+                .newConnection().createChannel().apply {
+                    queuePurge("push")
+                    queuePurge("email")
+                }
+        }
+    }
+
+    @Test
+    fun `Notification from redis is well catch and return`() = runBlocking {
+        val config: Configuration = Configuration("application-test.conf")
+        /* Redis client for test */
+        val redisClientTest = RedisClient.create(config.redis)
+
+        /* Init Spy on redis client */
+        val redisClient = spyk<RedisClient>(RedisClient.create(config.redis))
+        val asyncCommand = spyk(redisClient.connect().async())
+        every { redisClient.connect().async() } returns asyncCommand
+
+        /* Citizen of notification */
+        val citizen = CitizenCreator(
+            name = CitizenI.Name(firstName = "", lastName = ""),
+            email = "",
+            user = UserCreator(username = ""),
+        )
+        /* Article is the target of the notification */
+        val article = ArticleForView(
+            content = "content..",
+            createdBy = citizen,
+            description = "desc",
+            title = "Super Title",
+        )
+        /* Init two notification, one called before subscription, and the other after */
+        val notifBeforeSubscribe = ArticleUpdateNotification(article)
+        runBlocking {
+            delay(100)
+        }
+        val notifAfterSubscribe = ArticleUpdateNotification(article)
+
+        /* init event for emulate incomint message from websocket */
+        val event = MutableSharedFlow<Notification>()
+        val incomingFlow = event.asSharedFlow()
+
+        spyk(object { var counter = 0 }).run { /* Counter for count the callback of notification */
+            /* Sent notification */
+            redisClientTest.connect().run {
+                sync().zadd(
+                    "notification:${citizen.id}",
+                    notifBeforeSubscribe.id,
+                    notifBeforeSubscribe.toString()
+                )
+                close()
+            }
+
+            /* Init NotificationPush system, and set assertion in callback */
+            val notificationPush = NotificationsPush.Builder(redisClient).build(citizen, incomingFlow) {
+                counter++
+                if (counter == 1) it.id `should be equal to` notifBeforeSubscribe.id
+                else it.id `should be equal to` notifAfterSubscribe.id
+            }
+
+            /* Sent the notification */
+            redisClientTest.connect().run {
+                sync().zadd(
+                    "notification:${citizen.id}",
+                    notifAfterSubscribe.id,
+                    notifAfterSubscribe.toString()
+                )
+                close()
+            }
+
+            /* Verify if the callback is called 2 times */
+            verify(exactly = 4, timeout = 200) { counter }
+            assertEquals(2, counter, "The notification must be call 2 times")
+
+            /* Emit an event to delete notification */
+            event.emit(notifAfterSubscribe)
+            /* Verify the "mark as read" is called */
+            verify(timeout = 500) { asyncCommand.zremrangebyscore(any(), any()) }
+            notificationPush.close()
+        }
+    }
+}
diff --git a/src/test/kotlin/utils/ResourcesKtTest.kt b/src/test/kotlin/functional/ResourcesKtTest.kt
similarity index 74%
rename from src/test/kotlin/utils/ResourcesKtTest.kt
rename to src/test/kotlin/functional/ResourcesKtTest.kt
index 5e44dae..34f3ff4 100644
--- a/src/test/kotlin/utils/ResourcesKtTest.kt
+++ b/src/test/kotlin/functional/ResourcesKtTest.kt
@@ -1,10 +1,14 @@
-package fr.dcproject.utils
+package functional
 
+import fr.dcproject.common.utils.readResource
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("functional"))
 class ResourcesKtTest {
     @Test
     fun readResource() {
@@ -18,4 +22,4 @@ class ResourcesKtTest {
             assertEquals("Hello", it)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/ViewTest.kt b/src/test/kotlin/functional/ViewTest.kt
similarity index 50%
rename from src/test/kotlin/ViewTest.kt
rename to src/test/kotlin/functional/ViewTest.kt
index 6e903e6..d7252db 100644
--- a/src/test/kotlin/ViewTest.kt
+++ b/src/test/kotlin/functional/ViewTest.kt
@@ -1,29 +1,50 @@
-import fr.dcproject.Env
-import fr.dcproject.entity.ArticleRefVersioning
-import fr.dcproject.entity.CitizenRef
-import fr.dcproject.module
-import fr.dcproject.views.ArticleViewManager
+package functional
+
+import fr.dcproject.application.Env.TEST
+import fr.dcproject.application.module
+import fr.dcproject.component.article.ArticleViewManager
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRef
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.server.testing.withTestApplication
 import io.ktor.util.KtorExperimentalAPI
-import org.amshove.kluent.`should equal`
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.amshove.kluent.`should be equal to`
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.koin.ktor.ext.get
-import java.util.*
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 @KtorExperimentalAPI
+@ExperimentalCoroutinesApi
 @TestInstance(PER_CLASS)
+@Tags(Tag("functional"))
 class ViewTest {
     @Test
     fun `test View Article`() {
-        val article = ArticleRefVersioning(id = UUID.randomUUID(), versionId = UUID.randomUUID())
+        val article = ArticleForView(
+            versionId = UUID.randomUUID(),
+            createdBy = CitizenCreator(
+                id = UUID.randomUUID(),
+                name = CitizenI.Name(firstName = "", lastName = ""),
+                email = "",
+                user = UserCreator(username = ""),
+            ),
+            content = "",
+            description = "",
+            title = ""
+        )
         val citizenRef = CitizenRef()
 
-        withTestApplication({ module(Env.TEST) }) {
-            val viewManager: ArticleViewManager = application.get()
+        withTestApplication({ module(TEST) }) {
+            val viewManager: ArticleViewManager<ArticleForView> = application.get()
 
             /* Get view before */
             val startView = viewManager.getViewsCount(article)
@@ -61,8 +82,8 @@ class ViewTest {
             val afterView = viewManager.getViewsCount(article)
 
             /* Check if view has increment */
-            afterView.total `should equal` startView.total + 4
-            afterView.unique `should equal` startView.unique + 3
+            afterView.total `should be equal to` startView.total + 4
+            afterView.unique `should be equal to` startView.unique + 3
         }
     }
 }
diff --git a/src/test/kotlin/integration/Article routes.kt b/src/test/kotlin/integration/Article routes.kt
new file mode 100644
index 0000000..1faa3ba
--- /dev/null
+++ b/src/test/kotlin/integration/Article routes.kt	
@@ -0,0 +1,105 @@
+package integration
+
+import integration.steps.then.`And have property`
+import integration.steps.then.`And the response should contain pattern`
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.`whish contains`
+import integration.steps.then.and
+import integration.steps.given.`Given I have article created by workgroup`
+import integration.steps.given.`Given I have article`
+import integration.steps.given.`Given I have articles`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have workgroup`
+import integration.steps.given.`authenticated as`
+import integration.steps.then.`And the response should contain list`
+import integration.steps.then.`And the response should not contain`
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("article"))
+class `Article routes` : BaseTest() {
+    @Test
+    fun `I can get article list`() {
+        withIntegrationApplication {
+            `Given I have articles`(3)
+            `When I send a GET request`("/articles") `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain pattern`("$.result[0].createdBy.name.firstName", "firstName.+")
+                `And the response should contain pattern`("$.result[1].createdBy.name.firstName", "firstName.+")
+                `And the response should contain pattern`("$.result[2].createdBy.name.firstName", "firstName.+")
+                `And the response should not contain`("$.result[3]")
+                `And the response should contain list`("$.result", 3, 3)
+            }
+        }
+    }
+
+    @Test
+    fun `I can get articles filtered by workgroup`() {
+        withIntegrationApplication {
+            `Given I have articles`(3)
+            `Given I have workgroup`(name = "Les papy", id = "2bccd5a7-9082-4b31-88f8-e25d70b22b12")
+            `Given I have article created by workgroup`("2bccd5a7-9082-4b31-88f8-e25d70b22b12")
+            `When I send a GET request`("/articles?workgroup=2bccd5a7-9082-4b31-88f8-e25d70b22b12") `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And have property`("$.total") `whish contains` 1
+                `And have property`("$.result[0]workgroup.name") `whish contains` "Les papy"
+            }
+        }
+    }
+
+    @Test
+    fun `I can get article by id`() {
+        withIntegrationApplication {
+            `Given I have article`(id = "65cda9f3-8991-4420-8d41-1da9da72c9bb")
+            `When I send a GET request`("/articles/65cda9f3-8991-4420-8d41-1da9da72c9bb") `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And have property`("$.id") `whish contains` "65cda9f3-8991-4420-8d41-1da9da72c9bb"
+            }
+        }
+    }
+
+    @Test
+    fun `I can get versions of article by the id`() {
+        withIntegrationApplication {
+            `Given I have article`(id = "13e6091c-8fed-4600-b079-a97a6b7a9800")
+            `When I send a GET request`("/articles/13e6091c-8fed-4600-b079-a97a6b7a9800/versions") `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And have property`("$.total") `whish contains` 1
+                `And have property`("$.result[0].id") `whish contains` "13e6091c-8fed-4600-b079-a97a6b7a9800"
+            }
+        }
+    }
+
+    @Test
+    fun `I can create an article`() {
+        withIntegrationApplication {
+            `Given I have citizen`("John", "Doe")
+            `When I send a POST request`("/articles") {
+                `authenticated as`("John", "Doe")
+                `with body`("""
+                {
+                  "versionId": "09c418b6-63ba-448b-b38b-502b41cd500e",
+                  "title": "title2",
+                  "anonymous": false,
+                  "content": "content2",
+                  "description": "description2",
+                  "tags": [
+                      "green"
+                  ]
+                }
+                """)
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And have property`("$.versionId") `whish contains` "09c418b6-63ba-448b-b38b-502b41cd500e"
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/BaseTest.kt b/src/test/kotlin/integration/BaseTest.kt
new file mode 100644
index 0000000..e531440
--- /dev/null
+++ b/src/test/kotlin/integration/BaseTest.kt
@@ -0,0 +1,86 @@
+package integration
+
+import com.rabbitmq.client.Channel
+import com.rabbitmq.client.ConnectionFactory
+import fr.dcproject.application.Configuration
+import fr.dcproject.application.Env.TEST
+import fr.dcproject.application.module
+import fr.postgresjson.connexion.Connection
+import fr.postgresjson.migration.Migrations
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.server.testing.TestApplicationEngine
+import io.ktor.server.testing.createTestEnvironment
+import io.ktor.util.KtorExperimentalAPI
+import io.lettuce.core.RedisClient
+import io.lettuce.core.api.sync.RedisCommands
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
+import org.koin.test.KoinTest
+import org.koin.test.get
+
+abstract class BaseTest : KoinTest {
+    companion object {
+        private var init = false
+        private val config = Configuration("application-test.conf")
+        private val redis: RedisCommands<String, String> = RedisClient.create(config.redis).connect().sync()
+        private val rabbit: Channel = ConnectionFactory()
+            .apply { setUri(config.rabbitmq) }
+            .newConnection()
+            .createChannel()
+    }
+
+    private val engine = TestApplicationEngine(createTestEnvironment())
+
+    protected fun <R> withIntegrationApplication(
+        test: TestApplicationEngine.() -> R
+    ): R {
+        return engine.test()
+    }
+
+    @ExperimentalCoroutinesApi
+    @KtorExperimentalAPI
+    @KtorExperimentalLocationsAPI
+    @BeforeAll
+    fun before() {
+        engine.start()
+        engine.application.module(TEST)
+        if (init == false) {
+            init = true
+            get<Migrations>().run {
+                forceAllDown()
+                run()
+            }
+        }
+        get<Connection>()
+            .sendQuery("start transaction;", listOf())
+    }
+
+    @AfterAll
+    fun after() {
+        get<Connection>()
+            .sendQuery("rollback;", listOf())
+        engine.stop(0, 0)
+    }
+
+    @BeforeEach
+    fun beforeEach() {
+        redis.flushall()
+        /* Purge rabbit notification queues */
+        rabbit.run {
+            queuePurge("push")
+            queuePurge("email")
+        }
+
+        get<Connection>()
+            .sendQuery("savepoint test_begin;", listOf())
+    }
+
+    @AfterEach
+    fun afterEach() {
+        get<Connection>()
+            .sendQuery("rollback to savepoint test_begin;", listOf())
+    }
+}
diff --git a/src/test/kotlin/integration/Citizen routes.kt b/src/test/kotlin/integration/Citizen routes.kt
new file mode 100644
index 0000000..b5c2d9b
--- /dev/null
+++ b/src/test/kotlin/integration/Citizen routes.kt	
@@ -0,0 +1,94 @@
+package integration
+
+import integration.steps.`when`.Validate
+import integration.steps.then.`And have property`
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a PUT request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.`whish contains`
+import integration.steps.then.and
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`authenticated as`
+import io.ktor.http.HttpStatusCode.Companion.BadRequest
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("citizen"))
+class `Citizen routes` : BaseTest() {
+    @Test
+    fun `I can get Citizens information`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Jean", "Perrin", id = "5267a5c6-af42-4a02-aa2b-6b71d2e43973")
+            `When I send a GET request`("/citizens") {
+                `authenticated as`("Jean", "Perrin")
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+            }
+        }
+    }
+
+    @Test
+    fun `I can get specific Citizen information`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Linus", "Pauling", id = "47a05c0f-7329-46c3-a7d0-325db37e9114")
+            `When I send a GET request`("/citizens/47a05c0f-7329-46c3-a7d0-325db37e9114") {
+                `authenticated as`("Linus", "Pauling")
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And have property`("$.id") `whish contains` "47a05c0f-7329-46c3-a7d0-325db37e9114"
+            }
+        }
+    }
+
+    @Test
+    fun `I can get my citizen information when I was connected`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Henri", "Becquerel", id = "47356809-c8ef-4649-8b99-1c5cb9886d38")
+            `When I send a GET request`("/citizens/current") {
+                `authenticated as`("Henri", "Becquerel")
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And have property`("$.id") `whish contains` "47356809-c8ef-4649-8b99-1c5cb9886d38"
+            }
+        }
+    }
+
+    @Test
+    fun `I can change my password`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Georges", "Charpak", id = "0c966522-4071-43e5-a3ca-cfff2557f2cf")
+            `When I send a PUT request`("/citizens/0c966522-4071-43e5-a3ca-cfff2557f2cf/password/change") {
+                `authenticated as`("Georges", "Charpak")
+                `with body`("""
+                {
+                  "oldPassword": "azerty",
+                  "newPassword": "qwerty"
+                }
+                """)
+            } `Then the response should be` Created
+        }
+    }
+
+    @Test
+    fun `I cannot change my password if request is bad formatted`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Louis", "Breguet", id = "6cf2a19d-d15d-4ee5-b2a9-907afd26b525")
+            `When I send a PUT request`("/citizens/6cf2a19d-d15d-4ee5-b2a9-907afd26b525/password/change", Validate.ALL - Validate.REQUEST_BODY) {
+                `authenticated as`("Louis", "Breguet")
+                `with body`("""
+                {
+                  "plup": "azerty",
+                  "gloup": "qwerty"
+                }
+                """)
+            } `Then the response should be` BadRequest
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Comment articles routes.kt b/src/test/kotlin/integration/Comment articles routes.kt
new file mode 100644
index 0000000..ba8e850
--- /dev/null
+++ b/src/test/kotlin/integration/Comment articles routes.kt	
@@ -0,0 +1,132 @@
+package integration
+
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import integration.steps.then.`And the response should contain`
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.`when`.`When I send a PUT request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.and
+import integration.steps.given.`Given I have article`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have comment on article`
+import integration.steps.given.`authenticated as`
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("comment"), Tag("article"))
+class `Comment articles routes` : BaseTest() {
+    @Test
+    fun `I can comment article`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Michael", "Faraday")
+            `Given I have article`(id = "aa16c635-28da-46f0-9a89-934eef88c7ca")
+            `When I send a POST request`("/articles/aa16c635-28da-46f0-9a89-934eef88c7ca/comments") {
+                `authenticated as`("Michael", "Faraday")
+                `with body`("""
+                {
+                  "content": "Hello mister"
+                }
+                """)
+            } `Then the response should be` Created and {
+                `And the response should not be null`()
+                `And the response should contain`("$.target.id", "aa16c635-28da-46f0-9a89-934eef88c7ca")
+                `And the response should contain`("$.content", "Hello mister")
+            }
+        }
+    }
+
+    /* TODO add more comment on article */
+    @Test
+    fun `I can get all comment on article`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Enrico", "Fermi")
+            `Given I have article`(id = "6166c078-ca97-4366-b0aa-2a5cd558c78a")
+            `Given I have comment on article`(article = "6166c078-ca97-4366-b0aa-2a5cd558c78a", createdBy = Name("Enrico", "Fermi"))
+            `When I send a GET request`("/articles/6166c078-ca97-4366-b0aa-2a5cd558c78a/comments") {
+                `authenticated as`("Enrico", "Fermi")
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.result[0].target.id", "6166c078-ca97-4366-b0aa-2a5cd558c78a")
+            }
+        }
+    }
+
+    /* TODO add votes */
+    @Test
+    fun `I can get all comment on article sorted by votes`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Pierre", "Curie")
+            `Given I have article`(id = "5e209f63-57ce-43ca-922a-273b0d62f567")
+            `Given I have comment on article`(article = "5e209f63-57ce-43ca-922a-273b0d62f567", createdBy = Name("Pierre", "Curie"))
+            `When I send a GET request`("/articles/5e209f63-57ce-43ca-922a-273b0d62f567/comments?sort=votes") {
+                `authenticated as`("Pierre", "Curie")
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.result[0].votes.up", 0)
+            }
+        }
+    }
+
+    @Test
+    fun `I can get comments on articles of the current citizen`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Erwin", "Schrodinger", id = "292a20cc-4a60-489e-9866-a95d38ffaf47")
+            `Given I have article`(id = "17df7fb9-b388-4e20-ab19-29c29972da01", createdBy = Name("Erwin", "Schrodinger"))
+            `Given I have comment on article`(article = "17df7fb9-b388-4e20-ab19-29c29972da01", createdBy = Name("Erwin", "Schrodinger"))
+            `When I send a GET request`("/citizens/292a20cc-4a60-489e-9866-a95d38ffaf47/comments/articles") {
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.currentPage", 1)
+                `And the response should contain`("$.limit", 50)
+                `And the response should contain`("$.result[0]createdBy.id", "292a20cc-4a60-489e-9866-a95d38ffaf47")
+            }
+        }
+    }
+
+    @Test
+    fun `I can edit comment`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Hubert", "Reeves")
+            `Given I have article`(id = "bb05e4a3-55a1-4088-85e7-8d8c23be29b1")
+            `Given I have comment on article`(article = "bb05e4a3-55a1-4088-85e7-8d8c23be29b1", createdBy = Name("Hubert", "Reeves"), id = "fd30d20f-656c-42c6-8955-f61c04537464")
+            `When I send a PUT request`("/comments/fd30d20f-656c-42c6-8955-f61c04537464") {
+                `authenticated as`("Hubert", "Reeves")
+                `with body`("""
+                {
+                  "content": "Hello boy"
+                }
+                """)
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.content", "Hello boy")
+            }
+        }
+    }
+
+    @Test
+    fun `I can get comment by its ID`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Alfred", "Kastler")
+            `Given I have article`(id = "3897465b-19d2-43a0-86ea-1e29dbb11ec9")
+            `Given I have comment on article`(
+                article = "3897465b-19d2-43a0-86ea-1e29dbb11ec9",
+                createdBy = Name("Alfred", "Kastler"),
+                id = "edd296a8-fc7a-4717-a2bb-9f035ceca3c2",
+                content = "Hello boy"
+            )
+            `When I send a GET request`("/comments/edd296a8-fc7a-4717-a2bb-9f035ceca3c2") {
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.content", "Hello boy")
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Comment constitutions routes.kt b/src/test/kotlin/integration/Comment constitutions routes.kt
new file mode 100644
index 0000000..eaa2020
--- /dev/null
+++ b/src/test/kotlin/integration/Comment constitutions routes.kt	
@@ -0,0 +1,61 @@
+package integration
+
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import integration.steps.then.`And the response should contain list`
+import integration.steps.then.`And the response should contain`
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.and
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have comment on constitution`
+import integration.steps.given.`Given I have constitution`
+import integration.steps.given.`authenticated as`
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("constitution"), Tag("comment"))
+class `Comment constitutions routes` : BaseTest() {
+    @Test
+    fun `I can comment constitution`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Nicolas", "Copernic")
+            `Given I have constitution`(id = "1707c287-a472-4a62-89f2-9e85030e915c")
+            `When I send a POST request`("/constitutions/1707c287-a472-4a62-89f2-9e85030e915c/comments") {
+                `authenticated as`("Nicolas", "Copernic")
+                `with body`("""
+                {
+                  "content": "Hello mister"
+                }
+                """)
+            } `Then the response should be` Created and {
+                `And the response should not be null`()
+            }
+        }
+    }
+
+    @Test
+    fun `I can get comments on constitutions of the current citizen`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Charles", "Darwin", id = "46e0bda9-ca6a-4c65-a58b-7e7267a0bbc5")
+            `Given I have constitution`(id = "34ddd50a-da00-4a90-a869-08baa2a121be", createdBy = Name("Charles", "Darwin"))
+            `Given I have comment on constitution`(constitution = "34ddd50a-da00-4a90-a869-08baa2a121be", createdBy = Name("Charles", "Darwin"))
+            `When I send a GET request`("/citizens/46e0bda9-ca6a-4c65-a58b-7e7267a0bbc5/comments/constitutions") {
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.currentPage", 1)
+                `And the response should contain`("$.limit", 50)
+                `And the response should contain`("$.result[0].createdBy.id", "46e0bda9-ca6a-4c65-a58b-7e7267a0bbc5")
+                `And the response should contain`("$.result[0].target.id", "34ddd50a-da00-4a90-a869-08baa2a121be")
+                `And the response should contain list`("$.result[*]", 1, 1)
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Comment routes.kt b/src/test/kotlin/integration/Comment routes.kt
new file mode 100644
index 0000000..b06a811
--- /dev/null
+++ b/src/test/kotlin/integration/Comment routes.kt	
@@ -0,0 +1,33 @@
+package integration
+
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.then.and
+import integration.steps.given.`Given I have article`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have comment on article`
+import integration.steps.given.`authenticated as`
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("comment"))
+class `Comment routes` : BaseTest() {
+    @Test
+    fun `I can get comments children`() {
+        withIntegrationApplication {
+            `Given I have citizen`("John", "Dalton")
+            `Given I have article`(id = "4c948e8f-eada-4e10-8d7d-7192affe1313")
+            `Given I have comment on article`(id = "da22fc55-b0fd-42a5-a317-9583b1bb93c5", article = "4c948e8f-eada-4e10-8d7d-7192affe1313")
+            `When I send a GET request`("/comments/da22fc55-b0fd-42a5-a317-9583b1bb93c5/children") {
+                `authenticated as`("John", "Dalton")
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Constitution routes.kt b/src/test/kotlin/integration/Constitution routes.kt
new file mode 100644
index 0000000..da77887
--- /dev/null
+++ b/src/test/kotlin/integration/Constitution routes.kt	
@@ -0,0 +1,111 @@
+package integration
+
+import integration.steps.`when`.Validate
+import integration.steps.then.`And have property`
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.`whish contains`
+import integration.steps.then.and
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have constitution`
+import integration.steps.given.`Given I have constitutions`
+import integration.steps.given.`authenticated as`
+import io.ktor.http.HttpStatusCode.Companion.BadRequest
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("constitution"))
+class `Constitution routes` : BaseTest() {
+    @Test
+    fun `I can get constitution list`() {
+        withIntegrationApplication {
+            `Given I have constitutions`(3)
+            `When I send a GET request`("/constitutions") `Then the response should be` OK and {
+                `And the response should not be null`()
+            }
+        }
+    }
+
+    @Test
+    fun `I can get constitution by ID`() {
+        withIntegrationApplication {
+            `Given I have constitutions`(3)
+            `Given I have constitution`("0321c8d1-4ce3-4763-b5f4-a92611d280b4")
+            `When I send a GET request`("/constitutions/0321c8d1-4ce3-4763-b5f4-a92611d280b4") `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And have property`("$.id") `whish contains` "0321c8d1-4ce3-4763-b5f4-a92611d280b4"
+            }
+        }
+    }
+
+// TODO implement constitution versions
+
+//    @Test
+//    fun `I can get versions of constitution by the id`() {
+//        withIntegrationApplication {
+//            `Given I have constitution`(id = "aeefee97-900a-4336-a55a-6b171fc83b73")
+//            `When I send a GET request`("/constitutions/aeefee97-900a-4336-a55a-6b171fc83b73/versions") `Then the response should be` OK and {
+//                `And the response should not be null`()
+//                `And have property`("$.total") `whish contains` 1
+//                `And have property`("$.result[0].id") `whish contains` "aeefee97-900a-4336-a55a-6b171fc83b73"
+//            }
+//        }
+//    }
+
+    @Test
+    fun `I can create an constitution`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Henri", "Poincaré")
+            `When I send a POST request`("/constitutions") {
+                `authenticated as`("Henri", "Poincaré")
+                `with body`("""
+                {
+                   "versionId":"15814bb6-8d90-4c6a-a456-c3939a8ec75e",
+                   "title":"Hello world!",
+                   "anonymous":true,
+                   "titles":[
+                      {
+                         "name":"plop"
+                      }
+                   ]
+                }
+                """)
+            } `Then the response should be` Created and {
+                `And the response should not be null`()
+                `And have property`("$.versionId") `whish contains` "15814bb6-8d90-4c6a-a456-c3939a8ec75e"
+                `And have property`("$.title") `whish contains` "Hello world!"
+            }
+        }
+    }
+
+    @Test
+    fun `I cannot create an constitution if bad request`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Henri", "Poincaré")
+            `When I send a POST request`("/constitutions", Validate.ALL - Validate.REQUEST_BODY) {
+                `authenticated as`("Henri", "Poincaré")
+                `with body`("""
+                {
+                   "versionId":"15814bb6-8d90-4c6a-a456-c3939a8ec75e",
+                   "title":"Hello world!",
+                   "anonymous":true,
+                   "titles":[
+                      {
+                         "name":"plop",
+                         "wrongField":0
+                      }
+                   ]
+                }
+                """)
+            } `Then the response should be` BadRequest
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Follow articles routes.kt b/src/test/kotlin/integration/Follow articles routes.kt
new file mode 100644
index 0000000..4edefd2
--- /dev/null
+++ b/src/test/kotlin/integration/Follow articles routes.kt	
@@ -0,0 +1,88 @@
+package integration
+
+import integration.steps.then.`And the response should be null`
+import integration.steps.then.`And the response should contain`
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a DELETE request`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.then.and
+import integration.steps.given.`And follow article`
+import integration.steps.given.`Given I have article`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`authenticated as`
+import integration.steps.given.`with no content`
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.NoContent
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("article"), Tag("follow"))
+class `Follow articles routes` : BaseTest() {
+    @Test
+    fun `I can follow article`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Louis", "Pasteur")
+            `Given I have article`(id = "04754b7b-edef-4adc-af81-75e3aadeebea")
+            `When I send a POST request`("/articles/04754b7b-edef-4adc-af81-75e3aadeebea/follows") {
+                `authenticated as`("Louis", "Pasteur")
+                `with no content`()
+            } `Then the response should be` Created
+        }
+    }
+
+    @Test
+    fun `I can get my follow article`() {
+        withIntegrationApplication {
+            `Given I have article`(id = "d743619a-1f6b-4d20-a2d6-8e81f0e6a4c8")
+            `Given I have citizen`("Johannes", "Kepler", id = "e4592d53-3660-4264-8353-ebdbf5d9c41c") {
+                `And follow article`("d743619a-1f6b-4d20-a2d6-8e81f0e6a4c8")
+            }
+            `When I send a GET request`("/citizens/e4592d53-3660-4264-8353-ebdbf5d9c41c/follows/articles") {
+                `authenticated as`("Johannes", "Kepler")
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.currentPage", 1)
+                `And the response should contain`("$.limit", 50)
+            }
+        }
+    }
+
+    @Test
+    fun `I can unfollow article`() {
+        withIntegrationApplication {
+            `Given I have article`(id = "aad3aa9d-95fd-4919-9e84-46255f620e31")
+            `Given I have citizen`("Thomas", "Edison") {
+                `And follow article`("aad3aa9d-95fd-4919-9e84-46255f620e31")
+            }
+            `When I send a DELETE request`("/articles/aad3aa9d-95fd-4919-9e84-46255f620e31/follows") {
+                `authenticated as`("Thomas", "Edison")
+                `with no content`()
+            } `Then the response should be` NoContent and {
+                `And the response should be null`()
+            }
+        }
+    }
+
+    @Test
+    fun `I can know if I follow an article`() {
+        withIntegrationApplication {
+            `Given I have article`(id = "3ee4e6d0-f312-4940-872d-1f578c8d824c")
+            `Given I have citizen`("Marie", "Curie") {
+                `And follow article`("3ee4e6d0-f312-4940-872d-1f578c8d824c")
+            }
+            `When I send a GET request`("/articles/3ee4e6d0-f312-4940-872d-1f578c8d824c/follows") {
+                `authenticated as`("Marie", "Curie")
+                `with no content`()
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.target.id", "3ee4e6d0-f312-4940-872d-1f578c8d824c")
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Follow constitutions routes.kt b/src/test/kotlin/integration/Follow constitutions routes.kt
new file mode 100644
index 0000000..fc20797
--- /dev/null
+++ b/src/test/kotlin/integration/Follow constitutions routes.kt	
@@ -0,0 +1,88 @@
+package integration
+
+import integration.steps.then.`And the response should be null`
+import integration.steps.then.`And the response should contain`
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a DELETE request`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.then.and
+import integration.steps.given.`And follow constitution`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have constitution`
+import integration.steps.given.`authenticated as`
+import integration.steps.given.`with no content`
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.NoContent
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("constitution"), Tag("follow"))
+class `Follow constitutions routes` : BaseTest() {
+    @Test
+    fun `I can follow constitution`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Dmitri", "Mendeleïev")
+            `Given I have constitution`(id = "f6553f5e-0cf5-476a-b84e-15e52ec9d8f9")
+            `When I send a POST request`("/constitutions/f6553f5e-0cf5-476a-b84e-15e52ec9d8f9/follows") {
+                `authenticated as`("Dmitri", "Mendeleïev")
+                `with no content`()
+            } `Then the response should be` Created
+        }
+    }
+
+    @Test
+    fun `I can get my follow constitution`() {
+        withIntegrationApplication {
+            `Given I have constitution`(id = "7f642078-8e74-47fc-9712-0c37531674a0")
+            `Given I have citizen`("André-Marie", "Ampère", id = "877b45b0-302d-487d-8944-6d03ccdbd0f8") {
+                `And follow constitution`("7f642078-8e74-47fc-9712-0c37531674a0")
+            }
+            `When I send a GET request`("/citizens/877b45b0-302d-487d-8944-6d03ccdbd0f8/follows/constitutions") {
+                `authenticated as`("André-Marie", "Ampère")
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.currentPage", 1)
+                `And the response should contain`("$.limit", 50)
+            }
+        }
+    }
+
+    @Test
+    fun `I can unfollow constitution`() {
+        withIntegrationApplication {
+            `Given I have constitution`(id = "4ea03776-a28c-4202-9b90-db1b942946c1")
+            `Given I have citizen`("Claude", "Ptolémée") {
+                `And follow constitution`("4ea03776-a28c-4202-9b90-db1b942946c1")
+            }
+            `When I send a DELETE request`("/constitutions/4ea03776-a28c-4202-9b90-db1b942946c1/follows") {
+                `authenticated as`("Claude", "Ptolémée")
+                `with no content`()
+            } `Then the response should be` NoContent and {
+                `And the response should be null`()
+            }
+        }
+    }
+
+    @Test
+    fun `I can know if I follow an constitution`() {
+        withIntegrationApplication {
+            `Given I have constitution`(id = "5141e781-ebcd-4de0-8c2b-7d23d4cd58b5")
+            `Given I have citizen`("Denis", "Papin") {
+                `And follow constitution`("5141e781-ebcd-4de0-8c2b-7d23d4cd58b5")
+            }
+            `When I send a GET request`("/constitutions/5141e781-ebcd-4de0-8c2b-7d23d4cd58b5/follows") {
+                `authenticated as`("Denis", "Papin")
+                `with no content`()
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.target.id", "5141e781-ebcd-4de0-8c2b-7d23d4cd58b5")
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Login routes.kt b/src/test/kotlin/integration/Login routes.kt
new file mode 100644
index 0000000..6489136
--- /dev/null
+++ b/src/test/kotlin/integration/Login routes.kt	
@@ -0,0 +1,54 @@
+package integration
+
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.then.`and should contains`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.`when`.`with body`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`authenticated as`
+import integration.steps.then.and
+import io.ktor.http.HttpStatusCode.Companion.NoContent
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("auth"), Tag("login"))
+class `Login routes` : BaseTest() {
+    @Test
+    fun `I can login with username and password`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Niels", "Bohr")
+            `When I send a POST request`("/login") {
+                `with body`("""
+                {
+                  "username": "niels-bohr",
+                  "password": "azerty"
+                }
+                """)
+            } `Then the response should be` OK and {
+                `And the response should not be null`() `and should contains` "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9."
+                //TODO valid requestBody
+            }
+        }
+    }
+
+    @Test
+    fun `I can be connect with Passwordless auth`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Leonhard", "Euler", "fabrice.lecomte.be@gmail.com", id = "c606110c-ff0e-4d09-a79e-74632d7bf7bd")
+            `When I send a POST request`("/auth/passwordless") {
+                `authenticated as`("Leonhard", "Euler")
+                `with body`("""
+                {
+                  "url": "https://dc-project.fr/password/reset",
+                  "email": "fabrice.lecomte.be@gmail.com"
+                }
+                """)
+            } `Then the response should be` NoContent
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Opinion routes.kt b/src/test/kotlin/integration/Opinion routes.kt
new file mode 100644
index 0000000..7a3815c
--- /dev/null
+++ b/src/test/kotlin/integration/Opinion routes.kt	
@@ -0,0 +1,139 @@
+package integration
+
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import integration.steps.then.`And the response should contain list`
+import integration.steps.then.`And the response should contain`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a PUT request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.and
+import integration.steps.given.`Given I have an opinion choice`
+import integration.steps.given.`Given I have article`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have opinion on article`
+import integration.steps.given.`authenticated as`
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("article"), Tag("opinion"))
+class `Opinion routes` : BaseTest() {
+    @Test
+    fun `I can get all opinion choices`() {
+        withIntegrationApplication {
+            `Given I have an opinion choice`("Opinion1")
+            `Given I have an opinion choice`("Opinion2")
+            `When I send a GET request`("/opinions") {
+            } `Then the response should be` OK and {
+                `And the response should contain`("$.[0]name", "Opinion1")
+                `And the response should contain`("$.[1]name", "Opinion2")
+            }
+        }
+    }
+
+    @Test
+    fun `I can get one opinion choice`() {
+        withIntegrationApplication {
+            `Given I have an opinion choice`("Opinion3", id = "347ec243-0e76-4ab5-9884-7bd503cf5ab5")
+            `When I send a GET request`("/opinions/347ec243-0e76-4ab5-9884-7bd503cf5ab5") {
+            } `Then the response should be` OK and {
+                `And the response should contain`("$.name", "Opinion3")
+            }
+        }
+    }
+
+    @Test
+    fun `I can create opinion on article`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Isaac", "Newton", id = "2f414045-95d9-42ca-a3a9-8cdde52ad253")
+            `Given I have an opinion choice`("Opinion4", id = "0f4f1721-3136-44f1-9f31-1459f3317b15")
+            `Given I have article`(id = "9226c1a3-8091-c3fa-7d0d-c2e98c9bee7b", createdBy = Name("Isaac", "Newton"))
+            `When I send a PUT request`("/articles/9226c1a3-8091-c3fa-7d0d-c2e98c9bee7b/opinions") {
+                `authenticated as`("Isaac", "Newton")
+                `with body`("""
+                {
+                  "ids": [
+                    "0f4f1721-3136-44f1-9f31-1459f3317b15"
+                  ]
+                }
+                """)
+            } `Then the response should be` Created
+        }
+    }
+
+    @Test
+    fun `I can get all opinions of citizen filtered by target ids`() {
+        withIntegrationApplication {
+            `Given I have article`("4eb8a2c6-ba63-4c1e-919f-72017132a54e")
+            `Given I have citizen`("Albert", "Jacquard", id = "c6392fc4-56f5-461b-8015-953a4da3029f")
+            `Given I have an opinion choice`("Opinion5", id = "74d6e105-9aa6-4589-8776-82ce260bb6f4")
+            `Given I have opinion on article`(
+                "Opinion5",
+                article = "4eb8a2c6-ba63-4c1e-919f-72017132a54e",
+                Name("Albert", "Jacquard"),
+                id = "994660e7-e9f4-4ae9-9290-b34d78663c7a"
+            )
+            `When I send a GET request`("/citizens/c6392fc4-56f5-461b-8015-953a4da3029f/opinions?id=4eb8a2c6-ba63-4c1e-919f-72017132a54e") {
+                `authenticated as`("Albert", "Jacquard")
+            } `Then the response should be` OK and {
+                `And the response should contain`("$[0].name", "Opinion5")
+            }
+        }
+    }
+
+    @Test
+    fun `I can receive opinion aggregation with article`() {
+        withIntegrationApplication {
+            `Given I have an opinion choice`("Opinion6")
+            `Given I have an opinion choice`("Opinion7")
+            `Given I have an opinion choice`("Opinion8")
+            `Given I have citizen`("James", "Watt")
+            `Given I have citizen`("Paul", "Langevin")
+            `Given I have article`("bda8940a-6792-4f2b-936a-ba5c805c8487")
+            `Given I have opinion on article`(
+                "Opinion6",
+                article = "bda8940a-6792-4f2b-936a-ba5c805c8487",
+                Name("James", "Watt")
+            )
+            `Given I have opinion on article`(
+                "Opinion7",
+                article = "bda8940a-6792-4f2b-936a-ba5c805c8487",
+                Name("James", "Watt")
+            )
+            `Given I have opinion on article`(
+                "Opinion7",
+                article = "bda8940a-6792-4f2b-936a-ba5c805c8487",
+                Name("Paul", "Langevin")
+            )
+            `When I send a GET request`("/articles/bda8940a-6792-4f2b-936a-ba5c805c8487") `Then the response should be` OK and {
+                `And the response should contain`("$.opinions.Opinion6", 1)
+                `And the response should contain`("$.opinions.Opinion7", 2)
+            }
+        }
+    }
+
+    @Test
+    fun `I can get all my opinion of one article`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Albert", "Einstein", id = "c1542096-3431-432d-8e35-9dc071d4c818")
+            `Given I have an opinion choice`("Opinion9")
+            `Given I have article`("8651b530-ac1b-4214-a784-706781371074")
+            `Given I have opinion on article`(
+                "Opinion9",
+                article = "8651b530-ac1b-4214-a784-706781371074",
+                Name("Albert", "Einstein")
+            )
+            `When I send a GET request`("/citizens/c1542096-3431-432d-8e35-9dc071d4c818/opinions/articles") {
+                `authenticated as`("Albert", "Einstein")
+            } `Then the response should be` OK and {
+                `And the response should contain`("$.result[0].name", "Opinion9")
+                `And the response should contain list`("$.result[*]", 1, 1)
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Register routes.kt b/src/test/kotlin/integration/Register routes.kt
new file mode 100644
index 0000000..c78cdeb
--- /dev/null
+++ b/src/test/kotlin/integration/Register routes.kt	
@@ -0,0 +1,62 @@
+package integration
+
+import integration.steps.`when`.Validate
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.`And the response should be null`
+import integration.steps.then.`And the response should contain pattern`
+import integration.steps.then.`And the response should not be null`
+import integration.steps.then.`Then the response should be`
+import integration.steps.then.and
+import io.ktor.http.HttpStatusCode.Companion.BadRequest
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("auth"), Tag("register"))
+class `Register routes` : BaseTest() {
+    @Test
+    fun `I can register`() {
+        withIntegrationApplication {
+            `When I send a POST request`("/register") {
+                `with body`("""
+                {
+                  "name": {"firstName":"George", "lastName":"MICHEL"},
+                  "birthday": "2001-01-01",
+                  "user":{
+                    "username": "george-junior",
+                    "password": "azerty"
+                  },
+                  "email": "george-junior@gmail.com"
+                }
+                """)
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain pattern`("$.token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.")
+            }
+        }
+    }
+
+    @Test
+    fun `I cannot register if no username was sent`() {
+        withIntegrationApplication {
+            `When I send a POST request`("/register", Validate.ALL - Validate.REQUEST_BODY) {
+                `with body`("""
+                {
+                  "name": {"firstName":"George2", "lastName":"MICHEL2"},
+                  "birthday": "2001-01-01",
+                  "user":{
+                    "password": ""
+                  },
+                  "email": "george-junior@gmail.com"
+                }
+                """)
+            } `Then the response should be` BadRequest and {
+                `And the response should be null`()
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Vote routes.kt b/src/test/kotlin/integration/Vote routes.kt
new file mode 100644
index 0000000..55c6263
--- /dev/null
+++ b/src/test/kotlin/integration/Vote routes.kt	
@@ -0,0 +1,115 @@
+package integration
+
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import integration.steps.then.`And the response should contain`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a PUT request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.and
+import integration.steps.given.`Given I have article`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have comment on article`
+import integration.steps.given.`Given I have constitution`
+import integration.steps.given.`Given I have vote +1 on article`
+import integration.steps.given.`Given I have vote -1 on article`
+import integration.steps.given.`authenticated as`
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("vote"))
+class `Vote routes` : BaseTest() {
+    @Test
+    fun `I can vote article`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Thalès", "Milet")
+            `Given I have article`(id = "835c5101-ca39-4038-a4e6-da6ee62ca6d5")
+            `When I send a PUT request`("/articles/835c5101-ca39-4038-a4e6-da6ee62ca6d5/vote") {
+                `authenticated as`("Thalès", "Milet")
+                `with body`("""
+                {
+                  "note": 1
+                }
+                """)
+            } `Then the response should be` Created
+        }
+    }
+
+    @Test
+    fun `I can vote constitution`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Gregor", "Mendel")
+            `Given I have constitution`(id = "76e79c89-efc1-492d-9e8f-dc9717363a11")
+            `When I send a PUT request`("/constitutions/76e79c89-efc1-492d-9e8f-dc9717363a11/vote") {
+                `authenticated as`("Gregor", "Mendel")
+                `with body`("""
+                {
+                  "note": 1
+                }
+                """)
+            } `Then the response should be` Created
+        }
+    }
+
+    @Test
+    fun `I can get votes of current citizen`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Carl", "Gauss", id = "c044823d-e778-4256-9016-b1334bf933d3")
+            `Given I have article`("7c9286db-470d-448c-aab1-3f0b072213b1")
+            `Given I have vote +1 on article`("7c9286db-470d-448c-aab1-3f0b072213b1", Name("Carl", "Gauss"))
+            `When I send a GET request`("/citizens/c044823d-e778-4256-9016-b1334bf933d3/votes/articles") {
+                `authenticated as`("Carl", "Gauss")
+            } `Then the response should be` OK and {
+                `And the response should contain`("$.currentPage", 1)
+                `And the response should contain`("$.limit", 50)
+                `And the response should contain`("$.total", 1)
+                `And the response should contain`("$.result[0].note", 1)
+            }
+        }
+    }
+
+    @Test
+    fun `I can get votes of current citizen by target ids`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Rosalind", "Franklin", id = "ab3269f0-877b-46b2-ae1a-e7e7d1c12132")
+            `Given I have article`("4d457f53-b937-4622-9542-d5f689d3716b")
+            `Given I have vote +1 on article`("4d457f53-b937-4622-9542-d5f689d3716b", Name("Rosalind", "Franklin"))
+            `Given I have article`("117ef3e6-a740-4d04-9a4a-a800a5f274b4")
+            `Given I have vote -1 on article`("117ef3e6-a740-4d04-9a4a-a800a5f274b4", Name("Rosalind", "Franklin"))
+            `When I send a GET request`("/citizens/ab3269f0-877b-46b2-ae1a-e7e7d1c12132/votes?id=4d457f53-b937-4622-9542-d5f689d3716b&id=117ef3e6-a740-4d04-9a4a-a800a5f274b4") {
+                `authenticated as`("Rosalind", "Franklin")
+            } `Then the response should be` OK and {
+                `And the response should contain`("$[0].note", -1)
+                `And the response should contain`("$[1].note", 1)
+            }
+        }
+    }
+
+    @Test
+    fun `I can vote a comment`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Antoine", "Lavoisier", id = "ab3269f0-877b-46b2-ae1a-e7e7d1c12132")
+            `Given I have article`("54428366-e71e-4961-876c-8a13df5e4b41")
+            `Given I have comment on article`(
+                createdBy = Name("Antoine", "Lavoisier"),
+                article = "54428366-e71e-4961-876c-8a13df5e4b41",
+                id = "e793eccc-456b-4450-a292-46d592229b74",
+            )
+            `When I send a PUT request`("/comments/e793eccc-456b-4450-a292-46d592229b74/vote") {
+                `authenticated as`("Antoine", "Lavoisier")
+                `with body`("""
+                {
+                  "note": -1
+                }
+                """)
+            } `Then the response should be` Created and {
+                `And the response should contain`("$.down", 1)
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/Workgroup routes.kt b/src/test/kotlin/integration/Workgroup routes.kt
new file mode 100644
index 0000000..ad67f4e
--- /dev/null
+++ b/src/test/kotlin/integration/Workgroup routes.kt	
@@ -0,0 +1,253 @@
+package integration
+
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import integration.steps.then.`And the response should be null`
+import integration.steps.then.`And the response should contain list`
+import integration.steps.then.`And the response should contain`
+import integration.steps.then.`Then the response should be`
+import integration.steps.`when`.`When I send a DELETE request`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.`when`.`When I send a PUT request`
+import integration.steps.`when`.`with body`
+import integration.steps.then.and
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have workgroup`
+import integration.steps.given.`With members`
+import integration.steps.given.`authenticated as`
+import integration.steps.given.`with no content`
+import integration.steps.then.`And have property`
+import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.NoContent
+import io.ktor.http.HttpStatusCode.Companion.NotFound
+import io.ktor.http.HttpStatusCode.Companion.OK
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tags(Tag("integration"), Tag("workgroup"))
+class `Workgroup routes` : BaseTest() {
+    @Test
+    fun `I can get one workgroup`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Stephen", "Hawking")
+            `Given I have citizen`("Sadi", "Carnot", id = "be3b0926-8628-4426-804a-75188a6eb315")
+            `Given I have citizen`("Joseph", "Fourier", id = "d9671eca-abaf-4b67-9230-3ece700c1ddb")
+            `Given I have workgroup`(
+                id = "ab469134-bf14-4856-b093-ae1aa990f977",
+                name = "Les Mousquets",
+                createdBy = Name("Stephen", "Hawking")
+            ) {
+                `With members`(
+                    Name("Sadi", "Carnot"),
+                    Name("Joseph", "Fourier"),
+                )
+            }
+            `When I send a GET request`("/workgroups/ab469134-bf14-4856-b093-ae1aa990f977") {
+                `authenticated as`("Stephen", "Hawking")
+            } `Then the response should be` OK and {
+                `And the response should contain`("$.id", "ab469134-bf14-4856-b093-ae1aa990f977")
+                `And the response should contain`("$.name", "Les Mousquets")
+                `And the response should contain`(
+                    "$.members[*].citizen.name[?(@.firstName=='Stephen')].firstName",
+                    "Stephen"
+                )
+                `And the response should contain`(
+                    "$.members[*].citizen.name[?(@.firstName=='Sadi')].firstName",
+                    "Sadi"
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `I can create a workgroup`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Werner", "Heisenberg")
+            `When I send a POST request`("/workgroups") {
+                `authenticated as`("Werner", "Heisenberg")
+                `with body`("""
+                {
+                    "id":"f496d86d-6654-4068-91ff-90e1dbcc5f38",
+                    "name":"Les Bouffons",
+                    "description":"La vie est belle",
+                    "anonymous":false
+                }
+                """)
+            } `Then the response should be` Created and {
+                `And the response should contain`("$.id", "f496d86d-6654-4068-91ff-90e1dbcc5f38")
+                `And the response should contain`("$.name", "Les Bouffons")
+                `And the response should contain`("$.description", "La vie est belle")
+                `And the response should contain`("$.anonymous", false)
+            }
+
+            `When I send a GET request`("/workgroups/f496d86d-6654-4068-91ff-90e1dbcc5f38") {
+                `authenticated as`("Werner", "Heisenberg")
+            } `Then the response should be` OK
+        }
+    }
+
+    @Test
+    fun `I can edit a workgroup`() {
+        withIntegrationApplication {
+            `Given I have citizen`("John", "Wheeler")
+            `Given I have citizen`("Heinrich", "Hertz", id = "94f92424-c257-4582-907c-98564a8c4ac9")
+            `Given I have citizen`("William", "Thomson", id = "87909ba3-2069-431c-9924-219fd8411cf2")
+            `Given I have workgroup`("aa875a24-0050-4252-9130-d37391714e26", createdBy = Name("John", "Wheeler")) {
+                `With members`(
+                    Name("Heinrich", "Hertz"),
+                    Name("William", "Thomson"),
+                )
+            }
+            `When I send a PUT request`("/workgroups/aa875a24-0050-4252-9130-d37391714e26") {
+                `authenticated as`("John", "Wheeler")
+                `with body`("""
+                {
+                    "name":"La ratatouille",
+                    "description":"Une petite souris"
+                }
+                """)
+            } `Then the response should be` OK and {
+                `And the response should contain`("$.id", "aa875a24-0050-4252-9130-d37391714e26")
+                `And the response should contain`("$.name", "La ratatouille")
+                `And the response should contain`("$.description", "Une petite souris")
+
+                `And have property`("$.members")
+                `And the response should contain list`("$.members", 3, 3)
+                `And the response should contain`("$.members.[1]citizen.id", "94f92424-c257-4582-907c-98564a8c4ac9")
+                `And the response should contain`("$.members.[2]citizen.id", "87909ba3-2069-431c-9924-219fd8411cf2")
+            }
+
+            `When I send a GET request`("/workgroups/aa875a24-0050-4252-9130-d37391714e26") {
+                `authenticated as`("John", "Wheeler")
+            } `Then the response should be` OK and {
+                `And the response should contain`("$.id", "aa875a24-0050-4252-9130-d37391714e26")
+                `And the response should contain`("$.name", "La ratatouille")
+                `And the response should contain`("$.description", "Une petite souris")
+            }
+        }
+    }
+
+    @Test
+    fun `I can delete a workgroup`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Louis", "Néel")
+            `Given I have workgroup`("ab469134-bf14-4856-b093-ae1aa990f977", createdBy = Name("Louis", "Néel"))
+            `When I send a DELETE request`("/workgroups/ab469134-bf14-4856-b093-ae1aa990f977") {
+                `authenticated as`("Louis", "Néel")
+                `with no content`()
+            } `Then the response should be` NoContent and {
+                `And the response should be null`()
+            }
+
+            `When I send a GET request`("/workgroups/ab469134-bf14-4856-b093-ae1aa990f977") {
+                `authenticated as`("Louis", "Néel")
+            } `Then the response should be` NotFound
+        }
+    }
+
+    @Test
+    fun `I can get workgroups list`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Max", "Planck")
+            `Given I have workgroup`("3fd8edb6-c4b4-4c94-bc75-ddd9b290d32c")
+            `When I send a GET request`("/workgroups") {
+                `authenticated as`("Max", "Planck")
+                `with no content`()
+            } `Then the response should be` OK and {
+                `And the response should contain`("$.result[0].id", "3fd8edb6-c4b4-4c94-bc75-ddd9b290d32c")
+            }
+        }
+    }
+
+    @Test
+    fun `I can add member to workgroup`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Blaise", "Pascal")
+            `Given I have citizen`("Roger", "Penrose", id = "6d883fe7-5fc0-4a50-8858-72230673eba4")
+            `Given I have citizen`("Alessandro", "Volta", id = "b5bac515-45d4-4aeb-9b6d-2627a0bbc419")
+            `Given I have workgroup`("b0ea1922-3bc6-44e2-aa7c-40158998cfbb", createdBy = Name("Blaise", "Pascal"))
+            `When I send a POST request`("/workgroups/b0ea1922-3bc6-44e2-aa7c-40158998cfbb/members") {
+                `authenticated as`("Blaise", "Pascal")
+                `with body`("""
+                [
+                    {
+                        "citizen": {"id":"6d883fe7-5fc0-4a50-8858-72230673eba4"},
+                        "roles": ["MASTER"]
+                    },
+                    {
+                        "citizen": {"id":"b5bac515-45d4-4aeb-9b6d-2627a0bbc419"},
+                        "roles": ["MASTER"]
+                    }
+                ]
+                """)
+            } `Then the response should be` Created
+        }
+    }
+
+    @Test
+    fun `I can remove member to workgroup`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Heinrich", "Hertz", id = "94f92424-c257-4582-907c-98564a8c4ac9")
+            `Given I have citizen`("William", "Thomson", id = "87909ba3-2069-431c-9924-219fd8411cf2")
+            `Given I have citizen`("Paul", "Dirac", id = "1baf48bb-02bc-4d8f-ac86-33335354f5e7")
+            `Given I have workgroup`("b6c975df-dd44-4e99-adc1-f605746b0e11", createdBy = Name("Heinrich", "Hertz")) {
+                `With members`(
+                    Name("William", "Thomson"),
+                    Name("Paul", "Dirac"),
+                )
+            }
+            `When I send a DELETE request`("/workgroups/b6c975df-dd44-4e99-adc1-f605746b0e11/members") {
+                `authenticated as`("Heinrich", "Hertz")
+                """
+                [
+                  {
+                    "citizen": {"id":"87909ba3-2069-431c-9924-219fd8411cf2"}
+                  }
+                ]
+                """
+            } `Then the response should be` OK and {
+                `And the response should contain list`("$", 2, 2)
+                `And the response should contain`("$.[0]citizen.id", "94f92424-c257-4582-907c-98564a8c4ac9")
+                `And the response should contain`("$.[1]citizen.id", "1baf48bb-02bc-4d8f-ac86-33335354f5e7")
+            }
+        }
+    }
+
+    @Test
+    fun `I can update members on workgroup`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Leon", "Foucault")
+            `Given I have citizen`("Sadi", "Carnot", id = "be3b0926-8628-4426-804a-75188a6eb315")
+            `Given I have citizen`("Joseph", "Fourier", id = "b49e20c1-8393-45d6-a6a0-3fa5c71cbdc1")
+            `Given I have citizen`("Georg", "Ohm")
+            `Given I have workgroup`("784fe6bc-7635-4ae2-b080-3a4743b998bf", createdBy = Name("Leon", "Foucault")) {
+                `With members`(
+                    Name("Sadi", "Carnot"),
+                    Name("Joseph", "Fourier"),
+                )
+            }
+            `When I send a PUT request`("/workgroups/784fe6bc-7635-4ae2-b080-3a4743b998bf/members") {
+                `authenticated as`("Leon", "Foucault")
+                `with body`("""
+                [
+                  {
+                    "citizen": {"id":"be3b0926-8628-4426-804a-75188a6eb315"},
+                    "roles": ["MASTER"]
+                  },
+                  {
+                    "citizen": {"id":"b49e20c1-8393-45d6-a6a0-3fa5c71cbdc1"},
+                    "roles": ["MASTER"]
+                  }
+                ]
+                """)
+            } `Then the response should be` OK and {
+                `And the response should contain list`("$", 2, 2)
+                `And the response should contain`("$.[0]citizen.id", "be3b0926-8628-4426-804a-75188a6eb315")
+                `And the response should contain`("$.[1]citizen.id", "b49e20c1-8393-45d6-a6a0-3fa5c71cbdc1")
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/steps/given/Article.kt b/src/test/kotlin/integration/steps/given/Article.kt
new file mode 100644
index 0000000..a9d978d
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Article.kt
@@ -0,0 +1,54 @@
+package integration.steps.given
+
+import com.thedeanda.lorem.LoremIpsum
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.article.database.ArticleForUpdate
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import fr.dcproject.component.workgroup.database.WorkgroupRef
+import io.ktor.server.testing.TestApplicationEngine
+import org.koin.core.context.GlobalContext
+import java.util.UUID
+
+fun TestApplicationEngine.`Given I have article`(
+    id: String? = null,
+    workgroup: WorkgroupRef? = null,
+    createdBy: Name? = null
+) {
+    createArticle(id?.toUUID(), workgroup, createdBy)
+}
+
+fun TestApplicationEngine.`Given I have articles`(
+    numbers: Int,
+) {
+    repeat(numbers) {
+        createArticle()
+    }
+}
+fun TestApplicationEngine.`Given I have article created by workgroup`(
+    workgroupId: String,
+) {
+    createArticle(workgroup = WorkgroupRef(workgroupId.toUUID()))
+}
+
+fun createArticle(
+    id: UUID? = null,
+    workgroup: WorkgroupRef? = null,
+    createdBy: Name? = null
+): ArticleForView {
+    val articleRepository: ArticleRepository by lazy { GlobalContext.get().koin.get() }
+
+    val citizen = createCitizen(createdBy)
+
+    val article = ArticleForUpdate(
+        id = id ?: UUID.randomUUID(),
+        title = LoremIpsum().getTitle(3),
+        content = LoremIpsum().getParagraphs(1, 2),
+        description = LoremIpsum().getParagraphs(1, 2),
+        createdBy = citizen,
+        workgroup = workgroup,
+        versionId = UUID.randomUUID()
+    )
+    return articleRepository.upsert(article) ?: error("Cannot create article")
+}
diff --git a/src/test/kotlin/integration/steps/given/Auth.kt b/src/test/kotlin/integration/steps/given/Auth.kt
new file mode 100644
index 0000000..d639f81
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Auth.kt
@@ -0,0 +1,26 @@
+package integration.steps.given
+
+import com.auth0.jwt.JWT
+import fr.dcproject.component.auth.jwt.JwtConfig
+import fr.dcproject.component.citizen.database.Citizen
+import fr.dcproject.component.citizen.database.CitizenRepository
+import io.ktor.http.HttpHeaders
+import io.ktor.server.testing.TestApplicationRequest
+import org.koin.core.context.GlobalContext
+
+fun TestApplicationRequest.`authenticated as`(
+    firstName: String,
+    lastName: String,
+): Citizen {
+    val username = "$firstName-$lastName".toLowerCase()
+    val repo: CitizenRepository by lazy<CitizenRepository> { GlobalContext.get().koin.get() }
+    val citizen = repo.findByUsername(username) ?: error("Citizen not exist with username $username")
+    val jwtAsString: String = JWT.create()
+        .withIssuer("dc-project.fr")
+        .withClaim("id", citizen.user.id.toString())
+        .sign(JwtConfig.algorithm)
+
+    addHeader(HttpHeaders.Authorization, "Bearer $jwtAsString")
+
+    return citizen
+}
diff --git a/src/test/kotlin/integration/steps/given/Citizen.kt b/src/test/kotlin/integration/steps/given/Citizen.kt
new file mode 100644
index 0000000..9d81861
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Citizen.kt
@@ -0,0 +1,60 @@
+package integration.steps.given
+
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.auth.database.UserForCreate
+import fr.dcproject.component.citizen.database.Citizen
+import fr.dcproject.component.citizen.database.CitizenForCreate
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRepository
+import io.ktor.server.testing.TestApplicationEngine
+import org.joda.time.DateTime
+import org.koin.core.context.GlobalContext
+import java.util.UUID
+
+fun TestApplicationEngine.`Given I have citizen`(
+    firstName: String,
+    lastName: String,
+    email: String = ("$firstName-$lastName".toLowerCase()) + "@dc-project.fr",
+    id: String = UUID.randomUUID().toString(),
+    callback: Citizen.() -> Unit = {}
+): Citizen? {
+    val repo: CitizenRepository by lazy { GlobalContext.get().koin.get() }
+
+    val user = UserForCreate(
+        id = id.toUUID(),
+        username = "$firstName-$lastName".toLowerCase(),
+        password = "azerty",
+    )
+    val citizen = CitizenForCreate(
+        id = id.toUUID(),
+        name = CitizenI.Name(firstName, lastName),
+        email = email,
+        birthday = DateTime.now(),
+        user = user
+    )
+
+    return repo.insertWithUser(citizen)?.also { callback(it) }
+}
+
+fun createCitizen(createdBy: CitizenI.Name? = null): Citizen {
+    val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
+
+    return if (createdBy != null) {
+        citizenRepository.findByName(createdBy) ?: error("Citizen not exist")
+    } else {
+        val first = "firstName" + UUID.randomUUID().toString()
+        val last = "lastName" + UUID.randomUUID().toString()
+        val username = ("username" + UUID.randomUUID().toString())
+        CitizenForCreate(
+            birthday = DateTime.now(),
+            name = CitizenI.Name(
+                first,
+                last
+            ),
+            email = "$first@fakeemail.com",
+            user = UserForCreate(username = username, password = "azerty")
+        ).let {
+            citizenRepository.insertWithUser(it) ?: error("Unable to create User")
+        }
+    }
+}
diff --git a/src/test/kotlin/integration/steps/given/Comment.kt b/src/test/kotlin/integration/steps/given/Comment.kt
new file mode 100644
index 0000000..20689b5
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Comment.kt
@@ -0,0 +1,89 @@
+package integration.steps.given
+
+import com.thedeanda.lorem.LoremIpsum
+import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import fr.dcproject.component.comment.generic.database.CommentForUpdate
+import fr.dcproject.component.comment.generic.database.CommentRepository
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.dcproject.component.constitution.database.ConstitutionRepository
+import io.ktor.server.testing.TestApplicationEngine
+import org.koin.core.context.GlobalContext
+import java.util.UUID
+
+fun TestApplicationEngine.`Given I have comment on article`(
+    id: String? = null,
+    article: String? = null,
+    createdBy: Name? = null,
+    content: String? = null,
+) {
+    createComment(id?.toUUID(), ArticleRef(article?.toUUID()), createdBy, content)
+}
+
+fun TestApplicationEngine.`Given I have comments on article`(
+    numbers: Int,
+    article: String? = null,
+) {
+    repeat(numbers) {
+        createComment(article = ArticleRef(article?.toUUID()))
+    }
+}
+
+fun createComment(
+    id: UUID? = null,
+    article: ArticleRef? = null,
+    createdBy: Name? = null,
+    content: String? = null
+) {
+    val articleRepository: ArticleRepository by lazy { GlobalContext.get().koin.get() }
+    createCommentOnTarget(
+        id,
+        article?.id?.let { articleRepository.findById(article.id) } ?: createArticle(article?.id),
+        createdBy,
+        content
+    )
+}
+
+fun TestApplicationEngine.`Given I have comment on constitution`(
+    id: String? = null,
+    constitution: String? = null,
+    createdBy: Name? = null,
+    content: String? = null,
+) {
+    createComment(id?.toUUID(), ConstitutionRef(constitution?.toUUID()), createdBy, content)
+}
+
+fun createComment(
+    id: UUID? = null,
+    constitution: ConstitutionRef? = null,
+    createdBy: Name? = null,
+    content: String? = null
+) {
+    val constitutionRepository: ConstitutionRepository by lazy { GlobalContext.get().koin.get() }
+    createCommentOnTarget(
+        id,
+        constitution?.id?.let { constitutionRepository.findById(constitution.id) } ?: createConstitution(constitution?.id),
+        createdBy,
+        content
+    )
+}
+
+fun createCommentOnTarget(
+    id: UUID? = null,
+    target: TargetI,
+    createdBy: Name? = null,
+    content: String? = null
+) {
+    val commentRepository: CommentRepository by lazy { GlobalContext.get().koin.get() }
+    val creator = createCitizen(createdBy)
+    val comment = CommentForUpdate(
+        id = id ?: UUID.randomUUID(),
+        createdBy = creator,
+        target = target,
+        content = content ?: LoremIpsum().getParagraphs(1, 3)
+    )
+    commentRepository.comment(comment)
+}
diff --git a/src/test/kotlin/integration/steps/given/Constitution.kt b/src/test/kotlin/integration/steps/given/Constitution.kt
new file mode 100644
index 0000000..6227099
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Constitution.kt
@@ -0,0 +1,59 @@
+package integration.steps.given
+
+import com.thedeanda.lorem.LoremIpsum
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import fr.dcproject.component.citizen.database.CitizenWithUserI
+import fr.dcproject.component.constitution.database.ConstitutionForUpdate
+import fr.dcproject.component.constitution.database.ConstitutionForUpdate.TitleForUpdate
+import fr.dcproject.component.constitution.database.ConstitutionForView
+import fr.dcproject.component.constitution.database.ConstitutionRepository
+import io.ktor.server.testing.TestApplicationEngine
+import org.koin.core.context.GlobalContext
+import java.util.UUID
+
+fun TestApplicationEngine.`Given I have constitution`(
+    id: String? = null,
+    titles: List<TitleForUpdate<ArticleRef>>? = null,
+    createdBy: Name? = null
+) {
+    createConstitution(id?.toUUID(), titles, createdBy)
+}
+
+fun TestApplicationEngine.`Given I have constitutions`(
+    numbers: Int,
+) {
+    repeat(numbers) {
+        createConstitution()
+    }
+}
+
+fun createTitles(nbr: Int): List<TitleForUpdate<ArticleRef>> = sequence {
+    repeat(nbr) {
+        yield(createTitle())
+    }
+}.toList()
+
+fun createTitle(): TitleForUpdate<ArticleRef> {
+    return TitleForUpdate(name = LoremIpsum().getTitle(3))
+}
+
+fun createConstitution(
+    id: UUID? = null,
+    titles: List<TitleForUpdate<ArticleRef>>? = null,
+    createdBy: Name? = null
+): ConstitutionForView {
+    val constitutionRepository: ConstitutionRepository by lazy { GlobalContext.get().koin.get() }
+
+    val creator: CitizenWithUserI = createCitizen(createdBy)
+
+    val constitution = ConstitutionForUpdate(
+        id = id ?: UUID.randomUUID(),
+        title = LoremIpsum().getTitle(3),
+        titles = titles ?: createTitles(5),
+        createdBy = creator,
+        versionId = UUID.randomUUID()
+    )
+    return constitutionRepository.upsert(constitution) ?: error("Cannot create constitution")
+}
diff --git a/src/test/kotlin/integration/steps/given/Follow.kt b/src/test/kotlin/integration/steps/given/Follow.kt
new file mode 100644
index 0000000..084f09d
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Follow.kt
@@ -0,0 +1,57 @@
+package integration.steps.given
+
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.citizen.database.Citizen
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.citizen.database.CitizenRepository
+import fr.dcproject.component.constitution.database.ConstitutionRef
+import fr.dcproject.component.follow.database.FollowArticleRepository
+import fr.dcproject.component.follow.database.FollowConstitutionRepository
+import fr.dcproject.component.follow.database.FollowForUpdate
+import io.ktor.server.testing.TestApplicationEngine
+import org.koin.core.context.GlobalContext
+
+fun Citizen.`And follow article`(
+    article: String,
+) {
+    createFollow(this, ArticleRef(article.toUUID()))
+}
+
+fun Citizen.`And follow constitution`(
+    constitution: String,
+) {
+    createFollow(this, ConstitutionRef(constitution.toUUID()))
+}
+
+fun TestApplicationEngine.`Given I have follow on article`(
+    firstName: String,
+    lastName: String,
+    article: String,
+) {
+    val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
+    val citizen = citizenRepository.findByUsername("$firstName-$lastName".toLowerCase()) ?: error("Citizen not exist")
+    createFollow(citizen, ArticleRef(article.toUUID()))
+}
+
+fun TestApplicationEngine.`Given I have follow on constitution`(
+    firstName: String,
+    lastName: String,
+    constitution: String,
+) {
+    val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
+    val citizen = citizenRepository.findByUsername("$firstName-$lastName".toLowerCase()) ?: error("Citizen not exist")
+    createFollow(citizen, ArticleRef(constitution.toUUID()))
+}
+
+fun createFollow(citizen: CitizenRef, article: ArticleRef) {
+    val followArticleRepository: FollowArticleRepository by lazy { GlobalContext.get().koin.get() }
+    val follow = FollowForUpdate(createdBy = citizen, target = article)
+    followArticleRepository.follow(follow)
+}
+
+fun createFollow(citizen: CitizenRef, constitution: ConstitutionRef) {
+    val followConstitutionRepository: FollowConstitutionRepository by lazy { GlobalContext.get().koin.get() }
+    val follow = FollowForUpdate(createdBy = citizen, target = constitution)
+    followConstitutionRepository.follow(follow)
+}
diff --git a/src/test/kotlin/integration/steps/given/Opinion.kt b/src/test/kotlin/integration/steps/given/Opinion.kt
new file mode 100644
index 0000000..20338ba
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Opinion.kt
@@ -0,0 +1,53 @@
+package integration.steps.given
+
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import fr.dcproject.component.citizen.database.CitizenRepository
+import fr.dcproject.component.opinion.database.OpinionChoice
+import fr.dcproject.component.opinion.database.OpinionChoiceRepository
+import fr.dcproject.component.opinion.database.OpinionForUpdate
+import fr.dcproject.component.opinion.database.OpinionRepositoryArticle
+import io.ktor.server.testing.TestApplicationEngine
+import org.koin.core.context.GlobalContext
+import java.util.UUID
+
+fun TestApplicationEngine.`Given I have an opinion choice`(
+    name: String,
+    id: String? = null,
+) {
+    createOpinionChoice(id?.toUUID(), name)
+}
+
+fun createOpinionChoice(
+    id: UUID? = null,
+    name: String,
+): OpinionChoice {
+    val opinionChoiceRepository: OpinionChoiceRepository by lazy { GlobalContext.get().koin.get() }
+    val opinionChoice = OpinionChoice(
+        id = id,
+        name = name,
+        target = listOf()
+    )
+    return opinionChoiceRepository.upsertOpinionChoice(opinionChoice)
+}
+
+fun `Given I have opinion on article`(
+    name: String,
+    article: String,
+    citizenName: Name,
+    id: String? = null
+) {
+    val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
+    val opinionRepositoryArticle: OpinionRepositoryArticle by lazy { GlobalContext.get().koin.get() }
+    val opinionChoiceRepository: OpinionChoiceRepository by lazy { GlobalContext.get().koin.get() }
+    val opinion = OpinionForUpdate(
+        id = id?.toUUID() ?: UUID.randomUUID(),
+        choice = opinionChoiceRepository.findOpinionsChoiceByName(name)
+            ?: error("Opinion Choice not exist"),
+        target = ArticleRef(article.toUUID()),
+        createdBy = citizenRepository.findByName(citizenName)
+            ?: error("Citizen not exist")
+    )
+    opinionRepositoryArticle.addOpinion(opinion)
+}
diff --git a/src/test/kotlin/integration/steps/given/Request.kt b/src/test/kotlin/integration/steps/given/Request.kt
new file mode 100644
index 0000000..3dd089f
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Request.kt
@@ -0,0 +1,5 @@
+package integration.steps.given
+
+import io.ktor.server.testing.TestApplicationRequest
+
+fun TestApplicationRequest.`with no content`(): String? = null
diff --git a/src/test/kotlin/integration/steps/given/Vote.kt b/src/test/kotlin/integration/steps/given/Vote.kt
new file mode 100644
index 0000000..c3f65a1
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Vote.kt
@@ -0,0 +1,46 @@
+package integration.steps.given
+
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.citizen.database.CitizenI.Name
+import fr.dcproject.component.citizen.database.CitizenRepository
+import fr.dcproject.component.vote.database.VoteArticleRepository
+import fr.dcproject.component.vote.database.VoteForUpdate
+import fr.dcproject.component.vote.entity.VoteAggregation
+import io.ktor.server.testing.TestApplicationEngine
+import org.koin.core.context.GlobalContext
+import java.util.UUID
+
+fun TestApplicationEngine.`Given I have vote +1 on article`(
+    article: String,
+    name: Name,
+    id: String? = null,
+) {
+    createVote(article, name, 1, id?.toUUID())
+}
+
+fun TestApplicationEngine.`Given I have vote -1 on article`(
+    article: String,
+    name: Name,
+    id: String? = null,
+) {
+    createVote(article, name, -1, id?.toUUID())
+}
+
+fun createVote(
+    article: String,
+    name: Name,
+    note: Int,
+    id: UUID? = null,
+): VoteAggregation {
+    val voteArticleRepository: VoteArticleRepository by lazy { GlobalContext.get().koin.get() }
+    val articleRepository: ArticleRepository by lazy { GlobalContext.get().koin.get() }
+    val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
+    val vote = VoteForUpdate(
+        id = id ?: UUID.randomUUID(),
+        note = note,
+        target = articleRepository.findById(article.toUUID()) ?: error("Article not exist"),
+        createdBy = citizenRepository.findByName(name) ?: error("Citizen not exist")
+    )
+    return voteArticleRepository.vote(vote)
+}
diff --git a/src/test/kotlin/integration/steps/given/Workgroup.kt b/src/test/kotlin/integration/steps/given/Workgroup.kt
new file mode 100644
index 0000000..33548c7
--- /dev/null
+++ b/src/test/kotlin/integration/steps/given/Workgroup.kt
@@ -0,0 +1,90 @@
+package integration.steps.given
+
+import fr.dcproject.common.utils.toUUID
+import fr.dcproject.component.auth.database.UserForCreate
+import fr.dcproject.component.citizen.database.Citizen
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenForCreate
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRepository
+import fr.dcproject.component.workgroup.database.WorkgroupForUpdate
+import fr.dcproject.component.workgroup.database.WorkgroupForView
+import fr.dcproject.component.workgroup.database.WorkgroupRepository
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member.Role.MASTER
+import io.ktor.server.testing.TestApplicationEngine
+import org.joda.time.DateTime
+import org.koin.core.context.GlobalContext
+import java.util.UUID
+
+fun TestApplicationEngine.`Given I have workgroup`(
+    id: String? = null,
+    name: String? = null,
+    description: String? = null,
+    anonymous: Boolean? = null,
+    createdBy: CitizenI.Name? = null,
+    callback: WorkgroupForView<CitizenCreator>.() -> Unit = {},
+) {
+    val workgroup: WorkgroupForView<CitizenCreator> = createWorkgroup(id?.toUUID(), name, description, anonymous, createdBy)
+    callback(workgroup)
+}
+fun WorkgroupForView<CitizenCreator>.`With members`(
+    vararg member: CitizenI.Name
+) {
+    addMemberToWorkgroup(this, *member)
+}
+
+@Suppress("UNCHECKED_CAST")
+fun addMemberToWorkgroup(workgroup: WorkgroupForView<CitizenCreator>, vararg membersNames: CitizenI.Name) {
+    val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
+    val workgroupRepository: WorkgroupRepository by lazy { GlobalContext.get().koin.get() }
+
+    val newMembers: List<Member<CitizenI>> = membersNames.map { memberName ->
+        val member: Citizen = citizenRepository.findByName(memberName) ?: error("Citizen not exist")
+        Member(member, listOf(Member.Role.EDITOR))
+    }
+    workgroupRepository.updateMembers<CitizenI>(
+        workgroup,
+        workgroup.members as List<Member<CitizenI>> + newMembers
+    )
+}
+
+private fun createWorkgroup(
+    id: UUID? = null,
+    name: String? = null,
+    description: String? = null,
+    anonymous: Boolean? = null,
+    createdBy: CitizenI.Name? = null,
+): WorkgroupForView<CitizenCreator> {
+    val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
+    val workgroupRepository: WorkgroupRepository by lazy { GlobalContext.get().koin.get() }
+
+    val creatorName = createdBy ?: CitizenI.Name("Paul", "Langevin")
+    val creator = citizenRepository.findByName(creatorName) ?: run {
+        val username = ("username" + UUID.randomUUID().toString())
+            .toLowerCase().replace(' ', '-')
+        val user = UserForCreate(
+            username = username,
+            password = "azerty",
+        )
+        CitizenForCreate(
+            name = creatorName,
+            email = "$username@dc-project.fr",
+            birthday = DateTime.now(),
+            user = user
+        ).let {
+            citizenRepository.insertWithUser(it) ?: error("Unable to create User")
+        }
+    }
+
+    val workgroup = WorkgroupForUpdate(
+        id = id ?: UUID.randomUUID(),
+        name = name ?: "Les Incoruptible",
+        description = description ?: "La vie est notre jeux",
+        createdBy = creator,
+        anonymous = anonymous ?: false,
+        members = listOf(Member(creator, listOf(MASTER)))
+    )
+
+    return workgroupRepository.upsert(workgroup)
+}
diff --git a/src/test/kotlin/integration/steps/then/request.kt b/src/test/kotlin/integration/steps/then/request.kt
new file mode 100644
index 0000000..c4ed68a
--- /dev/null
+++ b/src/test/kotlin/integration/steps/then/request.kt
@@ -0,0 +1,104 @@
+package integration.steps.then
+
+import assert.assertGreaterThan
+import assert.assertLessThan
+import com.jayway.jsonpath.JsonPath
+import com.jayway.jsonpath.PathNotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.testing.TestApplicationCall
+import io.ktor.server.testing.TestApplicationResponse
+import net.minidev.json.JSONArray
+import org.amshove.kluent.`should be equal to`
+import org.amshove.kluent.`should be null`
+import org.amshove.kluent.`should be`
+import org.amshove.kluent.`should not be null`
+import org.amshove.kluent.shouldContain
+import org.junit.jupiter.api.assertThrows
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+fun TestApplicationCall.`Then the response should be`(status: HttpStatusCode? = null, block: TestApplicationResponse.() -> Unit): TestApplicationCall = this.apply {
+    if (status != null) {
+        response.status().`should be`(status)
+    }
+    block(response)
+}
+
+infix fun TestApplicationCall.`Then the response should be`(status: HttpStatusCode): TestApplicationCall = this.apply {
+    response.status().`should be`(status)
+}
+
+infix fun TestApplicationCall.and(block: TestApplicationResponse.() -> Unit): TestApplicationCall = this.apply {
+    block(response)
+}
+
+infix fun TestApplicationCall.`has property`(path: String): Pair<JsonPath, Any> =
+    JsonPath.compile(path).let { jsonPath ->
+        jsonPath.read<Any>(response.content)?.let { result ->
+            Pair(jsonPath, result)
+        } ?: throw AssertionError("\"${path}\" element not found on json response")
+    }
+
+infix fun TestApplicationResponse.`And have property`(path: String): Pair<JsonPath, Any> =
+    JsonPath.compile(path).let { jsonPath ->
+        jsonPath.read<Any>(content)?.let { result ->
+            Pair(jsonPath, result)
+        } ?: throw AssertionError("\"${path}\" element not found on json response")
+    }
+
+infix fun Pair<JsonPath, Any>.`whish contains`(expected: Any): Pair<JsonPath, Any> = this.apply {
+    second `should be equal to` expected
+}
+
+inline fun <reified T> TestApplicationResponse.`And the response should contain`(path: String, valueExpected: T?): T {
+    return JsonPath.read<T?>(content, path).also {
+        it.let {
+            if (it is JSONArray && it.count() == 1 && it.first() is T?) {
+                it.first() as T?
+            } else {
+                it
+            }
+        }.let {
+            assertEquals<T?>(valueExpected, it ?: throw AssertionError("\"$path -> ${valueExpected}\" element not found on json response"))
+        }
+    }
+}
+
+fun TestApplicationResponse.`And the response should not contain`(path: String) {
+    assertThrows<PathNotFoundException> {
+        JsonPath.read(content, path)
+    }
+}
+
+fun TestApplicationResponse.`And the response should contain pattern`(path: String, expectedRegex: String): Any {
+    return JsonPath.read<Any?>(content, path).also {
+        it.let {
+            if (it is JSONArray && it.count() == 1) {
+                it.first()
+            } else {
+                it
+            }
+        }?.let {
+            assertTrue(expectedRegex.toRegex().containsMatchIn(it.toString()))
+        } ?: throw AssertionError("\"$path -> element not found on json response")
+    }
+}
+
+fun TestApplicationResponse.`And the response should contain list`(path: String, min: Int? = null, max: Int? = null) {
+    JsonPath.read<JSONArray?>(content, path).also {
+        assertNotNull(it)
+        if (min != null) {
+            it.size assertGreaterThan min
+        }
+        if (max != null) {
+            it.size assertLessThan max
+        }
+    }
+}
+
+fun TestApplicationResponse.`And the response should not be null`() = content.`should not be null`()
+fun TestApplicationResponse.`And the response should be null`() = content.`should be null`()
+infix fun String.`and should contains`(expected: String) = this
+    .`should not be null`()
+    .shouldContain(expected)
diff --git a/src/test/kotlin/integration/steps/then/schema.kt b/src/test/kotlin/integration/steps/then/schema.kt
new file mode 100644
index 0000000..a3df36e
--- /dev/null
+++ b/src/test/kotlin/integration/steps/then/schema.kt
@@ -0,0 +1,102 @@
+package integration.steps.then
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.node.TextNode
+import fr.dcproject.common.utils.getResource
+import io.ktor.http.ContentType
+import io.ktor.http.Url
+import io.ktor.request.contentType
+import io.ktor.request.httpMethod
+import io.ktor.request.uri
+import io.ktor.server.testing.TestApplicationResponse
+import org.openapi4j.core.model.v3.OAI3
+import org.openapi4j.parser.OpenApi3Parser
+import org.openapi4j.parser.model.v3.OpenApi3
+import org.openapi4j.parser.model.v3.Operation
+import org.openapi4j.parser.model.v3.Schema
+import org.openapi4j.schema.validator.ValidationContext
+import org.openapi4j.schema.validator.ValidationData
+import org.openapi4j.schema.validator.v3.SchemaValidator
+import java.io.File
+import kotlin.test.assertTrue
+import kotlin.test.fail
+
+fun Schema.validate(api: OpenApi3, toValidate: JsonNode) {
+    val validationContext: ValidationContext<OAI3> = ValidationContext(api.context)
+    val schemaValidator = SchemaValidator(validationContext, "", this.toNode())
+
+    val results = ValidationData<Unit>()
+    schemaValidator.validate(toValidate, results)
+
+    assertTrue(results.isValid, results.results().toString())
+}
+
+fun TestApplicationResponse.operation(route: String? = null, callback: Operation.(OpenApi3, String) -> Unit): Operation {
+    val filePath = "/openapi2.yaml"
+    return OpenApi3Parser().parse(File(filePath.getResource().toURI()), true).let { api: OpenApi3 ->
+        val httpMethod = call.request.httpMethod
+        val uri = route ?: "/" + Url(call.request.uri).encodedPath
+        val path = api.paths
+            .keys
+            .firstOrNull { uri.matches(it.replace("""\{[^{}]+}""".toRegex(), "[^/]+").toRegex()) }
+
+        api.getPath(path)
+            ?.getOperation(httpMethod.value.toLowerCase())
+            ?.apply {
+                this.callback(api, uri)
+            }
+            ?: fail("""No path found for "${httpMethod.value} $uri". (on file "$filePath")""")
+    }
+}
+
+fun TestApplicationResponse.`And the schema response body must be valid`(contentType: ContentType? = ContentType.Application.Json) {
+    operation { api, uri ->
+        /* Validate Response */
+        this.apply {
+            val status = call.response.status()
+            val responseContent: JsonNode = if (content != null)
+                ObjectMapper().readTree(content)
+            else TextNode("")
+
+            val response = getResponse(status?.value?.toString() ?: error("HttpStatus not found")) ?: fail("""No Status "${status.value}" found for "$this $uri".""")
+            val schema = response.getContentMediaType(contentType.toString())?.schema
+
+            if (content != null) {
+                schema?.validate(api, responseContent)
+                    ?: fail("""No Status "${status.value}" found with media type "$contentType" for "$this $uri".""")
+            }
+        }
+    }
+}
+
+fun TestApplicationResponse.`And the schema parameters must be valid`() {
+    operation { api, uri ->
+        /* Validate Request URL */
+        this.apply {
+            Url(call.request.uri).parameters.forEach { parameter: String, values: List<String> ->
+                val schema = getParametersIn(api.context, "query")
+                    ?.firstOrNull { it.name == parameter }?.schema
+                    ?: error("""No parameter found ($parameter) for "$this $uri".""")
+
+                if (schema.type == "array") {
+                    schema.validate(api, ObjectMapper().valueToTree(values))
+                } else {
+                    schema.validate(api, TextNode(values.first()))
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Validate request body
+ */
+fun TestApplicationResponse.`And the schema request body must be valid`(body: String) {
+    operation { api, uri ->
+        requestBody
+            .getContentMediaType(call.request.contentType().toString())
+            .schema
+            .validate(api, ObjectMapper().readTree(body))
+    }
+}
diff --git a/src/test/kotlin/integration/steps/when/request.kt b/src/test/kotlin/integration/steps/when/request.kt
new file mode 100644
index 0000000..b09e19b
--- /dev/null
+++ b/src/test/kotlin/integration/steps/when/request.kt
@@ -0,0 +1,106 @@
+package integration.steps.`when`
+
+import fr.dcproject.common.BitMaskI
+import integration.steps.then.`And the schema parameters must be valid`
+import integration.steps.then.`And the schema request body must be valid`
+import integration.steps.then.`And the schema response body must be valid`
+import io.ktor.application.ApplicationCall
+import io.ktor.http.ContentType
+import io.ktor.http.HttpHeaders
+import io.ktor.http.HttpMethod
+import io.ktor.server.testing.TestApplicationCall
+import io.ktor.server.testing.TestApplicationEngine
+import io.ktor.server.testing.TestApplicationRequest
+import io.ktor.server.testing.setBody
+
+enum class Validate(override val bit: Long) : BitMaskI {
+    REQUEST_BODY(1),
+    REQUEST_PARAM(2),
+    REQUEST_HEADER(4),
+    REQUEST(1 + 2 + 4),
+    RESPONSE_BODY(8),
+    RESPONSE_HEADER(16),
+    RESPONSE(8 + 16),
+    ALL((1 + 2 + 4) + (8 + 16));
+}
+
+fun TestApplicationCall.valid(validate: BitMaskI): TestApplicationCall {
+    if (Validate.RESPONSE_BODY in validate) {
+        response.`And the schema response body must be valid`()
+    }
+    if (Validate.REQUEST_PARAM in validate) {
+        response.`And the schema parameters must be valid`()
+    }
+    if (Validate.REQUEST_BODY in validate) {
+        requestBody?.let { body ->
+            response.`And the schema request body must be valid`(body)
+        }
+    }
+
+    return this
+}
+
+fun TestApplicationEngine.`When I send a GET request`(uri: String? = null, validate: Validate = Validate.ALL, setup: (TestApplicationRequest.() -> Unit)? = null): TestApplicationCall {
+    return handleRequest(true) {
+        method = HttpMethod.Get
+        if (uri != null) {
+            this.uri = uri
+        }
+        addHeader(HttpHeaders.ContentType, ContentType.Application.Json.toString())
+        setup?.let { it() }
+    }.valid(validate)
+}
+
+fun TestApplicationEngine.`When I send a POST request`(uri: String? = null, validate: BitMaskI = Validate.ALL, setup: (TestApplicationRequest.() -> Unit)? = null): TestApplicationCall {
+    return handleRequest(true) {
+        method = HttpMethod.Post
+        if (uri != null) {
+            this.uri = uri
+        }
+        addHeader(HttpHeaders.ContentType, ContentType.Application.Json.toString())
+        addHeader(HttpHeaders.Accept, ContentType.Application.Json.toString())
+        setup?.let { it() }
+    }.valid(validate)
+}
+
+fun TestApplicationEngine.`When I send a PUT request`(uri: String? = null, validate: BitMaskI = Validate.ALL, setup: (TestApplicationRequest.() -> Unit)? = null): TestApplicationCall {
+    return handleRequest(true) {
+        method = HttpMethod.Put
+        if (uri != null) {
+            this.uri = uri
+        }
+        addHeader(HttpHeaders.ContentType, ContentType.Application.Json.toString())
+        setup?.let { it() }
+    }.valid(validate)
+}
+
+fun TestApplicationEngine.`When I send a DELETE request`(uri: String? = null, validate: Validate = Validate.ALL, setup: (TestApplicationRequest.() -> String?)? = null): TestApplicationCall {
+    return handleRequest(true) {
+        method = HttpMethod.Delete
+        if (uri != null) {
+            this.uri = uri
+        }
+        addHeader(HttpHeaders.ContentType, ContentType.Application.Json.toString())
+        setup?.let { it() }?.let {
+            setBody(it.trimIndent())
+        }
+    }.valid(validate)
+}
+
+private val requestBodies: MutableMap<ApplicationCall, String> = mutableMapOf()
+var TestApplicationCall.requestBody: String?
+    get() = requestBodies[this]
+    set(value) {
+        if (value == null) {
+            requestBodies.remove(this)
+        } else {
+            requestBodies[this] = value
+        }
+    }
+
+infix fun TestApplicationRequest.`with body`(body: String) {
+    return body.trimIndent().let {
+        setBody(it)
+        (call as TestApplicationCall).requestBody = it
+    }
+}
diff --git a/src/test/kotlin/security/voter/ArticleVoterTest.kt b/src/test/kotlin/security/voter/ArticleVoterTest.kt
deleted file mode 100644
index 9014168..0000000
--- a/src/test/kotlin/security/voter/ArticleVoterTest.kt
+++ /dev/null
@@ -1,184 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.*
-import fr.dcproject.user
-import fr.ktorVoter.Vote
-import fr.ktorVoter.can
-import io.ktor.application.ApplicationCall
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.amshove.kluent.`should be`
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tag("voter")
-internal class ArticleVoterTest {
-    val tesla = CitizenBasic(
-        user = User(
-            username = "nicolas-tesla",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "tesla@best.com",
-        name = CitizenI.Name("Nicolas", "Tesla")
-    )
-    val einstein = CitizenBasic(
-        user = User(
-            username = "albert-einstein",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "einstein@best.com",
-        name = CitizenI.Name("Albert", "Einstein")
-    )
-
-    init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
-    }
-
-    @Test
-    fun `creator can be view the article`() = ArticleVoter().run {
-        val article = getArticle(tesla).apply { draft = true }
-
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            supports(ArticleVoter.Action.VIEW, it, article) `should be` true
-            vote(ArticleVoter.Action.VIEW, it, article) `should be` Vote.GRANTED
-        }
-    }
-
-    @Test
-    fun `other user can be view the article`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla)
-
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(ArticleVoter.Action.VIEW, it, article) `should be` true
-        }
-    }
-
-    @Test
-    fun `other user can be view the article list`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla)
-        val article2 = getArticle(tesla)
-
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(ArticleVoter.Action.VIEW, it, listOf(article, article2)) `should be` true
-        }
-    }
-
-    @Test
-    fun `the no creator can not be view the article on draft`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla).apply { draft = true }
-
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(ArticleVoter.Action.VIEW, it, article) `should be` false
-        }
-    }
-
-    @Test
-    fun `the no creator can not be view list of articles if one is on draft`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla)
-        val article2 = getArticle(tesla).apply { draft = true }
-
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(ArticleVoter.Action.VIEW, it, listOf(article, article2)) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not view deleted article`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla).apply { deletedAt = DateTime.now() }
-
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(ArticleVoter.Action.VIEW, it, article) `should be` false
-        }
-    }
-
-    @Test
-    fun `can delete article if owner`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla)
-
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(ArticleVoter.Action.DELETE, it, article) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not delete article if not owner`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla).apply { deletedAt = DateTime.now() }
-
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(ArticleVoter.Action.DELETE, it, article) `should be` false
-        }
-    }
-
-    @Test
-    fun `can create article if logged`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla)
-
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(ArticleVoter.Action.CREATE, it, article) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not create article if not logged`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla)
-
-        mockk<ApplicationCall> {
-            every { user } returns null
-        }.let {
-            can(ArticleVoter.Action.CREATE, it, article) `should be` false
-        }
-    }
-
-    @Test
-    fun `can update article if yours`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla)
-
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(ArticleVoter.Action.UPDATE, it, article) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not update article if not yours`() = listOf(ArticleVoter()).run {
-        val article = getArticle(tesla)
-
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(ArticleVoter.Action.UPDATE, it, article) `should be` false
-        }
-    }
-
-    private fun getArticle(createdBy: CitizenBasic = tesla) = Article(
-        title = "Hello world",
-        content = "Super",
-        description = "I Rocks",
-        createdBy = createdBy
-    )
-}
\ No newline at end of file
diff --git a/src/test/kotlin/security/voter/CitizenVoterTest.kt b/src/test/kotlin/security/voter/CitizenVoterTest.kt
deleted file mode 100644
index 428b7af..0000000
--- a/src/test/kotlin/security/voter/CitizenVoterTest.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.CitizenBasic
-import fr.dcproject.entity.CitizenI
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.can
-import io.ktor.application.ApplicationCall
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.amshove.kluent.`should be`
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-
-@KtorExperimentalLocationsAPI
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tag("voter")
-internal class CitizenVoterTest {
-    private val tesla = CitizenBasic(
-        user = User(
-            username = "nicolas-tesla",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "tesla@best.com",
-        name = CitizenI.Name("Nicolas", "Tesla")
-    )
-    private val einstein = CitizenBasic(
-        user = User(
-            username = "albert-einstein",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "einstein@best.com",
-        name = CitizenI.Name("Albert", "Einstein")
-    )
-
-    private val curie = CitizenBasic(
-        user = User(
-            username = "marie-curie",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "curie@best.com",
-        name = CitizenI.Name("Marie", "Curie")
-    ).apply { deletedAt = DateTime.now() }
-
-    init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
-    }
-
-    @Test
-    fun `support citizen`() = CitizenVoter().run {
-        val p = object : ActionI {}
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            supports(CitizenVoter.Action.VIEW, it, einstein) `should be` true
-            supports(p, it, einstein) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view the citizen`() = listOf(CitizenVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CitizenVoter.Action.VIEW, it, einstein) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be view the citizen list`() = listOf(CitizenVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CitizenVoter.Action.VIEW, it, listOf(einstein, tesla)) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not view deleted citizen`() = listOf(CitizenVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CitizenVoter.Action.VIEW, it, curie) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be update itself`() = listOf(CitizenVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CitizenVoter.Action.UPDATE, it, einstein) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be update other citizen`() = listOf(CitizenVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CitizenVoter.Action.UPDATE, it, tesla) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be change password of itself`() = listOf(CitizenVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CitizenVoter.Action.CHANGE_PASSWORD, it, einstein) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be change password of other citizen`() = listOf(CitizenVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CitizenVoter.Action.CHANGE_PASSWORD, it, tesla) `should be` false
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/security/voter/CommentVoterTest.kt b/src/test/kotlin/security/voter/CommentVoterTest.kt
deleted file mode 100644
index 43fb89e..0000000
--- a/src/test/kotlin/security/voter/CommentVoterTest.kt
+++ /dev/null
@@ -1,186 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.*
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.can
-import io.ktor.application.ApplicationCall
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.amshove.kluent.`should be`
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-
-@KtorExperimentalLocationsAPI
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tag("voter")
-internal class CommentVoterTest {
-    private val tesla = CitizenBasic(
-        user = User(
-            username = "nicolas-tesla",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "tesla@best.com",
-        name = CitizenI.Name("Nicolas", "Tesla")
-    )
-    private val einstein = CitizenBasic(
-        user = User(
-            username = "albert-einstein",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "einstein@best.com",
-        name = CitizenI.Name("Albert", "Einstein")
-    )
-
-    private val article1 = Article(
-        content = "Hi",
-        createdBy = einstein,
-        description = "blablabla",
-        title = "Super article"
-    )
-
-    private val comment1 = Comment(
-        content = "Hello",
-        createdBy = tesla,
-        target = article1
-    )
-
-    private val commentTargetDeleted = Comment(
-        content = "Hello",
-        createdBy = tesla,
-        target = Article(
-            content = "Hi",
-            createdBy = einstein,
-            description = "blablabla",
-            title = "Super article",
-            workgroup = null
-        ).apply { deletedAt = DateTime.now() }
-    )
-
-    private val commentTargetNoUser = Comment(
-        content = "Hello",
-        createdBy = tesla,
-        target = ArticleRef()
-    )
-
-    init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
-    }
-
-    @Test
-    fun `support comment`() = CommentVoter().run {
-        val p = object : ActionI {}
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            supports(CommentVoter.Action.VIEW, it, comment1) `should be` true
-            supports(CommentVoter.Action.VIEW, it, article1) `should be` false
-            supports(p, it, comment1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view the comment`() = listOf(CommentVoter(), ArticleVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CommentVoter.Action.VIEW, it, comment1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be view the comment list`() = listOf(CommentVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CommentVoter.Action.VIEW, it, listOf(comment1)) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be update your comment`() = listOf(CommentVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CommentVoter.Action.UPDATE, it, comment1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be update other comment`() = listOf(CommentVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CommentVoter.Action.UPDATE, it, comment1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be delete your comment`() = listOf(CommentVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CommentVoter.Action.DELETE, it, comment1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be create a comment`() = listOf(CommentVoter(), ArticleVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CommentVoter.Action.CREATE, it, comment1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be create a comment if target is deleted`() = listOf(CommentVoter(), ArticleVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CommentVoter.Action.CREATE, it, commentTargetDeleted) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be create a comment if target has no user`() = listOf(CommentVoter(), ArticleVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CommentVoter.Action.CREATE, it, commentTargetNoUser) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be create a comment with other creator`() = listOf(CommentVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CommentVoter.Action.CREATE, it, comment1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be create a comment if is null`() = listOf(CommentVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(CommentVoter.Action.CREATE, it, null) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be create a comment if not connected`() = listOf(CommentVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns null
-        }.let {
-            can(CommentVoter.Action.CREATE, it, comment1) `should be` false
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/security/voter/FollowVoterTest.kt b/src/test/kotlin/security/voter/FollowVoterTest.kt
deleted file mode 100644
index 1042144..0000000
--- a/src/test/kotlin/security/voter/FollowVoterTest.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.*
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.can
-import io.ktor.application.ApplicationCall
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.amshove.kluent.`should be`
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-
-@KtorExperimentalLocationsAPI
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tag("voter")
-internal class FollowVoterTest {
-    private val tesla = CitizenBasic(
-        user = User(
-            username = "nicolas-tesla",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "tesla@best.com",
-        name = CitizenI.Name("Nicolas", "Tesla"),
-        followAnonymous = false
-    )
-
-    private val einstein = CitizenBasic(
-        user = User(
-            username = "albert-einstein",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "einstein@best.com",
-        name = CitizenI.Name("Albert", "Einstein"),
-        followAnonymous = true
-    )
-
-    private val article1 = Article(
-        content = "Hi",
-        createdBy = einstein,
-        description = "blablabla",
-        title = "Super article"
-    )
-
-    private val follow1 = Follow(
-        createdBy = tesla,
-        target = article1
-    )
-
-    private val followAnon = Follow(
-        createdBy = einstein,
-        target = article1
-    )
-
-    init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
-    }
-
-    @Test
-    fun `support follow`() = FollowVoter().run {
-        val p = object : ActionI {}
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            supports(FollowVoter.Action.VIEW, it, follow1) `should be` true
-            supports(FollowVoter.Action.VIEW, it, article1) `should be` false
-            supports(p, it, follow1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view the follow`() = listOf(FollowVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(FollowVoter.Action.VIEW, it, follow1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be view the follow list`() = listOf(FollowVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(FollowVoter.Action.VIEW, it, listOf(follow1)) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be view your anonymous follow`() = listOf(FollowVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(FollowVoter.Action.VIEW, it, followAnon) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be view the anonymous follow of other`() = listOf(FollowVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(FollowVoter.Action.VIEW, it, followAnon) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be follow article`() = listOf(FollowVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(FollowVoter.Action.CREATE, it, follow1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be follow article if not connected`() = listOf(FollowVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns null
-        }.let {
-            can(FollowVoter.Action.CREATE, it, follow1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be unfollow article`() = listOf(FollowVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(FollowVoter.Action.DELETE, it, follow1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be unfollow article if not connected`() = listOf(FollowVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns null
-        }.let {
-            can(FollowVoter.Action.DELETE, it, follow1) `should be` false
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/security/voter/OpinionChoiceVoterTest.kt b/src/test/kotlin/security/voter/OpinionChoiceVoterTest.kt
deleted file mode 100644
index a355eb0..0000000
--- a/src/test/kotlin/security/voter/OpinionChoiceVoterTest.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.*
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.can
-import io.ktor.application.ApplicationCall
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.amshove.kluent.`should be`
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-
-@KtorExperimentalLocationsAPI
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tag("voter")
-internal class OpinionChoiceVoterTest {
-    private val tesla = CitizenBasic(
-        user = User(
-            username = "nicolas-tesla",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "tesla@best.com",
-        name = CitizenI.Name("Nicolas", "Tesla"),
-        followAnonymous = false
-    )
-
-    private val article1 = Article(
-        content = "Hi",
-        createdBy = tesla,
-        description = "blablabla",
-        title = "Super article"
-    )
-
-    private val choice1 = OpinionChoice(
-        name = "Opinion1",
-        target = listOf()
-    )
-
-    init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
-    }
-
-    @Test
-    fun `support opinion choice`() = OpinionChoiceVoter().run {
-        val p = object : ActionI {}
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            supports(OpinionChoiceVoter.Action.VIEW, it, choice1) `should be` true
-            supports(OpinionChoiceVoter.Action.VIEW, it, article1) `should be` false
-            supports(p, it, choice1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view the opinion choice`() = listOf(OpinionChoiceVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(OpinionChoiceVoter.Action.VIEW, it, choice1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be view the opinion choice list`() = listOf(OpinionChoiceVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(OpinionChoiceVoter.Action.VIEW, it, listOf(choice1)) `should be` true
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/security/voter/OpinionVoterTest.kt b/src/test/kotlin/security/voter/OpinionVoterTest.kt
deleted file mode 100644
index f8e450d..0000000
--- a/src/test/kotlin/security/voter/OpinionVoterTest.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.*
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.can
-import io.ktor.application.ApplicationCall
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.amshove.kluent.`should be`
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-
-@KtorExperimentalLocationsAPI
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tag("voter")
-internal class OpinionVoterTest {
-    private val tesla = CitizenBasic(
-        user = User(
-            username = "nicolas-tesla",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "tesla@best.com",
-        name = CitizenI.Name("Nicolas", "Tesla"),
-        followAnonymous = false
-    )
-
-    private val einstein = CitizenBasic(
-        user = User(
-            username = "albert-einstein",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "einstein@best.com",
-        name = CitizenI.Name("Albert", "Einstein"),
-        followAnonymous = true
-    )
-
-    private val article1 = Article(
-        content = "Hi",
-        createdBy = einstein,
-        description = "blablabla",
-        title = "Super article"
-    )
-
-    private val opinion1 = Opinion(
-        createdBy = tesla,
-        target = article1,
-        choice = OpinionChoice(
-            name = "Opinion1",
-            target = listOf("article")
-        )
-    )
-
-    init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
-    }
-
-    @Test
-    fun `support opinion`() = OpinionVoter().run {
-        val p = object : ActionI {}
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            supports(OpinionVoter.Action.VIEW, it, opinion1) `should be` true
-            supports(OpinionVoter.Action.VIEW, it, article1) `should be` true
-            supports(OpinionVoter.Action.VIEW, it, einstein) `should be` false
-            supports(p, it, opinion1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view the opinion`() = listOf(OpinionVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(OpinionVoter.Action.VIEW, it, opinion1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be not view the opinion if is null`() = listOf(OpinionVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(OpinionVoter.Action.VIEW, it, null) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view the opinion list`() = listOf(OpinionVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(OpinionVoter.Action.VIEW, it, listOf(opinion1)) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be opinion an article`() = listOf(OpinionVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(OpinionVoter.Action.CREATE, it, opinion1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be opinion if not connected`() = listOf(OpinionVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns null
-        }.let {
-            can(OpinionVoter.Action.CREATE, it, opinion1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be remove opinion`() = listOf(OpinionVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(OpinionVoter.Action.DELETE, it, opinion1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be remove opinion if not connected`() = listOf(OpinionVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns null
-        }.let {
-            can(OpinionVoter.Action.DELETE, it, opinion1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be remove opinion of other user`() = listOf(OpinionVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(OpinionVoter.Action.DELETE, it, opinion1) `should be` false
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/security/voter/VoteVoterTest.kt b/src/test/kotlin/security/voter/VoteVoterTest.kt
deleted file mode 100644
index 383617b..0000000
--- a/src/test/kotlin/security/voter/VoteVoterTest.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.*
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.can
-import io.ktor.application.ApplicationCall
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.amshove.kluent.`should be`
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import fr.dcproject.entity.Vote as VoteEntity
-
-@KtorExperimentalLocationsAPI
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tag("voter")
-internal class VoteVoterTest {
-    private val tesla = CitizenBasic(
-        user = User(
-            username = "nicolas-tesla",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "tesla@best.com",
-        name = CitizenI.Name("Nicolas", "Tesla"),
-        followAnonymous = false
-    )
-
-    private val einstein = CitizenBasic(
-        user = User(
-            username = "albert-einstein",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "einstein@best.com",
-        name = CitizenI.Name("Albert", "Einstein"),
-        followAnonymous = true
-    )
-
-    private val article1 = Article(
-        content = "Hi",
-        createdBy = einstein,
-        description = "blablabla",
-        title = "Super article"
-    )
-
-    private val vote1 = VoteEntity(
-        createdBy = tesla,
-        target = article1,
-        note = 1
-    )
-
-    private val voteOnDeleted = VoteEntity(
-        createdBy = tesla,
-        target = Article(
-            content = "Hi",
-            createdBy = einstein,
-            description = "blablabla",
-            title = "Super article"
-        ).apply { deletedAt = DateTime.now() },
-        note = 1
-    )
-
-    private val voteWithoutUser = VoteEntity(
-        createdBy = tesla,
-        target = ArticleRef(),
-        note = 1
-    )
-
-    init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
-    }
-
-    @Test
-    fun `support vote`() = VoteVoter().run {
-        val p = object : ActionI {}
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            supports(VoteVoter.Action.VIEW, it, vote1) `should be` true
-            supports(VoteVoter.Action.VIEW, it, article1) `should be` false
-            supports(p, it, vote1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view your the vote`() = listOf(VoteVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(VoteVoter.Action.VIEW, it, vote1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be view vote of other`() = listOf(VoteVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(VoteVoter.Action.VIEW, it, vote1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be not view the vote if is null`() = listOf(VoteVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(VoteVoter.Action.VIEW, it, null) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view your votes list`() = listOf(VoteVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(VoteVoter.Action.VIEW, it, listOf(vote1)) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be vote an article`() = listOf(VoteVoter(), ArticleVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(VoteVoter.Action.CREATE, it, vote1) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be vote if not connected`() = listOf(VoteVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns null
-        }.let {
-            can(VoteVoter.Action.CREATE, it, vote1) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be vote an article if article is deleted`() = listOf(VoteVoter(), ArticleVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(VoteVoter.Action.CREATE, it, voteOnDeleted) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be vote an article if article have no user`() = listOf(VoteVoter(), ArticleVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(VoteVoter.Action.CREATE, it, voteWithoutUser) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be comment an article if article is deleted`() = listOf(VoteVoter(), ArticleVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(CommentVoter.Action.CREATE, it, voteOnDeleted) `should be` false
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/security/voter/WorkgroupVoterTest.kt b/src/test/kotlin/security/voter/WorkgroupVoterTest.kt
deleted file mode 100644
index 7ea3edf..0000000
--- a/src/test/kotlin/security/voter/WorkgroupVoterTest.kt
+++ /dev/null
@@ -1,208 +0,0 @@
-package fr.dcproject.security.voter
-
-import fr.dcproject.entity.*
-import fr.dcproject.user
-import fr.ktorVoter.ActionI
-import fr.ktorVoter.VoterException
-import fr.ktorVoter.can
-import io.ktor.application.ApplicationCall
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.amshove.kluent.`should be`
-import org.joda.time.DateTime
-import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import fr.dcproject.entity.Workgroup as WorkgroupEntity
-
-@KtorExperimentalLocationsAPI
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tag("voter")
-internal class WorkgroupVoterTest {
-    private val tesla = CitizenBasic(
-        user = User(
-            username = "nicolas-tesla",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "tesla@best.com",
-        name = CitizenI.Name("Nicolas", "Tesla"),
-        followAnonymous = false
-    )
-
-    private val einstein = CitizenBasic(
-        user = User(
-            username = "albert-einstein",
-            roles = listOf(UserI.Roles.ROLE_USER)
-        ),
-        birthday = DateTime.now(),
-        email = "einstein@best.com",
-        name = CitizenI.Name("Albert", "Einstein"),
-        followAnonymous = true
-    )
-
-    private val article1 = Article(
-        content = "Hi",
-        createdBy = einstein,
-        description = "blablabla",
-        title = "Super article"
-    )
-
-    private val workgroupPublic = WorkgroupEntity(
-        createdBy = tesla,
-        description = "Super desc",
-        name = "super name",
-        anonymous = false,
-        members = listOf(WorkgroupWithMembersI.Member(tesla, listOf(WorkgroupWithMembersI.Member.Role.MASTER)))
-    )
-
-    private val workgroupAnon = WorkgroupEntity(
-        createdBy = tesla,
-        description = "Super desc",
-        name = "super name",
-        members = listOf(WorkgroupWithMembersI.Member(tesla, listOf(WorkgroupWithMembersI.Member.Role.MASTER))),
-        anonymous = true
-    )
-
-    private val workgroupref = WorkgroupRef()
-
-    init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
-    }
-
-    @Test
-    fun `support workgroup`() = WorkgroupVoter().run {
-        val p = object : ActionI {}
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            supports(WorkgroupVoter.Action.VIEW, it, workgroupPublic) `should be` true
-            supports(WorkgroupVoter.Action.VIEW, it, article1) `should be` false
-            supports(p, it, workgroupPublic) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view your workgroup`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(WorkgroupVoter.Action.VIEW, it, workgroupPublic) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be view your workgroup if is not public`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(WorkgroupVoter.Action.VIEW, it, workgroupAnon) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be view workgroup of other if is public`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(WorkgroupVoter.Action.VIEW, it, workgroupPublic) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be view workgroup of other if is not public`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(WorkgroupVoter.Action.VIEW, it, workgroupAnon) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be not view the workgroup if is null`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(WorkgroupVoter.Action.VIEW, it, null) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be view your workgroup list`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(WorkgroupVoter.Action.VIEW, it, listOf(workgroupPublic)) `should be` true
-        }
-    }
-
-    @Test
-    fun `can be create workgroup`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(WorkgroupVoter.Action.CREATE, it, workgroupPublic) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be create workgroup if not connected`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns null
-        }.let {
-            can(WorkgroupVoter.Action.CREATE, it, workgroupPublic) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be delete workgroup if owner`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(WorkgroupVoter.Action.DELETE, it, workgroupPublic) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be delete workgroup if not owner`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(WorkgroupVoter.Action.DELETE, it, workgroupPublic) `should be` false
-        }
-    }
-
-    @Test
-    fun `can be update workgroup if owner`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns tesla.user
-        }.let {
-            can(WorkgroupVoter.Action.UPDATE, it, workgroupPublic) `should be` true
-        }
-    }
-
-    @Test
-    fun `can not be update workgroup if not owner`() = listOf(WorkgroupVoter()).run {
-        mockk<ApplicationCall> {
-            every { user } returns einstein.user
-        }.let {
-            can(WorkgroupVoter.Action.UPDATE, it, workgroupPublic) `should be` false
-        }
-    }
-
-    @Test
-    fun `can not be update workgroup if workgroup has no user`() {
-        Assertions.assertThrows(VoterException::class.java) {
-            listOf(WorkgroupVoter()).run {
-                mockk<ApplicationCall> {
-                    every { user } returns tesla.user
-                }.let {
-                    can(WorkgroupVoter.Action.UPDATE, it, workgroupref)
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/unit/security/Article Access Control.kt b/src/test/kotlin/unit/security/Article Access Control.kt
new file mode 100644
index 0000000..c5474d1
--- /dev/null
+++ b/src/test/kotlin/unit/security/Article Access Control.kt	
@@ -0,0 +1,171 @@
+package unit.security
+
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
+import fr.dcproject.component.article.ArticleAccessControl
+import fr.dcproject.component.article.database.ArticleForListing
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.auth.database.User
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.citizen.database.CitizenCart
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.postgresjson.connexion.Paginated
+import io.mockk.every
+import io.mockk.mockk
+import org.amshove.kluent.`should be`
+import org.joda.time.DateTime
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
+import java.util.UUID
+import fr.dcproject.component.article.database.ArticleRepository as ArticleRepo
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(CONCURRENT)
+@Tags(Tag("security"), Tag("unit"))
+internal class `Article Access Control` {
+    private val tesla = CitizenCreator(
+        id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"),
+        user = UserCreator(
+            username = "nicolas-tesla",
+        ),
+        name = CitizenI.Name("Nicolas", "Tesla"),
+        email = "nikola-tesla@volt.com"
+    )
+    private val einstein = CitizenCart(
+        user = User(
+            username = "albert-einstein",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        name = CitizenI.Name("Albert", "Einstein")
+    )
+
+    private fun getRepo(article: ArticleForListing): ArticleRepo {
+        return mockk {
+            every { find(1, 1, any()) } returns Paginated(listOf(article), 0, 1, 1)
+            every { findVersionsByVersionId(1, 1, any()) } returns Paginated(listOf(article), 0, 1, 1)
+        }
+    }
+
+    @Test
+    fun `creator can be view the article`() {
+        val article = getArticle(tesla).copy(draft = true)
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canView(article, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `other user can be view the article`() {
+        val article = getArticle(tesla)
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canView(article, einstein)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `other user can be view the article list`(): Unit = listOf(ArticleAccessControl(mockk())).run {
+        val article = getArticle(tesla)
+        val article2 = getArticle(tesla)
+
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canView(listOf(article, article2), einstein)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `the no creator can not be view the article on draft`() {
+        val article = getArticle(tesla).copy(draft = true)
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canView(article, einstein)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `the no creator can not be view list of articles if one is on draft`() {
+        val article = getArticle(tesla)
+        val article2 = getArticle(tesla).copy(draft = true)
+
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canView(listOf(article, article2), einstein)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can not view deleted article`() {
+        val article = getArticle(tesla).copy(deletedAt = DateTime.now())
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canView(article, tesla)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can delete article if owner`() {
+        val article = getArticle(tesla)
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canDelete(article, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not delete article if not owner`() {
+        val article = getArticle(tesla).copy(deletedAt = DateTime.now())
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canDelete(article, einstein)
+            .code `should be` "article.delete.notYours"
+    }
+
+    @Test
+    fun `can create article if logged`() {
+        val article = getArticle(tesla)
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canUpsert(article, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not create article if not logged`() {
+        val article = getArticle(tesla)
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canUpsert(article, null)
+            .code `should be` "article.create.notConnected"
+    }
+
+    @Test
+    fun `can update article if yours`() {
+        val article = getArticle(tesla)
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canUpsert(article, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not update article if not yours`() {
+        val article = getArticle(tesla)
+        ArticleAccessControl(getRepo(getArticleForListing(tesla)))
+            .canUpsert(article, einstein)
+            .code `should be` "article.update.notYours"
+    }
+
+    private fun getArticle(createdBy: CitizenCreator = tesla) = ArticleForView(
+        id = UUID.randomUUID(),
+        title = "Hello world",
+        content = "Super",
+        description = "I Rocks",
+        createdBy = createdBy,
+        opinions = mapOf(),
+        versionId = UUID.randomUUID(),
+        versionNumber = 1
+    )
+
+    private fun getArticleForListing(createdBy: CitizenCreator = tesla) = ArticleForListing(
+        id = UUID.randomUUID(),
+        title = "Hello world",
+        createdBy = createdBy,
+    )
+}
diff --git a/src/test/kotlin/unit/security/Citizen Access Control.kt b/src/test/kotlin/unit/security/Citizen Access Control.kt
new file mode 100644
index 0000000..f735b6f
--- /dev/null
+++ b/src/test/kotlin/unit/security/Citizen Access Control.kt	
@@ -0,0 +1,95 @@
+package unit.security
+
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
+import fr.dcproject.component.auth.database.User
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.citizen.CitizenAccessControl
+import fr.dcproject.component.citizen.database.CitizenCart
+import fr.dcproject.component.citizen.database.CitizenI
+import org.amshove.kluent.`should be`
+import org.joda.time.DateTime
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(CONCURRENT)
+@Tags(Tag("security"), Tag("unit"))
+internal class `Citizen Access Control` {
+    private val tesla = CitizenCart(
+        user = User(
+            username = "nicolas-tesla",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        name = CitizenI.Name("Nicolas", "Tesla")
+    )
+    private val einstein = CitizenCart(
+        user = User(
+            username = "albert-einstein",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        name = CitizenI.Name("Albert", "Einstein")
+    )
+
+    private val curie = CitizenCart(
+        user = User(
+            username = "marie-curie",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        name = CitizenI.Name("Marie", "Curie"),
+        deletedAt = DateTime.now()
+    )
+
+    @Test
+    fun `can be view the citizen`() {
+        CitizenAccessControl()
+            .canView(subject = einstein, connectedCitizen = tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be view the citizen list`() {
+        CitizenAccessControl()
+            .canView(subjects = listOf(tesla, einstein), connectedCitizen = einstein)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not view deleted citizen`() {
+        CitizenAccessControl()
+            .canView(subject = curie, connectedCitizen = tesla)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be update itself`() {
+        CitizenAccessControl()
+            .canUpdate(subject = einstein, connectedCitizen = einstein)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be update other citizen`() {
+        CitizenAccessControl()
+            .canUpdate(subject = tesla, connectedCitizen = einstein)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be change password of itself`() {
+        CitizenAccessControl()
+            .canChangePassword(subject = einstein, connectedCitizen = einstein)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be change password of other citizen`() {
+        CitizenAccessControl()
+            .canChangePassword(subject = tesla, connectedCitizen = einstein)
+            .decision `should be` DENIED
+    }
+}
diff --git a/src/test/kotlin/unit/security/Comment Access Control.kt b/src/test/kotlin/unit/security/Comment Access Control.kt
new file mode 100644
index 0000000..89c2034
--- /dev/null
+++ b/src/test/kotlin/unit/security/Comment Access Control.kt	
@@ -0,0 +1,157 @@
+package unit.security
+
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.article.database.ArticleRef
+import fr.dcproject.component.auth.database.User
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.citizen.database.Citizen
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentForUpdate
+import fr.dcproject.component.comment.generic.database.CommentForView
+import org.amshove.kluent.`should be`
+import org.joda.time.DateTime
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
+import java.util.UUID
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(CONCURRENT)
+@Tags(Tag("security"), Tag("unit"))
+internal class `Comment Access Control` {
+    private val tesla = Citizen(
+        user = User(
+            username = "nicolas-tesla",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        birthday = DateTime.now(),
+        email = "tesla@best.com",
+        name = CitizenI.Name("Nicolas", "Tesla")
+    )
+    private val einstein = Citizen(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+        user = User(
+            username = "albert-einstein",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        birthday = DateTime.now(),
+        email = "einstein@best.com",
+        name = CitizenI.Name("Albert", "Einstein")
+    )
+
+    private val einstein2 = CitizenCreator(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+        user = UserCreator(
+            username = "albert-einstein",
+        ),
+        name = CitizenI.Name("Albert", "Einstein"),
+        email = "albert-einstein@email.com"
+    )
+
+    private val article1 = ArticleForView(
+        content = "Hi",
+        createdBy = einstein2,
+        description = "blablabla",
+        title = "Super article"
+    )
+
+    private val comment1 = CommentForView(
+        content = "Hello",
+        createdBy = tesla,
+        target = article1
+    )
+
+    private val commentForUpdate = CommentForUpdate(
+        content = "Hello",
+        createdBy = tesla,
+        target = article1
+    )
+
+    private val comment2 = CommentForView(
+        content = "Hello2",
+        createdBy = einstein,
+        target = article1
+    )
+
+    private val commentTargetDeleted = CommentForView(
+        content = "Hello",
+        createdBy = tesla,
+        target = ArticleForView(
+            content = "Hi",
+            createdBy = einstein2,
+            description = "blablabla",
+            title = "Super article",
+            workgroup = null
+        ).copy(deletedAt = DateTime.now())
+    )
+
+    private val commentTargetNoUser = CommentForView(
+        content = "Hello",
+        createdBy = tesla,
+        target = ArticleRef()
+    )
+
+    @Test
+    fun `can be view the comment`() {
+        CommentAccessControl()
+            .canView(comment1, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be view the comment list`() {
+        CommentAccessControl()
+            .canView(listOf(comment1, comment2), einstein)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be update your comment`() {
+        CommentAccessControl()
+            .canUpdate(comment1, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be update other comment`() {
+        CommentAccessControl()
+            .canUpdate(comment1, einstein)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be create a comment`() {
+        CommentAccessControl()
+            .canCreate(comment1, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be create a comment if target is deleted`() {
+        CommentAccessControl()
+            .canCreate(commentTargetDeleted, tesla)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can not be create a comment with other creator`() {
+        CommentAccessControl()
+            .canCreate(comment1, einstein)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can not be create a comment if not connected`() {
+        CommentAccessControl()
+            .canCreate(comment1, null)
+            .decision `should be` DENIED
+    }
+}
diff --git a/src/test/kotlin/unit/security/Follow Access Control.kt b/src/test/kotlin/unit/security/Follow Access Control.kt
new file mode 100644
index 0000000..d57152a
--- /dev/null
+++ b/src/test/kotlin/unit/security/Follow Access Control.kt	
@@ -0,0 +1,150 @@
+package unit.security
+
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.auth.database.User
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.citizen.database.Citizen
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.follow.FollowAccessControl
+import fr.dcproject.component.follow.database.FollowForView
+import org.amshove.kluent.`should be`
+import org.joda.time.DateTime
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
+import java.util.UUID
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(CONCURRENT)
+@Tags(Tag("security"), Tag("unit"))
+internal class `Follow Access Control` {
+    private val tesla = CitizenCreator(
+        user = UserCreator(
+            username = "nicolas-tesla",
+        ),
+        email = "tesla@best.com",
+        name = CitizenI.Name("Nicolas", "Tesla"),
+        followAnonymous = false
+    )
+    private val tesla2 = Citizen(
+        user = User(
+            username = "nicolas-tesla",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        birthday = DateTime.now(),
+        email = "tesla@best.com",
+        name = CitizenI.Name("Nicolas", "Tesla"),
+        followAnonymous = false
+    )
+
+    private val einstein = CitizenCreator(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+        user = UserCreator(
+            username = "albert-einstein",
+        ),
+        email = "einstein@best.com",
+        name = CitizenI.Name("Albert", "Einstein"),
+        followAnonymous = true
+    )
+
+    private val einstein2 = CitizenCreator(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+        user = UserCreator(
+            username = "albert-einstein",
+        ),
+        name = CitizenI.Name("Albert", "Einstein"),
+        email = "albert-einstein@email.com"
+    )
+
+    private val einstein3 = Citizen(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+        user = User(
+            username = "albert-einstein",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        birthday = DateTime.now(),
+        email = "einstein@best.com",
+        name = CitizenI.Name("Albert", "Einstein"),
+        followAnonymous = true
+    )
+
+    private val article1 = ArticleForView(
+        content = "Hi",
+        createdBy = einstein2,
+        description = "blablabla",
+        title = "Super article"
+    )
+
+    private val follow1 = FollowForView(
+        createdBy = tesla,
+        target = article1
+    )
+
+    private val followAnon = FollowForView(
+        createdBy = einstein,
+        target = article1
+    )
+
+    @Test
+    fun `can be view the follow`() {
+        FollowAccessControl()
+            .canView(follow1, tesla2)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be view the follow list`() {
+        FollowAccessControl()
+            .canView(listOf(follow1), tesla2)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be view your anonymous follow`() {
+        FollowAccessControl()
+            .canView(followAnon, einstein3)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be view the anonymous follow of other`() {
+        FollowAccessControl()
+            .canView(followAnon, tesla2)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be follow article`() {
+        FollowAccessControl()
+            .canCreate(follow1, tesla2)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be follow article if not connected`() {
+        FollowAccessControl()
+            .canCreate(follow1, null)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be unfollow article`() {
+        FollowAccessControl()
+            .canDelete(follow1, tesla2)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be unfollow article if not connected`() {
+        FollowAccessControl()
+            .canDelete(follow1, null)
+            .decision `should be` DENIED
+    }
+}
diff --git a/src/test/kotlin/unit/security/Opinion Access Control.kt b/src/test/kotlin/unit/security/Opinion Access Control.kt
new file mode 100644
index 0000000..8bdd07a
--- /dev/null
+++ b/src/test/kotlin/unit/security/Opinion Access Control.kt	
@@ -0,0 +1,112 @@
+package unit.security
+
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.opinion.OpinionAccessControl
+import fr.dcproject.component.opinion.database.Opinion
+import fr.dcproject.component.opinion.database.OpinionChoice
+import org.amshove.kluent.`should be`
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
+import java.util.UUID
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(CONCURRENT)
+@Tags(Tag("security"), Tag("unit"))
+internal class `Opinion Access Control` {
+    private val tesla = CitizenCreator(
+        user = UserCreator(
+            username = "nicolas-tesla",
+        ),
+        email = "tesla@best.com",
+        name = CitizenI.Name("Nicolas", "Tesla"),
+        followAnonymous = false
+    )
+
+    private val einstein = CitizenRef(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+    )
+
+    private val einstein2 = CitizenCreator(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+        user = UserCreator(
+            username = "albert-einstein",
+        ),
+        name = CitizenI.Name("Albert", "Einstein"),
+        email = "albert-einstein@email.com"
+    )
+
+    private val article1 = ArticleForView(
+        content = "Hi",
+        createdBy = einstein2,
+        description = "blablabla",
+        title = "Super article"
+    )
+
+    private val opinion1 = Opinion(
+        createdBy = tesla,
+        target = article1,
+        choice = OpinionChoice(
+            name = "Opinion1",
+            target = listOf("article")
+        )
+    )
+
+    @Test
+    fun `can be view the opinion`() {
+        OpinionAccessControl()
+            .canView(opinion1, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be view the opinion list`() {
+        OpinionAccessControl()
+            .canView(listOf(opinion1), tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be opinion an article`() {
+        OpinionAccessControl()
+            .canCreate(opinion1, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be opinion if not connected`() {
+        OpinionAccessControl()
+            .canCreate(opinion1, null)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be remove opinion`() {
+        OpinionAccessControl()
+            .canDelete(opinion1, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be remove opinion if not connected`() {
+        OpinionAccessControl()
+            .canDelete(opinion1, null)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can not be remove opinion of other user`() {
+        OpinionAccessControl()
+            .canDelete(opinion1, einstein)
+            .decision `should be` DENIED
+    }
+}
diff --git a/src/test/kotlin/unit/security/OpinionChoice Access Control.kt b/src/test/kotlin/unit/security/OpinionChoice Access Control.kt
new file mode 100644
index 0000000..5c1b78a
--- /dev/null
+++ b/src/test/kotlin/unit/security/OpinionChoice Access Control.kt	
@@ -0,0 +1,46 @@
+package unit.security
+
+import fr.dcproject.common.security.AccessDecision.GRANTED
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.opinion.OpinionChoiceAccessControl
+import fr.dcproject.component.opinion.database.OpinionChoice
+import org.amshove.kluent.`should be`
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
+import java.util.UUID
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(CONCURRENT)
+@Tags(Tag("security"), Tag("unit"))
+internal class `OpinionChoice Access Control` {
+    private val tesla = CitizenRef(
+        id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"),
+    )
+
+    private val tesla2 = CitizenRef(
+        id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"),
+    )
+
+    private val choice1 = OpinionChoice(
+        name = "Opinion1",
+        target = listOf()
+    )
+
+    @Test
+    fun `can be view the opinion choice`() {
+        OpinionChoiceAccessControl()
+            .canView(choice1, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be view the opinion choice list`() {
+        OpinionChoiceAccessControl()
+            .canView(listOf(choice1), tesla)
+            .decision `should be` GRANTED
+    }
+}
diff --git a/src/test/kotlin/unit/security/Vote Access Control.kt b/src/test/kotlin/unit/security/Vote Access Control.kt
new file mode 100644
index 0000000..d04dbb4
--- /dev/null
+++ b/src/test/kotlin/unit/security/Vote Access Control.kt	
@@ -0,0 +1,142 @@
+package unit.security
+
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
+import fr.dcproject.component.article.database.ArticleForView
+import fr.dcproject.component.auth.database.User
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.auth.database.UserI
+import fr.dcproject.component.citizen.database.Citizen
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.vote.VoteAccessControl
+import fr.dcproject.component.vote.database.VoteForUpdate
+import org.amshove.kluent.`should be`
+import org.joda.time.DateTime
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
+import java.util.UUID
+import fr.dcproject.component.vote.database.VoteForView
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(CONCURRENT)
+@Tags(Tag("security"), Tag("unit"))
+internal class `Vote Access Control` {
+    private val tesla = Citizen(
+        id = UUID.fromString("a1e35c99-9d33-4fb4-9201-58d7071243bb"),
+        user = User(
+            username = "nicolas-tesla",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        birthday = DateTime.now(),
+        email = "tesla@best.com",
+        name = CitizenI.Name("Nicolas", "Tesla"),
+        followAnonymous = false
+    )
+    private val tesla3 = CitizenCreator(
+        id = UUID.fromString("a1e35c99-9d33-4fb4-9201-58d7071243bb"),
+        user = UserCreator(
+            username = "nicolas-tesla",
+        ),
+        email = "tesla@best.com",
+        name = CitizenI.Name("Nicolas", "Tesla"),
+        followAnonymous = false
+    )
+
+    private val einstein = Citizen(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+        user = User(
+            username = "albert-einstein",
+            roles = listOf(UserI.Roles.ROLE_USER)
+        ),
+        birthday = DateTime.now(),
+        email = "einstein@best.com",
+        name = CitizenI.Name("Albert", "Einstein"),
+        followAnonymous = true
+    )
+
+    private val einstein2 = CitizenCreator(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+        user = UserCreator(
+            username = "albert-einstein",
+        ),
+        name = CitizenI.Name("Albert", "Einstein"),
+        email = "albert-einstein@email.com"
+    )
+
+    private val article1 = ArticleForView(
+        content = "Hi",
+        createdBy = einstein2,
+        description = "blablabla",
+        title = "Super article"
+    )
+
+    private val vote1 = VoteForView(
+        createdBy = tesla3,
+        target = article1,
+        note = 1
+    )
+
+    private val voteForUpdate = VoteForUpdate(
+        createdBy = tesla,
+        target = article1,
+        note = 1
+    )
+
+    private val voteOnDeleted = VoteForUpdate(
+        createdBy = tesla,
+        target = ArticleForView(
+            content = "Hi",
+            createdBy = einstein2,
+            description = "blablabla",
+            title = "Super article"
+        ).copy(deletedAt = DateTime.now()),
+        note = 1
+    )
+
+    @Test
+    fun `can be view your the vote`() {
+        VoteAccessControl()
+            .canView(vote1, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be view vote of other`() {
+        VoteAccessControl()
+            .canView(vote1, einstein)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be view your votes list`() {
+        VoteAccessControl()
+            .canView(listOf(vote1), tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be vote an article`() {
+        VoteAccessControl()
+            .canCreate(voteForUpdate, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be vote if not connected`() {
+        VoteAccessControl()
+            .canCreate(voteForUpdate, null)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can not be vote an article if article is deleted`() {
+        VoteAccessControl()
+            .canCreate(voteOnDeleted, tesla)
+            .decision `should be` DENIED
+    }
+}
diff --git a/src/test/kotlin/unit/security/Workgroup Access Control.kt b/src/test/kotlin/unit/security/Workgroup Access Control.kt
new file mode 100644
index 0000000..aedc0ae
--- /dev/null
+++ b/src/test/kotlin/unit/security/Workgroup Access Control.kt	
@@ -0,0 +1,130 @@
+package unit.security
+
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
+import fr.dcproject.component.auth.database.UserCreator
+import fr.dcproject.component.citizen.database.CitizenCreator
+import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.citizen.database.CitizenRef
+import fr.dcproject.component.workgroup.WorkgroupAccessControl
+import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI
+import org.amshove.kluent.`should be`
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Tags
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
+import java.util.UUID
+import fr.dcproject.component.workgroup.database.WorkgroupForView as WorkgroupEntity
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(CONCURRENT)
+@Tags(Tag("security"), Tag("unit"))
+internal class `Workgroup Access Control` {
+    private val tesla = CitizenCreator(
+        user = UserCreator(
+            username = "nicolas-tesla",
+        ),
+        email = "tesla@best.com",
+        name = CitizenI.Name("Nicolas", "Tesla"),
+        followAnonymous = false
+    )
+
+    private val einstein = CitizenRef(
+        id = UUID.fromString("319f1226-8f47-4df3-babd-2c7671ad0fbc"),
+    )
+
+    private val workgroupPublic = WorkgroupEntity(
+        createdBy = tesla,
+        description = "Super desc",
+        name = "super name",
+        anonymous = false,
+        members = listOf(WorkgroupWithMembersI.Member(tesla, listOf(WorkgroupWithMembersI.Member.Role.MASTER)))
+    )
+
+    private val workgroupAnon = WorkgroupEntity(
+        createdBy = tesla,
+        description = "Super desc",
+        name = "super name",
+        members = listOf(WorkgroupWithMembersI.Member(tesla, listOf(WorkgroupWithMembersI.Member.Role.MASTER))),
+        anonymous = true
+    )
+
+    @Test
+    fun `can be view your workgroup`() {
+        WorkgroupAccessControl()
+            .canView(workgroupPublic, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be view your workgroup if is not public`() {
+        WorkgroupAccessControl()
+            .canView(workgroupAnon, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be view workgroup of other if is public`() {
+        WorkgroupAccessControl()
+            .canView(workgroupPublic, einstein)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be view workgroup of other if is not public`() {
+        WorkgroupAccessControl()
+            .canView(workgroupAnon, einstein)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be view your workgroup list`() {
+        WorkgroupAccessControl()
+            .canView(listOf(workgroupPublic, workgroupAnon), tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can be create workgroup`() {
+        WorkgroupAccessControl()
+            .canCreate(workgroupPublic, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be create workgroup if not connected`() {
+        WorkgroupAccessControl()
+            .canCreate(workgroupPublic, null)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be delete workgroup if owner`() {
+        WorkgroupAccessControl()
+            .canDelete(workgroupPublic, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be delete workgroup if not owner`() {
+        WorkgroupAccessControl()
+            .canDelete(workgroupPublic, einstein)
+            .decision `should be` DENIED
+    }
+
+    @Test
+    fun `can be update workgroup if owner`() {
+        WorkgroupAccessControl()
+            .canUpdate(workgroupPublic, tesla)
+            .decision `should be` GRANTED
+    }
+
+    @Test
+    fun `can not be update workgroup if not owner`() {
+        WorkgroupAccessControl()
+            .canUpdate(workgroupPublic, einstein)
+            .decision `should be` DENIED
+    }
+}
diff --git a/src/test/resources/application-test.conf b/src/test/resources/application-test.conf
new file mode 100644
index 0000000..d860fb3
--- /dev/null
+++ b/src/test/resources/application-test.conf
@@ -0,0 +1,39 @@
+ktor {
+    deployment {
+        port = 8181
+    }
+    application {
+        modules = [ fr.dcproject.ApplicationKt.module ]
+    }
+}
+
+app {
+    envName = test
+    domain = dc-project.fr
+}
+
+db {
+    host = localhost
+    database = test
+    username = test
+    password = test
+    port = 15432
+}
+
+redis {
+    connection = "redis://localhost:6380"
+}
+
+rabbitmq {
+    connection = "amqp://localhost:5673"
+}
+
+elasticsearch {
+    connection = "http://localhost:9201"
+}
+
+mail {
+    sendGrid {
+        key = "abcd"
+    }
+}
diff --git a/src/test/resources/feature/articles.feature b/src/test/resources/feature/articles.feature
deleted file mode 100644
index 3d1b6e1..0000000
--- a/src/test/resources/feature/articles.feature
+++ /dev/null
@@ -1,54 +0,0 @@
-@article
-Feature: articles routes
-
-  Scenario: The route for get articles must response a 200
-    Given I have 3 article
-    When I send a GET request to "/articles"
-    Then the response status code should be 200
-
-  Scenario: Can get articles filtered by workgroup
-    Given I have 3 article
-    And I have workgroup:
-      | id   | 2bccd5a7-9082-4b31-88f8-e25d70b22b12 |
-      | name | Les papy                             |
-    And I have article created by workgroup ID "2bccd5a7-9082-4b31-88f8-e25d70b22b12"
-    When I send a GET request to "/articles?workgroup=2bccd5a7-9082-4b31-88f8-e25d70b22b12"
-    Then the response status code should be 200
-    And the JSON should contain:
-      | total                   | 1        |
-      | result[0]workgroup.name | Les papy |
-
-  Scenario: Can get versions of article by the id
-    Given I have article
-      | id | 13e6091c-8fed-4600-b079-a97a6b7a9800 |
-    When I send a GET request to "/articles/13e6091c-8fed-4600-b079-a97a6b7a9800/versions"
-    Then the response status code should be 200
-
-  Scenario: The route for get one article must response a 200 and return article
-    Given I have article
-      | id | 65cda9f3-8991-4420-8d41-1da9da72c9bb |
-    When I send a GET request to "/articles/65cda9f3-8991-4420-8d41-1da9da72c9bb"
-    Then the response status code should be 200
-    And the response should contain object:
-      | id | 65cda9f3-8991-4420-8d41-1da9da72c9bb |
-
-  Scenario: The route for create article must response a 200 and return object
-    Given I have citizen John Doe
-    And I am authenticated as John Doe
-    When I send a POST request to "/articles" with body:
-    """
-    {
-      "version_id": "09c418b6-63ba-448b-b38b-502b41cd500e",
-      "title": "title2",
-      "annonymous": false,
-      "content": "content2",
-      "description": "description2",
-      "tags": [
-          "green"
-      ]
-    }
-    """
-    Then the response status code should be 200
-    And the response should contain object:
-      | version_id | 09c418b6-63ba-448b-b38b-502b41cd500e |
-      | title      | title2                               |
\ No newline at end of file
diff --git a/src/test/resources/feature/auth.feature b/src/test/resources/feature/auth.feature
deleted file mode 100644
index 9ff7e3e..0000000
--- a/src/test/resources/feature/auth.feature
+++ /dev/null
@@ -1,50 +0,0 @@
-@auth
-Feature: Auth routes
-
-  Scenario: The route for create citizen must response a 200 and return object
-    When I send a POST request to "/register" with body:
-    """
-    {
-      "name": {"first_name":"George", "last_name":"MICHEL"},
-      "birthday": "2001-01-01",
-      "user":{
-        "username": "george-junior",
-        "plain_password": "azerty"
-      },
-      "email": "george-junior@gmail.com"
-    }
-    """
-    Then the response status code should be 200
-    And the Response should contain:
-    """
-    eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.
-    """
-
-  Scenario: The route for create citizen must response a 400 and return object
-    When I send a POST request to "/register" with body:
-    """
-    {
-      "name": {"first_name":"George2", "last_name":"MICHEL2"},
-      "birthday": "2001-01-01",
-      "user":{
-        "username": "",
-        "plain_password": ""
-      }
-    }
-    """
-    Then the response status code should be 400
-
-  Scenario: The route for create citizen must response a 200 and return object
-    Given I have citizen Niels Bohr
-    When I send a POST request to "/login" with body:
-    """
-    {
-      "name": "niels-bohr",
-      "password": "azerty"
-    }
-    """
-    Then the response status code should be 200
-    And the Response should contain:
-    """
-    eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.
-    """
\ No newline at end of file
diff --git a/src/test/resources/feature/citizen.feature b/src/test/resources/feature/citizen.feature
deleted file mode 100644
index 45bf75d..0000000
--- a/src/test/resources/feature/citizen.feature
+++ /dev/null
@@ -1,65 +0,0 @@
-@citizen
-Feature: citizens routes
-
-  Scenario: The route for get citizens must response a 200
-    Given I have citizen Jean Perrin with ID "5267a5c6-af42-4a02-aa2b-6b71d2e43973"
-    And I am authenticated as Jean Perrin
-    When I send a GET request to "/citizens"
-    Then the response status code should be 200
-
-  Scenario: The route for get one citizen must response a 200 and return citizen
-    Given I have citizen Linus Pauling with ID "47a05c0f-7329-46c3-a7d0-325db37e9114"
-    Given I am authenticated as Linus Pauling
-    When I send a GET request to "/citizens/47a05c0f-7329-46c3-a7d0-325db37e9114"
-    Then the response status code should be 200
-    And the response should contain object:
-      | id | 47a05c0f-7329-46c3-a7d0-325db37e9114 |
-
-  Scenario: Can get connected citizen
-    Given I have citizen Henri Becquerel with ID "47356809-c8ef-4649-8b99-1c5cb9886d38"
-    Given I am authenticated as Henri Becquerel
-    When I send a GET request to "/citizens/current"
-    Then the response status code should be 200
-    And the response should contain object:
-      | id | 47356809-c8ef-4649-8b99-1c5cb9886d38 |
-
-  @online
-  Scenario: Can be connect with SSO
-    Given I have citizen
-      | id        | c606110c-ff0e-4d09-a79e-74632d7bf7bd |
-      | email     | fabrice.lecomte.be@gmail.com         |
-      | firstName | Leonhard                             |
-      | lastName  | Euler                                |
-    When I send a POST request to "/sso" with body:
-    """
-    {
-      "url": "https://dc-project.fr/password/reset",
-      "email": "fabrice.lecomte.be@gmail.com"
-    }
-    """
-    Then the response status code should be 204
-
-  Scenario: Can be change my password
-    Given I have citizen Georges Charpak with ID "0c966522-4071-43e5-a3ca-cfff2557f2cf"
-    And I am authenticated as Georges Charpak
-    When I send a PUT request to "/citizens/0c966522-4071-43e5-a3ca-cfff2557f2cf/password/change" with body:
-    """
-    {
-      "old_password": "azerty",
-      "new_password": "qwerty"
-    }
-    """
-    Then the response status code should be 201
-
-  Scenario: If a send bad request when a change password, that return a 400 Bad request
-
-    Given I have citizen Louis Breguet with ID "6cf2a19d-d15d-4ee5-b2a9-907afd26b525"
-    And I am authenticated as Louis Breguet
-    When I send a PUT request to "/citizens/6cf2a19d-d15d-4ee5-b2a9-907afd26b525/password/change" with body:
-    """
-    {
-      "plup": "azerty",
-      "gloup": "qwerty"
-    }
-    """
-    Then the response status code should be 400
diff --git a/src/test/resources/feature/comment.feature b/src/test/resources/feature/comment.feature
deleted file mode 100644
index f4fcc2e..0000000
--- a/src/test/resources/feature/comment.feature
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment
-Feature: comment
-
-  Scenario: Can comment childrens
-    Given I have citizen John Dalton
-    And I am authenticated as John Dalton
-    And I have article
-      | id | 4c948e8f-eada-4e10-8d7d-7192affe1313 |
-    And I have comment created by John Dalton on article "4c948e8f-eada-4e10-8d7d-7192affe1313"
-    When I send a GET request to "/comments/4c948e8f-eada-4e10-8d7d-7192affe1313/children"
-    Then the response status code should be 200
\ No newline at end of file
diff --git a/src/test/resources/feature/commentArticle.feature b/src/test/resources/feature/commentArticle.feature
deleted file mode 100644
index d8351ba..0000000
--- a/src/test/resources/feature/commentArticle.feature
+++ /dev/null
@@ -1,80 +0,0 @@
-@comment
-Feature: comment Article
-
-  Scenario: Can comment an article
-    Given I have citizen Michael Faraday
-    And I am authenticated as Michael Faraday
-    And I have article
-      | id | aa16c635-28da-46f0-9a89-934eef88c7ca |
-    When I send a POST request to "/articles/aa16c635-28da-46f0-9a89-934eef88c7ca/comments" with body:
-    """
-    {
-      "content": "Hello mister"
-    }
-    """
-    Then the response status code should be 201
-
-  # TODO add more comment on article
-  Scenario: Can get all comment on article
-    Given I have citizen Enrico Fermi
-    And I am authenticated as Enrico Fermi
-    And I have article
-      | id | 6166c078-ca97-4366-b0aa-2a5cd558c78a |
-    And I have comment created by Enrico Fermi on article "6166c078-ca97-4366-b0aa-2a5cd558c78a"
-    When I send a GET request to "/articles/6166c078-ca97-4366-b0aa-2a5cd558c78a/comments"
-    Then the response status code should be 200
-
-  # TODO add votes
-  Scenario: Can get all comment on article sorted by votes
-    Given I have citizen Pierre Curie
-    And I am authenticated as Pierre Curie
-    And I have article
-      | id | 5e209f63-57ce-43ca-922a-273b0d62f567 |
-    And I have comment created by Pierre Curie on article "5e209f63-57ce-43ca-922a-273b0d62f567"
-    When I send a GET request to "/articles/5e209f63-57ce-43ca-922a-273b0d62f567/comments?sort=votes"
-    Then the response status code should be 200
-    And the response should contain object:
-      | $.result[0].votes.up | 0 |
-
-  Scenario: Can get comments on articles of the current citizen
-    Given I have citizen Erwin Schrodinger with ID "292a20cc-4a60-489e-9866-a95d38ffaf47"
-    And I have article
-      | id        | 17df7fb9-b388-4e20-ab19-29c29972da01 |
-      | createdBy | Erwin Schrodinger                    |
-    And I have comment created by Erwin Schrodinger on article "17df7fb9-b388-4e20-ab19-29c29972da01"
-    When I send a GET request to "/citizens/292a20cc-4a60-489e-9866-a95d38ffaf47/comments/articles"
-    Then the response status code should be 200
-    And the response should contain object:
-      | current_page | 1  |
-      | limit        | 50 |
-    And the Response should contain:
-    """
-    292a20cc-4a60-489e-9866-a95d38ffaf47
-    """
-
-  Scenario: Can edit a comment
-    Given I have citizen Hubert Reeves
-    And I have article
-      | id | bb05e4a3-55a1-4088-85e7-8d8c23be29b1 |
-    And I am authenticated as Hubert Reeves
-    And I have comment created by Hubert Reeves on article "bb05e4a3-55a1-4088-85e7-8d8c23be29b1":
-      | id | fd30d20f-656c-42c6-8955-f61c04537464 |
-    When I send a PUT request to "/comments/fd30d20f-656c-42c6-8955-f61c04537464" with body:
-    """
-    Hello boy
-    """
-    Then the response status code should be 200
-    And the JSON should contain:
-      | content | Hello boy |
-
-  Scenario: Can get comment by its ID
-    Given I have citizen Alfred Kastler
-    And I have article
-      | id | 3897465b-19d2-43a0-86ea-1e29dbb11ec9 |
-    And I have comment created by Alfred Kastler on article "3897465b-19d2-43a0-86ea-1e29dbb11ec9":
-      | id      | edd296a8-fc7a-4717-a2bb-9f035ceca3c2 |
-      | content | Hello boy                            |
-    When I send a GET request to "/comments/edd296a8-fc7a-4717-a2bb-9f035ceca3c2"
-    Then the response status code should be 200
-    And the JSON should contain:
-      | content | Hello boy |
diff --git a/src/test/resources/feature/commentConstitution.feature b/src/test/resources/feature/commentConstitution.feature
deleted file mode 100644
index 6a1001c..0000000
--- a/src/test/resources/feature/commentConstitution.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-@comment
-Feature: comment Constitution
-
-  Scenario: Can comment an constitution
-    Given I have citizen Nicolas Copernic
-    And I am authenticated as Nicolas Copernic
-    And I have constitution
-      | id | 1707c287-a472-4a62-89f2-9e85030e915c |
-    When I send a POST request to "/constitutions/1707c287-a472-4a62-89f2-9e85030e915c/comments" with body:
-    """
-    {
-      "content": "Hello mister"
-    }
-    """
-    Then the response status code should be 201
-
-  Scenario: Can get comments on constitutions of the current citizen
-    Given I have citizen Charles Darwin with ID "46e0bda9-ca6a-4c65-a58b-7e7267a0bbc5"
-    And I have constitution
-      | id        | 34ddd50a-da00-4a90-a869-08baa2a121be |
-      | createdBy | Charles Darwin                       |
-    And I have comment created by Charles Darwin on constitution "34ddd50a-da00-4a90-a869-08baa2a121be"
-    When I send a GET request to "/citizens/46e0bda9-ca6a-4c65-a58b-7e7267a0bbc5/comments/constitutions"
-    Then the response status code should be 200
-    And the response should contain object:
-      | current_page | 1  |
-      | limit        | 50 |
-    And the Response should contain:
-    """
-    34ddd50a-da00-4a90-a869-08baa2a121be
-    """
diff --git a/src/test/resources/feature/constitution.feature b/src/test/resources/feature/constitution.feature
deleted file mode 100644
index 242bcde..0000000
--- a/src/test/resources/feature/constitution.feature
+++ /dev/null
@@ -1,36 +0,0 @@
-@constitution
-Feature: constitution
-
-  Scenario: The route for get constitutions must response a 200
-    Given I have 3 constitution
-    When I send a GET request to "/constitutions"
-    Then the response status code should be 200
-
-  Scenario: The route for get one constitution must response a 200 and return constitution
-    Given I have constitution with ID "0321c8d1-4ce3-4763-b5f4-a92611d280b4"
-    When I send a GET request to "/constitutions/0321c8d1-4ce3-4763-b5f4-a92611d280b4"
-    Then the response status code should be 200
-    And the response should contain object:
-      | id | 0321c8d1-4ce3-4763-b5f4-a92611d280b4 |
-
-  Scenario: The route for create constitution must response a 200 and return object
-    Given I have citizen Henri Poincaré
-    And I am authenticated as Henri Poincaré
-    When I send a POST request to "/constitutions" with body:
-    """
-    {
-       "version_id":"15814bb6-8d90-4c6a-a456-c3939a8ec75e",
-       "title":"Hello world!",
-       "annonymous":true,
-       "titles":[
-          {
-             "name":"plop",
-             "rank":0
-          }
-       ]
-    }
-    """
-    Then the response status code should be 200
-    And the response should contain object:
-      | version_id | 15814bb6-8d90-4c6a-a456-c3939a8ec75e |
-      | title      | Hello world!                         |
\ No newline at end of file
diff --git a/src/test/resources/feature/followArticle.feature b/src/test/resources/feature/followArticle.feature
deleted file mode 100644
index d007194..0000000
--- a/src/test/resources/feature/followArticle.feature
+++ /dev/null
@@ -1,42 +0,0 @@
-@follow
-Feature: follow Article
-
-  # Article
-  Scenario: The route for follow article must response a 201 and return
-    Given I have citizen Louis Pasteur
-    And I am authenticated as Louis Pasteur
-    And I have article
-      | id | 04754b7b-edef-4adc-af81-75e3aadeebea |
-    When I send a POST request to "/articles/04754b7b-edef-4adc-af81-75e3aadeebea/follows"
-    Then the response status code should be 201
-
-  Scenario: The route for get follows of articles must response a 200 and return objects
-    Given I have citizen Johannes Kepler with ID "e4592d53-3660-4264-8353-ebdbf5d9c41c"
-    And I am authenticated as Johannes Kepler
-    And I have article
-      | id | d743619a-1f6b-4d20-a2d6-8e81f0e6a4c8 |
-    And I have follow of Johannes Kepler on article "d743619a-1f6b-4d20-a2d6-8e81f0e6a4c8"
-    When I send a GET request to "/citizens/e4592d53-3660-4264-8353-ebdbf5d9c41c/follows/articles"
-    Then the response status code should be 200
-    And the response should contain object:
-      | current_page | 1  |
-      | limit        | 50 |
-
-  Scenario: The route for unfollow article must response a 204
-    Given I have citizen Thomas Edison
-    And I am authenticated as Thomas Edison
-    And I have article
-      | id | aad3aa9d-95fd-4919-9e84-46255f620e31 |
-    And I have follow of Thomas Edison on article "aad3aa9d-95fd-4919-9e84-46255f620e31"
-    When I send a DELETE request to "/articles/aad3aa9d-95fd-4919-9e84-46255f620e31/follows"
-    Then the response status code should be 204
-
-  Scenario: I can know if I follow an article
-    Given I have article with ID "3ee4e6d0-f312-4940-872d-1f578c8d824c"
-    And I have citizen Marie Curie
-    And I am authenticated as Marie Curie
-    And I have follow of Marie Curie on article "3ee4e6d0-f312-4940-872d-1f578c8d824c"
-    When I send a GET request to "/articles/3ee4e6d0-f312-4940-872d-1f578c8d824c/follows"
-    Then the response status code should be 200
-    And the JSON should contain:
-      | target.id | 3ee4e6d0-f312-4940-872d-1f578c8d824c |
diff --git a/src/test/resources/feature/followConstitution.feature b/src/test/resources/feature/followConstitution.feature
deleted file mode 100644
index 367b518..0000000
--- a/src/test/resources/feature/followConstitution.feature
+++ /dev/null
@@ -1,42 +0,0 @@
-@follow
-Feature: follow Constitution
-
-  # Constitution
-  Scenario: The route for follow constitution must response a 201 and return
-    Given I have citizen Dmitri Mendeleïev
-    And I am authenticated as Dmitri Mendeleïev
-    And I have constitution
-      | id | f6553f5e-0cf5-476a-b84e-15e52ec9d8f9 |
-    When I send a POST request to "/constitutions/f6553f5e-0cf5-476a-b84e-15e52ec9d8f9/follows"
-    Then the response status code should be 201
-
-  Scenario: The route for get follows of constitutions must response a 200 and return objects
-    Given I have citizen André-Marie Ampère with ID "877b45b0-302d-487d-8944-6d03ccdbd0f8"
-    And I am authenticated as André-Marie Ampère
-    And I have constitution
-      | id | 7f642078-8e74-47fc-9712-0c37531674a0 |
-    And I have follow of André-Marie Ampère on constitution "7f642078-8e74-47fc-9712-0c37531674a0"
-    When I send a GET request to "/citizens/877b45b0-302d-487d-8944-6d03ccdbd0f8/follows/constitutions"
-    Then the response status code should be 200
-    And the response should contain object:
-      | current_page | 1  |
-      | limit        | 50 |
-
-  Scenario: The route for unfollow constitution must response a 204
-    Given I have citizen Claude Ptolémée
-    And I am authenticated as Claude Ptolémée
-    And I have constitution
-      | id | 4ea03776-a28c-4202-9b90-db1b942946c1 |
-    And I have follow of Claude Ptolémée on constitution "4ea03776-a28c-4202-9b90-db1b942946c1"
-    When I send a DELETE request to "/constitutions/4ea03776-a28c-4202-9b90-db1b942946c1/follows"
-    Then the response status code should be 204
-
-  Scenario: I can know if I follow an constitution
-    Given I have constitution with ID "5141e781-ebcd-4de0-8c2b-7d23d4cd58b5"
-    And I have citizen Denis Papin
-    And I am authenticated as Denis Papin
-    And I have follow of Denis Papin on constitution "5141e781-ebcd-4de0-8c2b-7d23d4cd58b5"
-    When I send a GET request to "/constitutions/5141e781-ebcd-4de0-8c2b-7d23d4cd58b5/follows"
-    Then the response status code should be 200
-    And the JSON should contain:
-      | target.id | 5141e781-ebcd-4de0-8c2b-7d23d4cd58b5 |
diff --git a/src/test/resources/feature/opinion.feature b/src/test/resources/feature/opinion.feature
deleted file mode 100644
index 070a290..0000000
--- a/src/test/resources/feature/opinion.feature
+++ /dev/null
@@ -1,75 +0,0 @@
-@opinion
-Feature: Opinion
-
-  Scenario: Can get all opinion choices
-    Given I have an opinion choice "Opinion1"
-    And I have an opinion choice "Opinion2"
-    When I send a GET request to "/opinions"
-    Then the response status code should be 200
-    And the JSON should contain:
-      | [0]name | Opinion1 |
-      | [1]name | Opinion2 |
-
-  Scenario: Can get one opinion Choices
-    Given I have an opinion choice "Opinion3" with ID "347ec243-0e76-4ab5-9884-7bd503cf5ab5"
-    When I send a GET request to "/opinions/347ec243-0e76-4ab5-9884-7bd503cf5ab5"
-    Then the response status code should be 200
-    And the JSON should contain:
-      | name | Opinion3 |
-
-  Scenario: Can create opinion on article
-    Given I have citizen Isaac Newton with ID "2f414045-95d9-42ca-a3a9-8cdde52ad253"
-    And I am authenticated as Isaac Newton
-    And I have article
-      | id        | 9226c1a3-8091-c3fa-7d0d-c2e98c9bee7b |
-      | createdBy | Isaac Newton                         |
-    And I have an opinion choice "Opinion4" with ID "0f4f1721-3136-44f1-9f31-1459f3317b15"
-    And I have an opinion "Opinion4" on article "9226c1a3-8091-c3fa-7d0d-c2e98c9bee7b" created by Isaac Newton with ID "74e93e12-556b-4399-95a6-04f93a4dd66c"
-    When I send a PUT request to "/articles/9226c1a3-8091-c3fa-7d0d-c2e98c9bee7b/opinions" with body:
-    """
-    {
-      "ids": [
-        "0f4f1721-3136-44f1-9f31-1459f3317b15"
-      ]
-    }
-    """
-    Then the response status code should be 201
-
-  Scenario: Can I get all opinions of citizen filtered by target ids
-    Given I have article with ID "4eb8a2c6-ba63-4c1e-919f-72017132a54e"
-    And I have citizen Albert Jacquard with ID "c6392fc4-56f5-461b-8015-953a4da3029f"
-    And I am authenticated as Albert Jacquard
-    And I have an opinion choice "Opinion5" with ID "74d6e105-9aa6-4589-8776-82ce260bb6f4"
-    And I have an opinion "Opinion5" on article "4eb8a2c6-ba63-4c1e-919f-72017132a54e" created by Albert Jacquard with ID "994660e7-e9f4-4ae9-9290-b34d78663c7a"
-    When I send a GET request to "/citizens/c6392fc4-56f5-461b-8015-953a4da3029f/opinions?id=4eb8a2c6-ba63-4c1e-919f-72017132a54e"
-    Then the response status code should be 200
-    And the JSON should contain:
-      | [0].name | Opinion5 |
-
-  Scenario: Can recieve opinion aggregation with article
-    Given I have an opinion choice "Opinion6"
-    And I have an opinion choice "Opinion7"
-    And I have an opinion choice "Opinion8"
-    And I have citizen James Watt
-    And I have citizen Paul Langevin
-    And I have article with ID "bda8940a-6792-4f2b-936a-ba5c805c8487"
-    And I have an opinion "Opinion6" on article "bda8940a-6792-4f2b-936a-ba5c805c8487" created by James Watt
-    And I have an opinion "Opinion7" on article "bda8940a-6792-4f2b-936a-ba5c805c8487" created by James Watt
-    And I have an opinion "Opinion7" on article "bda8940a-6792-4f2b-936a-ba5c805c8487" created by Paul Langevin
-    When I send a GET request to "/articles/bda8940a-6792-4f2b-936a-ba5c805c8487"
-    Then the response status code should be 200
-    And the JSON should contain:
-      | opinions.Opinion6 | 1 |
-      | opinions.Opinion7 | 2 |
-
-  Scenario: Can get all opinion of one citizen
-    Given I have citizen Albert Einstein with ID "c1542096-3431-432d-8e35-9dc071d4c818"
-    And I am authenticated as Albert Einstein
-    And I have an opinion choice "Opinion9"
-    And I have article with ID "8651b530-ac1b-4214-a784-706781371074"
-    And I have an opinion "Opinion9" on article "8651b530-ac1b-4214-a784-706781371074" created by Albert Einstein
-    When I send a GET request to "/citizens/c1542096-3431-432d-8e35-9dc071d4c818/opinions/articles"
-    Then the response status code should be 200
-    And the JSON element result should have 1 items
-    And the JSON should contain:
-      | result[0].name | Opinion9 |
diff --git a/src/test/resources/feature/vote.feature b/src/test/resources/feature/vote.feature
deleted file mode 100644
index e6ac195..0000000
--- a/src/test/resources/feature/vote.feature
+++ /dev/null
@@ -1,68 +0,0 @@
-@vote
-Feature: vote Article
-
-  Scenario: Can Vote article
-    Given I have citizen Thalès Milet
-    And I am authenticated as Thalès Milet
-    And I have article with ID "835c5101-ca39-4038-a4e6-da6ee62ca6d5"
-    When I send a PUT request to "/articles/835c5101-ca39-4038-a4e6-da6ee62ca6d5/vote" with body:
-    """
-    {
-      "note": 1
-    }
-    """
-    Then the response status code should be 201
-
-  Scenario: Can Vote constitution
-    Given I have citizen Gregor Mendel
-    And I am authenticated as Gregor Mendel
-    And I have constitution with ID "76e79c89-efc1-492d-9e8f-dc9717363a11"
-    When I send a PUT request to "/constitutions/76e79c89-efc1-492d-9e8f-dc9717363a11/vote" with body:
-    """
-    {
-      "note": -1
-    }
-    """
-    Then the response status code should be 201
-
-  Scenario: Can get votes of current citizen
-    Given I have citizen Carl Gauss with ID "c044823d-e778-4256-9016-b1334bf933d3"
-    And I am authenticated as Carl Gauss
-    And I have article with ID "7c9286db-470d-448c-aab1-3f0b072213b1"
-    And I have an vote 1 on article "7c9286db-470d-448c-aab1-3f0b072213b1" created by Carl Gauss
-    When I send a GET request to "/citizens/c044823d-e778-4256-9016-b1334bf933d3/votes/articles"
-    Then the response status code should be 200
-    And the response should contain object:
-      | current_page   | 1  |
-      | limit          | 50 |
-      | total          | 1  |
-      | result[0].note | 1  |
-
-  Scenario: Can get votes of current citizen by target ids
-    Given I have citizen Rosalind Franklin with ID "ab3269f0-877b-46b2-ae1a-e7e7d1c12132"
-    And I am authenticated as Rosalind Franklin
-    And I have article with ID "4d457f53-b937-4622-9542-d5f689d3716b"
-    And I have an vote 1 on article "4d457f53-b937-4622-9542-d5f689d3716b" created by Rosalind Franklin
-    And I have article with ID "117ef3e6-a740-4d04-9a4a-a800a5f274b4"
-    And I have an vote -1 on article "117ef3e6-a740-4d04-9a4a-a800a5f274b4" created by Rosalind Franklin
-    When I send a GET request to "/citizens/ab3269f0-877b-46b2-ae1a-e7e7d1c12132/votes?id=4d457f53-b937-4622-9542-d5f689d3716b&id=117ef3e6-a740-4d04-9a4a-a800a5f274b4"
-    Then the response status code should be 200
-    And the response should contain object:
-      | [0].note | -1 |
-      | [1].note | 1  |
-
-  Scenario: Can vote a comment
-    Given I have citizen Antoine Lavoisier
-    And I am authenticated as Antoine Lavoisier
-    And I have article with ID "54428366-e71e-4961-876c-8a13df5e4b41"
-    And I have comment created by Antoine Lavoisier on article "54428366-e71e-4961-876c-8a13df5e4b41":
-      | id | e793eccc-456b-4450-a292-46d592229b74 |
-    When I send a PUT request to "/comments/e793eccc-456b-4450-a292-46d592229b74/vote" with body:
-    """
-    {
-      "note": -1
-    }
-    """
-    Then the response status code should be 201
-    And the response should contain object:
-      | down | 1 |
diff --git a/src/test/resources/feature/workgroup.feature b/src/test/resources/feature/workgroup.feature
deleted file mode 100644
index e2ca91a..0000000
--- a/src/test/resources/feature/workgroup.feature
+++ /dev/null
@@ -1,140 +0,0 @@
-@workgroup
-Feature: Workgroup
-
-  Scenario: Can get one workgroup
-    Given I have citizen Stephen Hawking
-    And I have citizen Sadi Carnot with ID "be3b0926-8628-4426-804a-75188a6eb315"
-    And I have citizen Joseph Fourier with ID "d9671eca-abaf-4b67-9230-3ece700c1ddb"
-    And I am authenticated as Stephen Hawking
-    And I have workgroup:
-      | id         | ab469134-bf14-4856-b093-ae1aa990f977 |
-      | name       | Les Mousquets                        |
-      | created_by | Stephen Hawking                      |
-    And I have members in workgroup "ab469134-bf14-4856-b093-ae1aa990f977":
-      | be3b0926-8628-4426-804a-75188a6eb315 |
-      | d9671eca-abaf-4b67-9230-3ece700c1ddb |
-    When I send a GET request to "/workgroups/ab469134-bf14-4856-b093-ae1aa990f977"
-    Then the response status code should be 200
-    And the response should contain object:
-      | $.id                                 | ab469134-bf14-4856-b093-ae1aa990f977 |
-      | $.name                               | Les Mousquets                        |
-      | $.members[0].citizen.name.first_name | Stephen                              |
-      | $.members[1].citizen.name.first_name | Sadi                                 |
-
-  Scenario: Can create a workgroup
-    Given I have citizen Werner Heisenberg
-    And I am authenticated as Werner Heisenberg
-    When I send a POST request to "/workgroups" with body:
-      """
-      {
-        "id":"f496d86d-6654-4068-91ff-90e1dbcc5f38",
-        "name":"Les Bouffons",
-        "description":"La vie est belle",
-        "anonymous":false
-      }
-      """
-    Then the response status code should be 201
-    And the JSON should contain:
-      | id          | f496d86d-6654-4068-91ff-90e1dbcc5f38 |
-      | name        | Les Bouffons                         |
-      | description | La vie est belle                     |
-      | anonymous   | false                                |
-
-  Scenario: Can delete a workgroup
-    Given I have citizen Werner Heisenberg
-    And I am authenticated as Werner Heisenberg
-    And I have workgroup:
-      | id | ab469134-bf14-4856-b093-ae1aa990f977 |
-    When I send a DELETE request to "/workgroups/ab469134-bf14-4856-b093-ae1aa990f977"
-    Then the response status code should be 204
-    And The workgroup "ab469134-bf14-4856-b093-ae1aa990f977" not exists
-
-  Scenario: Can get workgroups list
-    Given I have citizen Max Planck
-    And I am authenticated as Max Planck
-    And I have workgroup:
-      | id   | 3fd8edb6-c4b4-4c94-bc75-ddd9b290d32c |
-      | name | Les Pissenlits                       |
-    When I send a GET request to "/workgroups"
-    Then the response status code should be 200
-    And the response should contain object:
-      | $.result[0]id | 3fd8edb6-c4b4-4c94-bc75-ddd9b290d32c |
-
-  Scenario: Can add member to workgroup
-    Given I have citizen Blaise Pascal
-    And I have citizen Roger Penrose with ID "6d883fe7-5fc0-4a50-8858-72230673eba4"
-    And I have citizen Alessandro Volta with ID "b5bac515-45d4-4aeb-9b6d-2627a0bbc419"
-    And I am authenticated as Blaise Pascal
-    And I have workgroup:
-      | id   | b0ea1922-3bc6-44e2-aa7c-40158998cfbb |
-      | name | Les bonobos                          |
-    When I send a POST request to "/workgroups/b0ea1922-3bc6-44e2-aa7c-40158998cfbb/members" with body:
-      """
-      [
-        {
-          "citizen": {"id":"6d883fe7-5fc0-4a50-8858-72230673eba4"},
-          "roles": ["MASTER"]
-        },
-        {
-          "citizen": {"id":"b5bac515-45d4-4aeb-9b6d-2627a0bbc419"},
-          "roles": ["MASTER"]
-        }
-      ]
-      """
-    Then the response status code should be 201
-
-  Scenario: Can remove member to workgroup
-    Given I have citizen Heinrich Hertz
-    And I have citizen William Thomson with ID "87909ba3-2069-431c-9924-219fd8411cf2"
-    And I have citizen Paul Dirac with ID "1baf48bb-02bc-4d8f-ac86-33335354f5e7"
-    And I am authenticated as Heinrich Hertz
-    And I have workgroup:
-      | id   | b6c975df-dd44-4e99-adc1-f605746b0e11 |
-      | name | Les Tacos                            |
-    And I have members in workgroup "b6c975df-dd44-4e99-adc1-f605746b0e11":
-      | 87909ba3-2069-431c-9924-219fd8411cf2 |
-      | 1baf48bb-02bc-4d8f-ac86-33335354f5e7 |
-    When I send a DELETE request to "/workgroups/b6c975df-dd44-4e99-adc1-f605746b0e11/members" with body:
-      """
-      [
-        {
-          "citizen": {"id":"87909ba3-2069-431c-9924-219fd8411cf2"},
-          "roles": ["MASTER"]
-        }
-      ]
-      """
-    Then the response status code should be 200
-    And the response should contain object:
-      | $.[0]citizen.id | 1baf48bb-02bc-4d8f-ac86-33335354f5e7 |
-    And the JSON should have 2 items
-
-  Scenario: Can update members on workgroup
-    Given I have citizen Leon Foucault
-    And I have citizen Sadi Carnot with ID "be3b0926-8628-4426-804a-75188a6eb315"
-    And I have citizen Joseph Fourier with ID "d9671eca-abaf-4b67-9230-3ece700c1ddb"
-    And I have citizen Georg Ohm with ID "b49e20c1-8393-45d6-a6a0-3fa5c71cbdc1"
-    And I am authenticated as Leon Foucault
-    And I have workgroup:
-      | id   | 784fe6bc-7635-4ae2-b080-3a4743b998bf |
-      | name | Les Tacos                            |
-    And I have members in workgroup "784fe6bc-7635-4ae2-b080-3a4743b998bf":
-      | be3b0926-8628-4426-804a-75188a6eb315 |
-      | d9671eca-abaf-4b67-9230-3ece700c1ddb |
-    When I send a PUT request to "/workgroups/784fe6bc-7635-4ae2-b080-3a4743b998bf/members" with body:
-      """
-      [
-        {
-          "citizen": {"id":"be3b0926-8628-4426-804a-75188a6eb315"},
-          "roles": ["MASTER"]
-        },
-        {
-          "citizen": {"id":"b49e20c1-8393-45d6-a6a0-3fa5c71cbdc1"},
-          "roles": ["MASTER"]
-        }
-      ]
-      """
-    Then the response status code should be 200
-    And the response should contain object:
-      | $.[0]citizen.id | be3b0926-8628-4426-804a-75188a6eb315 |
-      | $.[1]citizen.id | b49e20c1-8393-45d6-a6a0-3fa5c71cbdc1 |
-    And the JSON should have 2 items
\ No newline at end of file
diff --git a/src/test/sql/citizen.sql b/src/test/sql/citizen.sql
index dc9028c..5f8da78 100644
--- a/src/test/sql/citizen.sql
+++ b/src/test/sql/citizen.sql
@@ -4,7 +4,7 @@ declare
     wrong_citizen              json;
     _user_id                   uuid := fixture_user();
     created_citizen            json := '{"name": {"first_name":"George", "last_name":"MICHEL"}, "birthday": "2001-01-01", "email":"george.michel@gmail.com"}';
-    created_citizen_with_user  json := '{"name": {"first_name":"George", "last_name":"MICHEL"}, "birthday": "2001-01-01", "email":"george.michel2@gmail.com", "user":{"username": "george junior", "plain_password": "azerty", "roles": ["ROLE_USER"]}}';
+    created_citizen_with_user  json := '{"name": {"first_name":"George", "last_name":"MICHEL"}, "birthday": "2001-01-01", "email":"george.michel2@gmail.com", "user":{"username": "george junior", "password": "azerty", "roles": ["ROLE_USER"]}}';
     selected_citizen           json;
 begin
     created_citizen := jsonb_set(created_citizen::jsonb, '{user}'::text[], jsonb_build_object('id', _user_id::text), true)::json;
@@ -35,9 +35,17 @@ begin
     select find_citizen_by_user_id((created_citizen->>'user_id')::uuid) into selected_citizen;
     assert selected_citizen#>>'{name, first_name}' = 'George', format('first name must be George, %s', selected_citizen#>>'{name, first_name}');
 
+    -- get citizen by username and check the first name
+    select find_citizen_by_username(created_citizen#>>'{user, username}') into selected_citizen;
+    assert selected_citizen#>>'{name, first_name}' = 'George', format('first name must be George, %s', selected_citizen#>>'{name, first_name}');
+
+    -- get citizen by name and check the first name
+    select find_citizen_by_name(created_citizen->'name') into selected_citizen;
+    assert selected_citizen#>>'{name, first_name}' = 'George', format('first name must be George, %s', selected_citizen#>>'{name, first_name}');
+
     rollback;
 
-    -- check if fint by id return null if citizen not exist
+    -- check if find by id return null if citizen not exist
     select find_citizen_by_user_id((created_citizen->>'user_id')::uuid) into selected_citizen;
     assert selected_citizen is null, format('citizen must be null if not exist, %s', selected_citizen);
 
diff --git a/src/test/sql/fixtures/1-fixture_user.sql b/src/test/sql/fixtures/1-fixture_user.sql
index e7e61d0..a734d3f 100644
--- a/src/test/sql/fixtures/1-fixture_user.sql
+++ b/src/test/sql/fixtures/1-fixture_user.sql
@@ -5,11 +5,11 @@ declare
     created_user json;
 begin
     if (name = 'george') then
-        created_user = '{"username": "george", "plain_password": "azerty", "roles": ["ROLE_USER"]}';
+        created_user = '{"username": "george", "password": "azerty", "roles": ["ROLE_USER"]}';
     elseif (name = 'john') then
-        created_user = '{"username": "john", "plain_password": "qwerty", "roles": ["ROLE_USER"]}';
+        created_user = '{"username": "john", "password": "qwerty", "roles": ["ROLE_USER"]}';
     elseif (name = 'tesla') then
-        created_user = '{"username": "tesla", "plain_password": "azerty", "roles": ["ROLE_USER"]}';
+        created_user = '{"username": "tesla", "password": "azerty", "roles": ["ROLE_USER"]}';
     end if;
 
     select insert_user(created_user) into created_user;
diff --git a/src/test/sql/opinion.sql b/src/test/sql/opinion.sql
index 7d82fac..cddaf68 100644
--- a/src/test/sql/opinion.sql
+++ b/src/test/sql/opinion.sql
@@ -1,8 +1,8 @@
 do
 $$
 declare
-    created_user     json  := '{"username": "george", "plain_password": "azerty", "roles": ["ROLE_USER"]}';
-    created_user2    json  := '{"username": "george2", "plain_password": "azerty", "roles": ["ROLE_USER"]}';
+    created_user     json  := '{"username": "george", "password": "azerty", "roles": ["ROLE_USER"]}';
+    created_user2    json  := '{"username": "george2", "password": "azerty", "roles": ["ROLE_USER"]}';
     _citizen_id      uuid;
     _citizen_id2     uuid;
     created_citizen json := $json$
diff --git a/src/test/sql/test.sh b/src/test/sql/test.sh
index 385a299..83767dd 100644
--- a/src/test/sql/test.sh
+++ b/src/test/sql/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-options=("All" "article" "citizen" "comment" "constitution" "follow" "opinion" "user" "vote" "workgroup" "RESET DB" "Quit")
+options=("All" "RESET DB" "article" "citizen" "comment" "constitution" "follow" "opinion" "user" "vote" "workgroup" "Quit")
 if [ -z "$1" ]; then
   PS3='Please enter your choice: '
   select ch in "${options[@]}"
@@ -17,7 +17,7 @@ case $opt in
       awk 'FNR==1{print "--------------------"}1' \
         ../../main/resources/sql/migrations/*.down.sql \
         ../../main/resources/sql/migrations/*.up.sql > ./allSQL.sql
-      docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+      docker exec -i dc-project_postgresql_test psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
       rm ./allSQL.sql
       ;;
   "All")
@@ -26,7 +26,7 @@ case $opt in
         ../../main/resources/sql/functions/*/*.sql \
         ./fixtures/*.sql \
         ./*.sql > ./allSQL.sql
-      docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+      docker exec -i dc-project_postgresql_test psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
       rm ./allSQL.sql
       ;;
   "Quit")
@@ -37,7 +37,7 @@ case $opt in
       ../../main/resources/sql/functions/*/*.sql \
       ./fixtures/*.sql \
       ./"$opt".sql > ./allSQL.sql
-    docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+    docker exec -i dc-project_postgresql_test psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
     rm ./allSQL.sql
     ;;
 esac
\ No newline at end of file
diff --git a/src/test/sql/user.sql b/src/test/sql/user.sql
index da1ff30..39a1162 100644
--- a/src/test/sql/user.sql
+++ b/src/test/sql/user.sql
@@ -1,7 +1,7 @@
 do
 $$
 declare
-    created_user json := '{"username": "george", "plain_password": "azerty", "roles": ["ROLE_USER"]}';
+    created_user json := '{"username": "george", "password": "azerty", "roles": ["ROLE_USER"]}';
     user_with_other_password json;
     selected_user json;
     exist_user json;
@@ -26,7 +26,7 @@ begin
     assert exist_user->>'password' is null, format('the function check_user must not be return the password, %s is return', exist_user::text);
 
     -- test change password
-    user_with_other_password = jsonb_set(created_user::jsonb, '{plain_password}', '"qwerty"'::jsonb);
+    user_with_other_password = jsonb_set(created_user::jsonb, '{password}', '"qwerty"'::jsonb);
     perform change_user_password(user_with_other_password);
     select check_user('george', 'qwerty') into exist_user;
     assert exist_user->>'username' = 'george', format('the function change_user_password must change password: %s', exist_user::text);
diff --git a/src/test/sql/workgroup.sql b/src/test/sql/workgroup.sql
index de7065e..de6fee7 100644
--- a/src/test/sql/workgroup.sql
+++ b/src/test/sql/workgroup.sql
@@ -9,6 +9,11 @@ declare
         "description": "test",
         "anonymous": false
     }';
+    created_workgroup_updated  json := '{
+        "name": "Le groupe des rouge",
+        "description": "red",
+        "anonymous": false
+    }';
     created_workgroup_2  json := '{
         "name": "hello",
         "description": "super",
@@ -22,12 +27,19 @@ begin
     created_workgroup := jsonb_set(created_workgroup::jsonb, '{created_by}'::text[], jsonb_build_object('id', _citizen_id::text), true)::json;
     assert created_workgroup#>>'{created_by, id}' = _citizen_id::text, format('citizenId in workgroup must be the same as citizen, %s != %s', created_workgroup#>>'{created_by, id}', _citizen_id::text);
 
-    -- upsert workgroup
+    -- insert workgroup
     select upsert_workgroup(created_workgroup) into created_workgroup;
     assert created_workgroup->>'description' is not null, 'description should not be null';
     assert (created_workgroup->>'name') = 'Le groupe des vert', format('name must be equal to "Le groupe des vert", %s instead', created_workgroup->>'name');
     assert (created_workgroup#>>'{members, 0, citizen, id}') = _citizen_id::text, 'workgroup must have creator in members on creation';
 
+    -- update workgroup
+    created_workgroup_updated := jsonb_set(created_workgroup_updated::jsonb, '{created_by}'::text[], jsonb_build_object('id', _citizen_id::text), true)::json;
+    select upsert_workgroup(created_workgroup_updated) into created_workgroup_updated;
+    assert created_workgroup_updated->>'description' is not null, 'description should not be null';
+    assert (created_workgroup_updated->>'name') = 'Le groupe des rouge', format('name must be equal to "Le groupe des rouge", %s instead', created_workgroup_updated->>'name');
+    assert (created_workgroup_updated#>>'{members, 0, citizen, id}') = _citizen_id::text, 'workgroup must have creator in members on update';
+
     -- insert another workgroup
     created_workgroup_2 := jsonb_set(created_workgroup_2::jsonb, '{created_by}'::text[], jsonb_build_object('id', _citizen_id::text), true)::json;
     assert created_workgroup_2#>>'{created_by, id}' = _citizen_id::text, format('citizenId in workgroup must be the same as citizen, %s != %s', created_workgroup_2#>>'{created_by, id}', _citizen_id::text);