Make realmedium ready to show (#11)

Author: apolukhin

.github/workflows/ci.yml

@@ -1,6 +1,8 @@
-name: CI
+name: urealmedium CI
 
 'on':
+ schedule:
+ - cron: '30 5 * * 1' # Every Monday at 5:30
  pull_request:
  push:
  branches:
@@ -42,16 +44,15 @@ jobs:
 
  - name: Install packages
  run: |
+ (cd third_party && git clone -b develop --single-branch --depth 1 https://github.com/userver-framework/userver.git)
  sudo apt update
- sudo apt install --allow-downgrades -y postgresql $(cat third_party/userver/scripts/docs/en/deps/${{matrix.os}}.md | tr '\n' ' ')
- sudo apt install --allow-downgrades -y pep8 $(cat third_party/userver/scripts/docs/en/deps/${{matrix.os}}.md | tr '\n' ' ')
+ sudo apt install --allow-downgrades -y pycodestyle postgresql $(cat third_party/userver/scripts/docs/en/deps/${{matrix.os}}.md | tr '\n' ' ')
  
  - name: Reinstall postgres 14
  run: |
  sudo apt purge libpq5 libpq-dev postgresql-*
  sudo apt install -y postgresql-14 postgresql-client-14 postgresql-server-dev-14
 
-
  - name: Setup ccache
  run: |
  ccache -M 2.0GB
@@ -81,11 +82,11 @@ jobs:
 
  - name: Test run after install
  if: matrix.make == 'test-release'
- run: >-
- ./local_installation/bin/realmedium_sample
- --config=./local_installation/etc/realmedium_sample/static_config.yaml
- --config_vars=./local_installation/etc/realmedium_sample/config_vars.yaml
- &
+ run: |
+ ./local_installation/bin/realmedium_sample \
+  --config=./local_installation/etc/realmedium_sample/config.yaml \
+  --config_vars=./local_installation/etc/realmedium_sample/config_vars.yaml \
+  &
 
  - name: Check work run service
  if: matrix.make == 'test-release'

.github/workflows/docker.yaml

@@ -1,6 +1,8 @@
-name: Docker build
+name: urealmedium Docker build
 
 'on':
+ schedule:
+ - cron: '30 5 * * 1' # Every Monday at 5:30
  pull_request:
  push:
  branches:
@@ -15,12 +17,12 @@ jobs:
  tests:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  with:
  submodules: true
 
  - name: Reuse ccache directory
- uses: actions/cache@v2
+ uses: actions/cache@v4
  with:
  path: .ccache
  key: 'ccache-dir-${{github.ref}}_run-${{github.run_number}}'

.github/workflows/update-submodules.yaml

@@ -1,6 +1,3 @@
-[submodule "third_party/userver"]
-path = third_party/userver
-url = https://github.com/userver-framework/userver.git
 [submodule "third_party/cpp-jwt"]
 path = third_party/cpp-jwt
 url = https://github.com/arun11299/cpp-jwt

.gitmodules

@@ -37,6 +37,8 @@ add_library(${PROJECT_NAME}_objs OBJECT
 src/cache/articles_cache.cpp
  src/cache/comments_cache.cpp
  src/cache/comments_cache.hpp
+src/handlers/common.cpp
+src/handlers/common.hpp
 src/handlers/profiles/profiles.cpp
 src/handlers/profiles/profiles.hpp
 src/handlers/users/users.cpp
@@ -80,15 +82,13 @@ add_library(${PROJECT_NAME}_objs OBJECT
 src/dto/comment.hpp
 src/dto/comment.cpp
 src/db/sql.hpp
-src/db/types.hpp
 src/models/user.hpp
 src/models/user.cpp
 src/models/comment.hpp
 src/models/comment.cpp
 src/models/article.hpp
 src/models/article.cpp
 src/models/profile.hpp
-src/models/profile.cpp
 src/validators/user_validators.hpp
 src/validators/user_validators.cpp
 src/validators/length_validator.hpp
@@ -118,10 +118,8 @@ target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver::core userver::postgre
 
 file(GLOB_RECURSE SCHEMAS ${CMAKE_CURRENT_SOURCE_DIR}/docs/*.yaml)
 userver_target_generate_chaotic(${PROJECT_NAME}-chgen
- ARGS
- -n "/components/schemas/([^/]*)/=real_medium::handlers::{0}"
- -f "(.*)={0}"
- --generate-serializers
+ LAYOUT "/components/schemas/([^/]*)/=real_medium::handlers::{0}"
+ GENERATE_SERIALIZERS
  OUTPUT_DIR
  ${CMAKE_CURRENT_BINARY_DIR}/src
  SCHEMAS
@@ -153,7 +151,9 @@ target_link_libraries(${PROJECT_NAME}_unittest PRIVATE ${PROJECT_NAME}_objs user
 add_google_tests(${PROJECT_NAME}_unittest)
 
 # Functional Tests
-add_subdirectory(tests)
+userver_testsuite_add_simple(
+ REQUIREMENTS ${CMAKE_CURRENT_SOURCE_DIR}/tests/requirements.txt
+)
 
 # Install
 include(GNUInstallDirs)

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_COMMON_FLAGS ?= -DUSERVER_OPEN_SOURCE_BUILD=1 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+CMAKE_COMMON_FLAGS ?= -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 CMAKE_DEBUG_FLAGS ?= -DUSERVER_SANITIZE='addr ub'
 CMAKE_RELEASE_FLAGS ?=
 CMAKE_OS_FLAGS ?= -DUSERVER_FEATURE_CRYPTOPP_BLAKE2=0 -DUSERVER_FEATURE_REDIS_HI_MALLOC=1

Makefile

@@ -1,10 +1,19 @@
 # RealMedium
 
-## THIS SAMPLE IS NOT READY! COME BACK LATER
+[![urealmedium CI](https://github.com/userver-framework/realmedium_sample/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/userver-framework/realmedium_sample/actions/workflows/ci.yml)
+[![urealmedium Docker build](https://github.com/userver-framework/realmedium_sample/actions/workflows/docker.yaml/badge.svg?branch=develop)](https://github.com/userver-framework/realmedium_sample/actions/workflows/docker.yaml)
 
 This is project created in summer school Yandex.
 This codebase was created to demonstrate a fully fledged backend application built with **[userver framework](https://userver.tech/)**
 
+### Prerequisites
+
+[Install the userver](https://userver.tech/de/dab/md_en_2userver_2build_2build.html#ways_to_get_userver) into the system
+or
+* check it out `git clone --depth 1 https://github.com/userver-framework/userver.git /path/to/userver`
+* install all of its dependencies
+* `ln -s /path/to/userver /path/to/realmedioum_sample/third_party/userver`
+
 ### Docker-compose
 ```
 # Clone submodules
@@ -13,16 +22,20 @@ git submodule update --init
 # Run service
 make docker-start-service-release
 ```
+
 ### Local
 ```
 make service-start-release
 ```
+
 ## Tests
 Run unit and functional tests in docker or local.
+
 ### Docker-compose
 ```
 make docker-test-release
 ```
+
 ### Local
 ```
 make test-release