DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Continue to implement opinion

Browse Source 
improve target reference
Improve Tests for Opinion
fix SQL:upsert_opinion
This commit is contained in:
Fabrice Lecomte
2020-02-14 01:26:47 +01:00
parent 60bd24e653
commit 471013984c
42 changed files with 683 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/sql/fixtures/09-opinion.sql
View File

@@ -7,7 +7,10 @@ begin
delete from opinion_choice;
insert into opinion_choice (id, name, target)
select uuid_in(md5('opinion_choice'||row_number() over ())::cstring), 'Opinion'||row_number() over (), '{article}'
select
uuid_in(md5('opinion_choice'||row_number() over ())::cstring),
'Opinion'||row_number() over (),
case when row_number() over () % 5 = 0 then null else '{article}'::text[] end
from generate_series(0,20);
for i in 0..9 loop

10
src/main/resources/sql/functions/helpers/find_reference_by_id.sql
View File

@@ -11,11 +11,17 @@ begin
find_article_by_id(_id)
when 'constitution'::regclass then
find_constitution_by_id(_id)
when 'comment'::regclass then
find_comment_by_id(_id)
when 'opinion'::regclass then
find_opinion_by_id(_id)
else
json_build_object('id', _id)
json_build_object('id', _id, 'reference', _reference)
end
into resource;
end;
resource = resource::jsonb || jsonb_build_object('reference', _reference);
end
$$;
-- drop function if exists find_reference_by_id(uuid, regclass, out json);

2
src/main/resources/sql/functions/opinion/find_citizen_opinions.sql
View File

@@ -18,6 +18,8 @@ begin
from (
select
o.*,
find_reference_by_id(o.target_id, o.target_reference) as target,
find_citizen_by_id(o.created_by_id) as created_by,
to_json(ol) as choice
from opinion as o
join opinion_choice ol on o.choice_id = ol.id

2
src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_id.sql
View File

@@ -11,6 +11,8 @@ begin
from (
select
o.*,
find_reference_by_id(o.target_id, o.target_reference) as target,
find_citizen_by_id(o.created_by_id) as created_by,
to_json(ol) as choice
from opinion as o
join opinion_choice ol on o.choice_id = ol.id

2
src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_ids.sql
View File

@@ -9,6 +9,8 @@ begin
from (
select
o.*,
find_reference_by_id(o.target_id, o.target_reference) as target,
find_citizen_by_id(o.created_by_id) as created_by,
to_json(ol) as choice
from opinion as o
join opinion_choice ol on o.choice_id = ol.id

22
src/main/resources/sql/functions/opinion/find_opinion_by_id.sql Normal file
View File

@@ -0,0 +1,22 @@
create or replace function find_opinion_by_id(
_id uuid,
out resource json
) language plpgsql as
$$
begin
select to_json(t)
into resource
from (
select
o.*,
find_reference_by_id(o.target_id, o.target_reference) as target,
find_citizen_by_id(o.created_by_id) as created_by,
to_json(ol) as choice
from "opinion" as o
join opinion_choice ol on o.choice_id = ol.id
where o.id = _id
) as t;
end;
$$;
-- drop function if exists find_opinion_by_id(uuid, out json);

27
src/main/resources/sql/functions/opinion/find_opinion_by_opinion.sql Normal file
View File

@@ -0,0 +1,27 @@
create or replace function find_opinion_by_opinion(
inout resource json
) language plpgsql as
$$
declare
_target_id uuid = (resource#>>'{target, id}')::uuid;
_created_by_id uuid = (resource#>>'{created_by, id}')::uuid;
_choice_id uuid = (resource#>>'{choice, id}')::uuid;
begin
select to_json(t)
into resource
from (
select
o.*,
find_reference_by_id(o.target_id, o.target_reference) as target,
find_citizen_by_id(o.created_by_id) as created_by,
to_json(ol) as choice
from "opinion" as o
join opinion_choice ol on o.choice_id = ol.id
where o.target_id = _target_id
and o.created_by_id = _created_by_id
and o.choice_id = _choice_id
) as t;
end;
$$;
-- drop function if exists find_opinion_by_opinion(json);

8
src/main/resources/sql/functions/opinion/find_opinion_choices.sql
View File

@@ -8,7 +8,11 @@ begin
select ol.*
from opinion_choice ol
where (ol.deleted_at is null or ol.deleted_at > now())
and (ol.target is null or targets is null or array_length(targets, 1) = 0 or ol.target && targets)
and (
ol.target is null or array_length(ol.target, 1) is null -- if choice is compatible with all target
or targets is null or array_length(targets, 1) is null -- if no target defined
or (ol.target && targets) -- if target is compatible
)
order by ol.name
) t;
@@ -17,4 +21,4 @@ $$;
-- drop function if exists find_opinions();
-- select find_opinions();
-- select find_opinion_choices('{}');

17
src/main/resources/sql/functions/opinion/opinion.sql
View File

@@ -1,17 +0,0 @@
create or replace function opinion(reference regclass, _target_id uuid, _created_by_id uuid, _opinion uuid, out resource json)
language plpgsql as
$$
begin
if reference = 'article'::regclass then
insert into opinion_on_article (created_by_id, target_id, choice_id)
values (_created_by_id, _target_id, _opinion)
on conflict (created_by_id, target_id, choice_id) do nothing;
else
raise exception '% no implemented for opinion', reference::text;
end if;
select count_opinion(_target_id) into resource;
end;
$$;
-- drop function if exists vote(regclass,uuid,uuid,integer,boolean);

23
src/main/resources/sql/functions/opinion/upsert_opinion.sql Normal file
View File

@@ -0,0 +1,23 @@
create or replace function upsert_opinion(inout resource json)
language plpgsql as
$$
declare
_reference regclass = (resource#>>'{target, reference}')::regclass;
_id uuid = coalesce((resource->>'id')::uuid, uuid_generate_v4());
_target_id uuid = (resource#>>'{target, id}')::uuid;
_created_by_id uuid = (resource#>>'{created_by, id}')::uuid;
_choice_id uuid = (resource#>>'{choice, id}')::uuid;
begin
if _reference = 'article'::regclass then
insert into opinion_on_article (id, created_by_id, target_id, choice_id)
values (_id, _created_by_id, _target_id, _choice_id)
on conflict (created_by_id, target_id, choice_id) do nothing;
else
raise exception '% no implemented for opinion', _reference::text;
end if;
select find_opinion_by_opinion(resource) into resource;
end;
$$;
-- drop function if exists upsert_opinion(json);