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

rename annonymous to anonymous

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-08-30 13:25:54 +02:00
parent 1b8a02c2b3
commit 16b71fb1e6
22 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/fr/dcproject/entity/Article.kt
View File

@@ -6,7 +6,7 @@ import java.util.*
class Article(
id: UUID = UUID.randomUUID(),
var title: String?,
var annonymous: Boolean? = true,
var anonymous: Boolean? = true,
var content: String?,
var description: String?,
var tags: List<String> = emptyList(),

4
src/main/kotlin/fr/dcproject/entity/Citizen.kt
View File

@@ -12,8 +12,8 @@ class Citizen(
var name: Name?,
var birthday: DateTime?,
var userId: UUID? = null,
var voteAnnonymous: Boolean? = null,
var followAnnonymous: Boolean? = null,
var voteanonymous: Boolean? = null,
var followanonymous: Boolean? = null,
var user: User?
) : UuidEntity(id),
EntityCreatedAt by EntityCreatedAtImp() {

2
src/main/kotlin/fr/dcproject/entity/Constitution.kt
View File

@@ -6,7 +6,7 @@ import java.util.*
class Constitution(
id: UUID = UUID.randomUUID(),
var title: String?,
var annonymous: Boolean? = true,
var anonymous: Boolean? = true,
var titles: List<Title> = listOf(),
createdBy: Citizen?
): UuidEntity(id),

2
src/main/kotlin/fr/dcproject/entity/Vote.kt
View File

@@ -10,7 +10,7 @@ open class Vote <T: UuidEntity> (
createdBy: Citizen,
override var target: T,
var note: Int,
var annonymous: Boolean = true
var anonymous: Boolean = true
): Extra<T>(id, createdBy),
EntityUpdatedAt by EntityUpdatedAtImp() {
init {

2
src/main/kotlin/fr/dcproject/repository/Vote.kt
View File

@@ -14,7 +14,7 @@ open class Vote <T: UuidEntity>(override var requester: Requester): RepositoryI<
fun vote(vote: VoteEntity<T>) {
val reference = vote.target::class.simpleName!!.toLowerCase()
val author = vote.createdBy ?: error("vote must be contain an author")
val anonymous = author.voteAnnonymous
val anonymous = author.voteanonymous
requester
.getFunction("vote")
.sendQuery(

2
src/main/resources/sql/fixtures/02-citizen.sql
View File

@@ -2,7 +2,7 @@ do
$$
begin
delete from citizen;
insert into citizen (id, name, birthday, user_id, vote_annonymous, follow_annonymous)
insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous)
select
uuid_in(md5('citizen'||row_number() over ()::text)::cstring),
jsonb_build_object(

2
src/main/resources/sql/fixtures/03-workgroup.sql
View File

@@ -6,7 +6,7 @@ begin
delete from citizen_in_workgroup;
delete from workgroup;
insert into workgroup (id, created_by_id, name, description, annonymous, owner_id)
insert into workgroup (id, created_by_id, name, description, anonymous, owner_id)
select
uuid_in(md5('workgroup'||rn::text)::cstring),
z.id,

2
src/main/resources/sql/fixtures/04-article.sql
View File

@@ -12,7 +12,7 @@ begin
delete from article_relations;
delete from article;
insert into article (id, version_id, created_by_id, title, annonymous, content, description, tags)
insert into article (id, version_id, created_by_id, title, anonymous, content, description, tags)
select
uuid_in(md5('article'||row_number() over ())::cstring),
uuid_in(md5('article_v'||row_number() over ())::cstring),

2
src/main/resources/sql/fixtures/05-constitution.sql
View File

@@ -7,7 +7,7 @@ begin
delete from title;
delete from constitution;
insert into constitution (id, version_id, created_by_id, title, annonymous)
insert into constitution (id, version_id, created_by_id, title, anonymous)
select
uuid_in(md5('constitution'||row_number() over ())::cstring),
uuid_in(md5('constitution_v'||row_number() over ())::cstring),

4
src/main/resources/sql/functions/article/upsert_article.sql
View File

@@ -14,14 +14,14 @@ begin
-- and draft = false
;
insert into article (id, version_id, created_by_id, title, annonymous, content, description, tags)
insert into article (id, version_id, created_by_id, title, anonymous, content, description, tags)
select
case when _id_exist then uuid_generate_v4()
else coalesce(id, uuid_generate_v4()) end,
coalesce(version_id, uuid_generate_v4()),
(resource#>>'{created_by, id}')::uuid,
title,
annonymous,
anonymous,
content,
description,
tags

10
src/main/resources/sql/functions/citizen/insert_citizen_with_user.sql
View File

@@ -7,21 +7,21 @@ declare
begin
select insert_user(resource->'user') into inserted_user;
insert into citizen (id, name, birthday, user_id, vote_annonymous, follow_annonymous)
insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous)
select
coalesce(id, uuid_generate_v4()),
name,
birthday,
(inserted_user->>'id')::uuid,
coalesce(vote_annonymous, true),
coalesce(follow_annonymous, true)
coalesce(vote_anonymous, true),
coalesce(follow_anonymous, true)
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_annonymous = excluded.vote_annonymous,
follow_annonymous = excluded.follow_annonymous
vote_anonymous = excluded.vote_anonymous,
follow_anonymous = excluded.follow_anonymous
returning id into new_id;
select find_citizen_by_id_with_user(new_id) into resource;

10
src/main/resources/sql/functions/citizen/upsert_citizen.sql
View File

@@ -4,21 +4,21 @@ $$
declare
new_id uuid;
begin
insert into citizen (id, name, birthday, user_id, vote_annonymous, follow_annonymous)
insert into citizen (id, name, birthday, user_id, vote_anonymous, follow_anonymous)
select
coalesce(id, uuid_generate_v4()),
name,
birthday,
(resource#>>'{user, id}')::uuid,
coalesce(vote_annonymous, true),
coalesce(follow_annonymous, true)
coalesce(vote_anonymous, true),
coalesce(follow_anonymous, true)
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_annonymous = excluded.vote_annonymous,
follow_annonymous = excluded.follow_annonymous
vote_anonymous = excluded.vote_anonymous,
follow_anonymous = excluded.follow_anonymous
returning id into new_id;
select find_citizen_by_id(new_id) into resource;

4
src/main/resources/sql/functions/constitution/upsert_constitution.sql
View File

@@ -19,14 +19,14 @@ begin
raise notice '%', _id_exist;
insert into constitution (id, version_id, created_by_id, title, annonymous)
insert into constitution (id, version_id, created_by_id, title, anonymous)
select
case when _id_exist then uuid_generate_v4()
else coalesce(id, uuid_generate_v4()) end,
version_id,
_citizen_id,
title,
annonymous
anonymous
from json_populate_record(null::constitution, resource)
returning id into new_id;

10
src/main/resources/sql/migrations/0000-init_schema.up.sql
View File

@@ -17,8 +17,8 @@ create table citizen
name jsonb not null check ( name ? 'first_name' and name ? 'last_name' ),
birthday date not null,
user_id uuid not null references "user" (id) unique,
vote_annonymous boolean default true not null,
follow_annonymous boolean default true not null
vote_anonymous boolean default true not null,
follow_anonymous boolean default true not null
);
create table workgroup
@@ -29,7 +29,7 @@ create table workgroup
created_by_id uuid not null references citizen (id),
name varchar(128) not null,
description text null,
annonymous boolean default false not null,
anonymous boolean default false not null,
logo text null,
owner_id uuid not null references citizen (id)
);
@@ -100,7 +100,7 @@ create table article
version_id uuid default uuid_generate_v4() not null,
version_number int not null,
title text not null check ( length(title) < 128 ),
annonymous boolean default false not null,
anonymous boolean default false not null,
content text not null check ( content != '' ),
description text null check ( description != '' ),
tags varchar(32)[] default '{}' not null,
@@ -121,7 +121,7 @@ create table constitution
version_id uuid default uuid_generate_v4() not null,
version_number int not null,
title text not null check ( length(title) < 128 ),
annonymous boolean default false not null
anonymous boolean default false not null
);
create trigger generate_version_number_trigger