From cd96140c9c4015a13b9148f55ccdc437c7355b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Sat, 19 Dec 2020 12:09:22 +0100
Subject: [PATCH] Username u postu
---
.gitlab-ci.yml | 2 +-
lib/CF/Schema/Result/Post_view.pm | 8 +++++---
openapi.yaml | 4 ++++
sql/2/up.sql | 3 ++-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e1266a..dd7c448 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 71bbbdb..90e214e 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 f4a05bb..d6331e6 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 4297e9d..a321512 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")
;
--
GitLab