Skip to content
Snippets Groups Projects
Verified Commit cd96140c authored by Andrej Ramašeuski's avatar Andrej Ramašeuski
Browse files

Username u postu

parent d0ca12ad
No related branches found
No related tags found
No related merge requests found
Pipeline #1837 passed
...@@ -3,7 +3,7 @@ image: docker:19.03.1 ...@@ -3,7 +3,7 @@ image: docker:19.03.1
variables: variables:
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
IMAGE_TAG: $CI_REGISTRY_IMAGE IMAGE_TAG: $CI_REGISTRY_IMAGE
IMAGE_VER: 0.3.2 IMAGE_VER: 0.4.0
services: services:
- docker:19.03.1-dind - docker:19.03.1-dind
......
...@@ -13,6 +13,7 @@ __PACKAGE__->add_columns( ...@@ -13,6 +13,7 @@ __PACKAGE__->add_columns(
qw( qw(
ranking_score ranking_score
user_name user_name
user_name
group_name group_name
), ),
); );
...@@ -31,9 +32,10 @@ sub format { ...@@ -31,9 +32,10 @@ sub format {
is_archived => $self->is_archived, is_archived => $self->is_archived,
is_changed => $self->changed ? 1 : 0, is_changed => $self->changed ? 1 : 0,
author => { author => {
id => $self->user_id, id => $self->user_id,
name => $self->user_name, name => $self->user_name,
group => $self->group_name, group => $self->group_name,
username => $self->user_username,
}, },
ranking => { ranking => {
score => $self->ranking_score, score => $self->ranking_score,
......
...@@ -93,10 +93,14 @@ components: ...@@ -93,10 +93,14 @@ components:
Author: Author:
type: object type: object
properties: properties:
id:
type: integer
name: name:
type: string type: string
group: group:
type: string type: string
username:
type: string
Post: Post:
type: object type: object
description: Prispevek description: Prispevek
......
...@@ -37,7 +37,8 @@ select ...@@ -37,7 +37,8 @@ select
"posts".*, "posts".*,
"posts"."ranking_likes" - "posts"."ranking_dislikes" as "ranking_score", "posts"."ranking_likes" - "posts"."ranking_dislikes" as "ranking_score",
"users"."name" as "user_name", "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 from posts
join "users" on ("posts"."user_id" = "users"."id") join "users" on ("posts"."user_id" = "users"."id")
; ;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment