diff --git a/.idea/runConfigurations/Clean_Dev_Database.xml b/.idea/runConfigurations/Clean_Dev_Database.xml
new file mode 100644
index 0000000..348e748
--- /dev/null
+++ b/.idea/runConfigurations/Clean_Dev_Database.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Clean Dev Database" type="RunSql" factoryName="Run SQL" folderName="SQL DEV">
+    <option name="files">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
+      </list>
+    </option>
+    <option name="targets">
+      <list>
+        <Target>
+          <option name="dsId" value="28368159-3c2d-4612-8719-e55ce11b962a" />
+          <option name="namespace" value="database/&quot;dc-project&quot;/schema/&quot;public&quot;" />
+        </Target>
+      </list>
+    </option>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Fixtures_on_Test.xml b/.idea/runConfigurations/Fixtures_on_Test.xml
index 3e35e91..7001cad 100644
--- a/.idea/runConfigurations/Fixtures_on_Test.xml
+++ b/.idea/runConfigurations/Fixtures_on_Test.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Fixtures on Test" type="RunSql" factoryName="Run SQL">
+  <configuration default="false" name="Fixtures on Test" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
     <option name="files">
       <list>
         <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
diff --git a/.idea/runConfigurations/Reset_Test_database.xml b/.idea/runConfigurations/Reset_Test_database.xml
new file mode 100644
index 0000000..daaf1de
--- /dev/null
+++ b/.idea/runConfigurations/Reset_Test_database.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Reset Test database" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
+    <option name="files">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
+      </list>
+    </option>
+    <option name="targets">
+      <list>
+        <Target>
+          <option name="dsId" value="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" />
+          <option name="namespace" value="database/&quot;test&quot;/schema/&quot;public&quot;" />
+        </Target>
+      </list>
+    </option>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml b/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml
index f4113c6..1c1a9eb 100644
--- a/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml
+++ b/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Reset database schema and import Fixtures" type="RunSql" factoryName="Run SQL">
+  <configuration default="false" name="Reset database schema and import Fixtures" type="RunSql" factoryName="Run SQL" folderName="SQL DEV">
     <option name="files">
       <list>
         <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
diff --git a/.idea/runConfigurations/Test_All_SQL.xml b/.idea/runConfigurations/Test_All_SQL.xml
index d5d1df9..4084752 100644
--- a/.idea/runConfigurations/Test_All_SQL.xml
+++ b/.idea/runConfigurations/Test_All_SQL.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test All SQL" type="RunSql" factoryName="Run SQL">
+  <configuration default="false" name="Test All SQL" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
     <option name="files">
       <list>
         <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
diff --git a/.idea/runConfigurations/Test_Follow.xml b/.idea/runConfigurations/Test_Follow.xml
new file mode 100644
index 0000000..68c50d3
--- /dev/null
+++ b/.idea/runConfigurations/Test_Follow.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test Follow" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
+    <option name="files">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follow.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_article_by_citizen.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_article_by_target.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_by_citizen.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_constitution_by_citizen.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/follow.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/unfollow.sql" />
+        <option value="$PROJECT_DIR$/src/test/sql/follow.sql" />
+      </list>
+    </option>
+    <option name="targets">
+      <list>
+        <Target>
+          <option name="dsId" value="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" />
+          <option name="namespace" value="database/&quot;test&quot;" />
+        </Target>
+      </list>
+    </option>
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Reset database" run_configuration_type="RunSql" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_Opinions.xml b/.idea/runConfigurations/Test_Opinions.xml
new file mode 100644
index 0000000..a6bb955
--- /dev/null
+++ b/.idea/runConfigurations/Test_Opinions.xml
@@ -0,0 +1,29 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test Opinions" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
+    <option name="files">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_article_by_id.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/count_opinion.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_id.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_ids.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choice_by_id.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choices.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/upsert_opinion.sql" />
+        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_by_opinion.sql" />
+        <option value="$PROJECT_DIR$/src/test/sql/opinion.sql" />
+      </list>
+    </option>
+    <option name="targets">
+      <list>
+        <Target>
+          <option name="dsId" value="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" />
+          <option name="namespace" value="database/&quot;test&quot;/schema/&quot;public&quot;" />
+        </Target>
+      </list>
+    </option>
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Reset database" run_configuration_type="RunSql" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/src/main/resources/sql/functions/follow/find_follow.sql b/src/main/resources/sql/functions/follow/find_follow.sql
new file mode 100644
index 0000000..412bb69
--- /dev/null
+++ b/src/main/resources/sql/functions/follow/find_follow.sql
@@ -0,0 +1,25 @@
+create or replace function find_follow(
+    _target_id uuid,
+    _citizen_id uuid,
+    out resource json,
+    out following boolean
+) language plpgsql as
+$$
+begin
+    select to_json(t)
+    into resource
+    from (
+        select
+            f.*,
+            json_build_object('id', f.target_id, 'reference', f.target_reference) as target,
+            find_citizen_by_id(f.created_by_id) as created_by
+        from follow as f
+        where f.created_by_id = _citizen_id
+          and f.target_id = _target_id
+    ) as t;
+
+    select resource is not null into following;
+end;
+$$;
+
+-- drop function if exists find_follow(uuid, uuid);
diff --git a/src/test/sql/follow.sql b/src/test/sql/follow.sql
index e432d41..ca364ab 100644
--- a/src/test/sql/follow.sql
+++ b/src/test/sql/follow.sql
@@ -25,6 +25,9 @@ declare
       "email":"george.michel2@gmail.com"
     }
     $json$;
+
+    created_article  json := '{"version_id":"933b6a1b-50c9-42b6-989f-c02a57814ef9", "title": "Love the world", "anonymous": false, "content": "bla bal bla", "tags": ["love", "test"], "draft":false}';
+    first_article_id uuid;
 begin
     -- insert user for context
     select insert_user(created_user) into created_user;
@@ -41,15 +44,27 @@ begin
 
 
     perform follow('citizen'::regclass, _citizen_id, _citizen_id2);
-    assert (select count(*) > 0 from follow), 'follow must be inserted';
+    assert (select count(*) = 1 from follow), 'follow must be inserted';
+    assert (select following = true from find_follow(_citizen_id, _citizen_id2)), 'find_follow must return the following';
 
     perform follow('citizen'::regclass, _citizen_id, _citizen_id2);
-    assert (select count(*) > 0 from follow), 'follow must be inserted';
+    assert (select count(*) = 1 from follow), 'follow must be inserted';
 
     perform unfollow('citizen'::regclass, _citizen_id, _citizen_id2);
     assert (select count(*) = 0 from follow), 'follow must be deleted after unfollow';
 
+    -- upsert article
+    created_article := jsonb_set(created_article::jsonb, '{created_by}'::text[], jsonb_build_object('id', _citizen_id::text), true)::json;
+    select upsert_article(created_article) into created_article;
+    first_article_id = (created_article->>'id')::uuid;
+
+    perform follow('article'::regclass, first_article_id, _citizen_id);
+    assert (select following = true from find_follow(first_article_id, _citizen_id)), 'find_follow must return the following';
+    assert (select following = false from find_follow(first_article_id, _citizen_id2)), 'find_follow must not return the following if not followinf';
+
     -- delete follow and context
+    delete from follow;
+    delete from article;
     delete from citizen;
     delete from "user";