Skip to content

Commit

Permalink
feature: add /subscriptions endpoint and refactor code
Browse files Browse the repository at this point in the history
  • Loading branch information
runningwater committed Jul 30, 2024
1 parent afd3ed1 commit dd8eb7a
Show file tree
Hide file tree
Showing 14 changed files with 565 additions and 75 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DATABASE_URL="postgres://postgres:password@localhost:5432/newsletter"
96 changes: 87 additions & 9 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,56 @@
name: Rust

on: [push, pull_request]
on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]
branches:
- main

env:
CARGO_TERM_COLOR: always
SQLX_VERSION: 0.8.0
SQLX_FEATURES: "chrono,macros,migrate,postgres,runtime-tokio,tls-rustls,uuid"

jobs:
test:
name: Test
runs-on: ubuntu-latest
services:
# Label used to access the service container
postgres:
# Docker Hub image
image: postgres:14
# Environment variables scoped only for the `postgres` element
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: password
POSTGRES_DB: postgres
# When you map ports using the ports keyword, GitHub uses the --publish command to publish the container’s ports to the Docker host
# Opens tcp port 5432 on the host and service container
ports:
- 5432:5432
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Check out repository code
uses: actions/checkout@v3
- name: Install the Rust toolchain
uses: dtolnay/rust-toolchain@stable
- name: Rust cache cleanup
uses: Swatinem/rust-cache@v2
with:
key: sqlx-${{env.SQLX_VERSION}}
- name: Install slqx-client
run: cargo install sqlx-cli
--version={{env.SQLX_VERSION}}
--features ${{env.SQLX_FEATURES}}
--no-default-features
--locked
- name: Install postgresql-client
run: sudo apt-get update && sudo apt-get install postgresql-client -y
- name: Migrate database
run: SKIP_DOCKER=true ./scripts/init_db.sh
- name: Run tests
run: cargo test

Expand All @@ -30,24 +68,64 @@ jobs:
clippy:
name: Clippy
runs-on: ubuntu-latest
services:
postgres:
image: postgres:14
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: password
POSTGRES_DB: postgres
ports:
- 5432:5432
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- uses: Swatinem/rust-cache@v2
with:
key: sqlx-${{env.SQLX_VERSION}}
- name: Install sqlx-client
run: cargo install sqlx-cli
--version={{env.SQLX_VERSION}}
--features ${{env.SQLX_FEATURES}}
--no-default-features
--locked
- name: Install postgresql-client
run: sudo apt-get update && sudo apt-get install postgresql-client -y
- name: Migrate database
run: SKIP_DOCKER=true ./scripts/init_db.sh
- name: Linting
run: cargo clippy -- -D warnings

coverage:
name: Code coverage
runs-on: ubuntu-latest
container:
image: xd009642/tarpaulin
options: --security-opt seccomp=unconfined
services:
postgres:
image: postgres:14
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: password
POSTGRES_DB: postgres
ports:
- 5432:5432
steps:
- name: Checkout repository
uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- name: Install postgresql-client
run: sudo apt-get update && sudo apt-get install postgresql-client -y
- uses: Swatinem/rust-cache@v2
with:
key: sqlx-${{ env.SQLX_VERSION }}
- name: Install sqlx-cli
run: cargo install sqlx-cli
--version=${{ env.SQLX_VERSION }}
--features ${{ env.SQLX_FEATURES }}
--no-default-features
--locked
- name: Migrate database
run: SKIP_DOCKER=true ./scripts/init_db.sh
- name: Generate code coverage
run: |
cargo tarpaulin --verbose --workspace
run: cargo install cargo-tarpaulin && cargo tarpaulin --verbose --workspace
Loading

0 comments on commit dd8eb7a

Please sign in to comment.