add email to citizen table

src/main/resources/sql/fixtures/02-citizen.sql

@@ -2,7 +2,7 @@ do
 $$
 begin
     delete from citizen;
-    insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous)
+    insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous, email)
     select
         uuid_in(md5('citizen'||row_number() over ()::text)::cstring),
         jsonb_build_object(
@@ -13,7 +13,8 @@ begin
         now() - interval '25 years',
         u.id,
         row_number() over () % 3 = 0,
-        row_number() over () % 5 = 1
+        row_number() over () % 5 = 1,
+        u.username || '@domain'|| (row_number() over () % 5 = 1) || '.com'
     from "user" u;
 
     raise notice 'citizen fixtures done';

src/main/resources/sql/functions/citizen/insert_citizen_with_user.sql

@@ -7,21 +7,23 @@ declare
 begin
     select insert_user(resource->'user') into inserted_user;
 
-    insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous)
+    insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous, email)
     select
        coalesce(id, uuid_generate_v4()),
        name,
        birthday,
        (inserted_user->>'id')::uuid,
        coalesce(vote_anonymous, true),
-       coalesce(follow_anonymous, true)
+       coalesce(follow_anonymous, true),
+       email
     from json_populate_record(null::citizen, resource)
     on conflict (id) do update set
         name = excluded.name,
         birthday = excluded.birthday,
         user_id = excluded.user_id,
         vote_anonymous = excluded.vote_anonymous,
-        follow_anonymous = excluded.follow_anonymous
+        follow_anonymous = excluded.follow_anonymous,
+        email = excluded.email
     returning id into new_id;
 
     select find_citizen_by_id_with_user(new_id) into resource;

src/main/resources/sql/functions/citizen/upsert_citizen.sql

@@ -4,21 +4,23 @@ $$
 declare
     new_id uuid;
 begin
-    insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous)
+    insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous, email)
     select
        coalesce(id, uuid_generate_v4()),
        name,
        birthday,
        (resource#>>'{user, id}')::uuid,
        coalesce(vote_anonymous, true),
-       coalesce(follow_anonymous, true)
+       coalesce(follow_anonymous, true),
+       email
     from json_populate_record(null::citizen, resource)
     on conflict (id) do update set
         name = excluded.name,
         birthday = excluded.birthday,
         user_id = excluded.user_id,
         vote_anonymous = excluded.vote_anonymous,
-        follow_anonymous = excluded.follow_anonymous
+        follow_anonymous = excluded.follow_anonymous,
+        email = excluded.email
     returning id into new_id;
 
     select find_citizen_by_id(new_id) into resource;

src/main/resources/sql/migrations/0000-init_schema.up.sql

@@ -18,7 +18,8 @@ create table citizen
     birthday         date                                   not null,
     user_id          uuid                                   not null references "user" (id) unique,
     vote_anonymous   boolean     default true               not null,
-    follow_anonymous boolean     default true               not null
+    follow_anonymous boolean     default true               not null,
+    email            text                                   not null check ( email ~* '.+@.+\..+' )
 );
 
 create table workgroup