diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e1266ac93b4b39f557343248979bd94f6dad2ab..dd7c4484d3c446e0df1485ddd161a9328067831b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: docker:19.03.1 variables: DOCKER_TLS_CERTDIR: "/certs" IMAGE_TAG: $CI_REGISTRY_IMAGE - IMAGE_VER: 0.3.2 + IMAGE_VER: 0.4.0 services: - docker:19.03.1-dind diff --git a/lib/CF/Schema/Result/Post_view.pm b/lib/CF/Schema/Result/Post_view.pm index 71bbbdb3ac2a45baef461cb116e617e23ed78569..90e214eb34842b3c5915f6cc8712483ae8e4b8ca 100644 --- a/lib/CF/Schema/Result/Post_view.pm +++ b/lib/CF/Schema/Result/Post_view.pm @@ -13,6 +13,7 @@ __PACKAGE__->add_columns( qw( ranking_score user_name + user_name group_name ), ); @@ -31,9 +32,10 @@ sub format { is_archived => $self->is_archived, is_changed => $self->changed ? 1 : 0, author => { - id => $self->user_id, - name => $self->user_name, - group => $self->group_name, + id => $self->user_id, + name => $self->user_name, + group => $self->group_name, + username => $self->user_username, }, ranking => { score => $self->ranking_score, diff --git a/openapi.yaml b/openapi.yaml index f4a05bb3f5dd9e73a118cac4ff174571f801eae9..d6331e6cde9c9d379d0dbe2eba00e8eee4395357 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -93,10 +93,14 @@ components: Author: type: object properties: + id: + type: integer name: type: string group: type: string + username: + type: string Post: type: object description: Prispevek diff --git a/sql/2/up.sql b/sql/2/up.sql index 4297e9dbe7d905f1493605b9750f9b375d476db9..a3215123ee8a3eec3ca762415002e41b8abf53ea 100644 --- a/sql/2/up.sql +++ b/sql/2/up.sql @@ -37,7 +37,8 @@ select "posts".*, "posts"."ranking_likes" - "posts"."ranking_dislikes" as "ranking_score", "users"."name" as "user_name", - "users"."main_group_name" as "group_name" + "users"."main_group_name" as "group_name", + "users"."username" as "user_username" from posts join "users" on ("posts"."user_id" = "users"."id") ;