refactor: remove sentry

fix(deps): update golang.org/x/crypto digest to 793ad66

.circleci/config.yml

@@ -1,47 +0,0 @@
-version: 2
-jobs:
-  build_latest:
-    docker:
-      - image: circleci/golang:1.17
-    working_directory: ~/zdamegzzawodowybackend
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: |
-          docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-      # build the application image
-      - run: docker build -t $DOCKER_LOGIN/zdam-egzamin-zawodowy-backend:latest .
-      # deploy the image
-      - run: docker push $DOCKER_LOGIN/zdam-egzamin-zawodowy-backend:latest
-  build_version:
-    docker:
-      - image: circleci/golang:1.17
-    working_directory: ~/zdamegzzawodowybackend
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: |
-          docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-      # build the application image
-      - run: docker build -t $DOCKER_LOGIN/zdam-egzamin-zawodowy-backend:$(echo $CIRCLE_TAG | sed -r 's/^.{1}//') .
-      # deploy the image
-      - run: docker push $DOCKER_LOGIN/zdam-egzamin-zawodowy-backend:$(echo $CIRCLE_TAG | sed -r 's/^.{1}//')
-workflows:
-  version: 2
-  deploy_latest:
-    jobs:
-      - build_latest:
-          context: Zdam-Egzamin-Zawodowy
-          filters:
-            branches:
-              only:
-                - master
-  deploy_version:
-    jobs:
-      - build_version:
-          context: Zdam-Egzamin-Zawodowy
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/

.drone.yml

@@ -0,0 +1,59 @@
+---
+kind: pipeline
+type: docker
+name: linux-amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: publish
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      registry: gitea.dwysokinski.me
+      repo: gitea.dwysokinski.me/zdam-egzamin-zawodowy-docker/backend
+      auto_tag: true
+      auto_tag_suffix: linux-amd64
+      dockerfile: ./build/server/Dockerfile
+
+trigger:
+  event:
+    - tag
+---
+kind: pipeline
+type: docker
+name: manifest
+
+steps:
+  - name: manifest
+    image: plugins/manifest
+    settings:
+      auto_tag: "true"
+      ignore_missing: "true"
+      spec: ./build/server/manifest.tmpl
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+  - name: manifest-latest
+    image: plugins/manifest
+    settings:
+      tags: latest
+      ignore_missing: "true"
+      spec: ./build/server/manifest.tmpl
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+
+trigger:
+  event:
+    - tag
+
+depends_on:
+  - linux-amd64

.env.example

@@ -0,0 +1,16 @@
+DB_USER=postgres
+DB_NAME=zdamegzzawodowy
+DB_PORT=5432
+DB_HOST=localhost
+DB_PASSWORD=postgres
+DB_POOL_SIZE=40 #optional
+
+LOG_DB_QUERIES=true
+
+ACCESS_SECRET=devaccesssecret
+
+FILE_STORAGE_PATH=./dev/upload
+
+ENABLE_ACCESS_LOG=true
+
+SENTRY_DSN=

Makefile

@@ -1,2 +1,8 @@
 generate:
 	go generate ./...
+
+docker-compose-up:
+	docker-compose up --detach
+
+docker-compose-down:
+	docker-compose down

README.md

@@ -1,37 +1,6 @@
-# zdamegzaminzawodowy.pl - backend
+# [zdamegzaminzawodowy.pl](https://zdamegzaminzawodowy.pl) - backend
 
-This project contains the API and other core infrastructure items needed for all [zdamegzaminzawodowy.pl](https://zdamegzaminzawodowy.pl) apps.
-
-## Development
-
-### Prerequisites
-1. Golang
-2. PostgreSQL database
-
-### Installation
-**Required ENV variables (you can set them directly in your system or create the .env.local file):**
-```
-DB_USER=db_user
-DB_NAME=db_name
-DB_PORT=db_port
-DB_HOST=db_host
-DB_PASSWORD=db_pass
-DB_POOL_SIZE=40
-LOG_DB_QUERIES=true
-ACCESS_SECRET=access_token_secret
-FILE_STORAGE_PATH=path_to_the_folder_where_uploaded_files_will_be_stored
-ENABLE_ACCESS_LOG=false
-```
-
-1. Clone this repo.
-```
-git clone git@github.com:zdam-egzamin-zawodowy/backend.git
-```
-2. Set the required env variables.
-3. Run the app.
-```
-go run main.go
-```
+The core infrastructure backend (API, Docker etc) for [zdamegzaminzawodowy.pl](https://zdamegzaminzawodowy.pl)
 
 ## License
 Distributed under the MIT License. See ``LICENSE`` for more information.

build/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine as builder
+FROM golang:1.17-alpine3.16 as builder
 
 # Set the Current Working Directory inside the container
 WORKDIR /app
@@ -12,11 +12,13 @@ RUN go mod download
 # Copy the source from the current directory to the Working Directory inside the container
 COPY . .
 RUN apk --no-cache add musl-dev gcc build-base
+RUN go install github.com/99designs/gqlgen@v0.14.0
 RUN go generate ./...
-RUN go build -o zdamegzawodowy .
+ENV CGO_ENABLED=0
+RUN go build -o zdamegzawodowy ./cmd/server
 
 ######## Start a new stage from scratch #######
-FROM alpine:latest
+FROM alpine:3.16
 
 RUN apk --no-cache add ca-certificates
 
@@ -26,10 +28,6 @@ WORKDIR /root/
 COPY --from=builder /app/zdamegzawodowy .
 
 ENV APP_MODE=production
-ENV GIN_MODE=release
 EXPOSE 8080
 
-ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.2.1/wait ./wait
-RUN chmod +x ./wait
-
-CMD ./wait && ./zdamegzawodowy
+CMD ./zdamegzawodowy

build/server/manifest.tmpl

@@ -0,0 +1,13 @@
+image: gitea.dwysokinski.me/zdam-egzamin-zawodowy-docker/backend:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: gitea.dwysokinski.me/zdam-egzamin-zawodowy-docker/backend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    platform:
+      architecture: amd64
+      os: linux

cmd/internal/env.go

@@ -0,0 +1,17 @@
+package internal
+
+import (
+	"github.com/joho/godotenv"
+	"github.com/pkg/errors"
+	"strings"
+)
+
+func LoadENVFiles() error {
+	for _, filename := range [...]string{".env.local", ".env"} {
+		if err := godotenv.Load(filename); err != nil && !strings.Contains(err.Error(), "no such file or directory") {
+			return errors.Wrap(err, "godotenv.Load")
+		}
+	}
+
+	return nil
+}

cmd/server/main.go

@@ -2,62 +2,59 @@ package main
 
 import (
 	"context"
-	"github.com/Kichiyaki/appmode"
-	"github.com/Kichiyaki/chilogrus"
-	"github.com/Kichiyaki/goutil/envutil"
-	"github.com/go-chi/chi/v5"
-	"github.com/go-pg/pg/v10"
 	"log"
 	"net/http"
 	"os"
 	"os/signal"
 	"time"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/auth"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
-	graphqlhttpdelivery "github.com/zdam-egzamin-zawodowy/backend/internal/graphql/delivery/httpdelivery"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/directive"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/resolvers"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/profession"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/qualification"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/question"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/user"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/cmd/internal"
+	"github.com/Kichiyaki/appmode"
+	"github.com/Kichiyaki/chilogrus"
+	"github.com/Kichiyaki/goutil/envutil"
+	"github.com/go-chi/chi/v5"
+	"github.com/go-pg/pg/v10"
+
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/auth"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
+	graphqlhttpdelivery "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/delivery/httpdelivery"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/directive"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/resolvers"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/question"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user"
 
 	"github.com/pkg/errors"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/auth/jwt"
-	authusecase "github.com/zdam-egzamin-zawodowy/backend/internal/auth/usecase"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/dataloader"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/postgres"
-	professionrepository "github.com/zdam-egzamin-zawodowy/backend/internal/profession/repository"
-	professionusecase "github.com/zdam-egzamin-zawodowy/backend/internal/profession/usecase"
-	qualificationrepository "github.com/zdam-egzamin-zawodowy/backend/internal/qualification/repository"
-	qualificationusecase "github.com/zdam-egzamin-zawodowy/backend/internal/qualification/usecase"
-	questionrepository "github.com/zdam-egzamin-zawodowy/backend/internal/question/repository"
-	questionusecase "github.com/zdam-egzamin-zawodowy/backend/internal/question/usecase"
-	userrepository "github.com/zdam-egzamin-zawodowy/backend/internal/user/repository"
-	userusecase "github.com/zdam-egzamin-zawodowy/backend/internal/user/usecase"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/auth/jwt"
+	authusecase "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/auth/usecase"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/dataloader"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/postgres"
+	professionrepository "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession/repository"
+	professionusecase "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession/usecase"
+	qualificationrepository "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification/repository"
+	qualificationusecase "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification/usecase"
+	questionrepository "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/question/repository"
+	questionusecase "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/question/usecase"
+	userrepository "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user/repository"
+	userusecase "gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user/usecase"
 
-	"github.com/joho/godotenv"
 	"github.com/sirupsen/logrus"
 
-	"github.com/zdam-egzamin-zawodowy/backend/fstorage"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/fstorage"
 
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
 	"github.com/go-chi/cors"
 )
 
-func init() {
-	os.Setenv("TZ", "UTC")
-
-	if appmode.Equals(appmode.DevelopmentMode) {
-		godotenv.Load(".env.local")
+func main() {
+	if err := internal.LoadENVFiles(); err != nil {
+		logrus.Fatal("internal.LoadENVFiles", err)
 	}
 
 	prepareLogger()
-}
 
-func main() {
 	fileStorage := fstorage.New(&fstorage.Config{
 		BasePath: envutil.GetenvString("FILE_STORAGE_PATH"),
 	})
@@ -93,14 +90,13 @@ func main() {
 	quit := make(chan os.Signal)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
-	logrus.Info("Shutdown Server ...")
+	logrus.Info("Shutdown signal received, exiting...")
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	if err := srv.Shutdown(ctx); err != nil {
 		logrus.Fatalln("Server Shutdown:", err)
 	}
-	logrus.Info("Server exiting")
 }
 
 func prepareLogger() {

dev/.gitignore

@@ -0,0 +1,2 @@
+upload
+pgdata

dev/nginx.conf

@@ -0,0 +1,51 @@
+# auto detects a good number of processes to run
+worker_processes auto;
+
+#Provides the configuration file context in which the directives that affect connection processing are specified.
+events {
+    # Sets the maximum number of simultaneous connections that can be opened by a worker process.
+    worker_connections 8000;
+    # Tells the worker to accept multiple connections at a time
+    multi_accept on;
+}
+
+
+http {
+    # what times to include
+    include       /etc/nginx/mime.types;
+    # what is the default one
+    default_type  application/octet-stream;
+
+    # Sets the path, format, and configuration for a buffered log write
+    log_format compression '$remote_addr - $remote_user [$time_local] '
+        '"$request" $status $upstream_addr '
+        '"$http_referer" "$http_user_agent"';
+
+    server {
+        # listen on port 80
+        listen 80;
+        # save logs here
+        access_log /var/log/nginx/access.log compression;
+
+        # where the root here
+        root /usr/share/nginx/html;
+
+        # Fonts and media: images, icons, video, audio, HTC
+        location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc|ttf|webp)$ {
+          expires 1m;
+          add_header Cache-Control "public";
+        }
+
+        # Javascript and CSS files
+        location ~* \.(?:css|webmanifest|js|woff2|manifest)$ {
+            expires 1y;
+            add_header Cache-Control "public";
+        }
+
+        location / {
+            # First attempt to serve request as file, then
+            # as directory, then fall back to redirecting to index.html
+            try_files $uri $uri/ =404;
+        }
+    }
+}

docker-compose.yml

@@ -0,0 +1,24 @@
+version: '3.6'
+
+services:
+  cdn:
+    image: nginx:alpine
+    volumes:
+      - ./dev/upload:/usr/share/nginx/html
+      - ./dev/nginx.conf:/etc/nginx/nginx.conf
+    ports:
+      - "9000:80"
+    environment:
+      - NGINX_PORT=80
+    restart: unless-stopped
+
+  zdamegzzawodowydb:
+    image: postgres:12.11
+    container_name: zdamegzzawodowydb
+    restart: unless-stopped
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_PASSWORD=zdamegzzawodowy
+      - POSTGRES_DB=zdamegzzawodowy
+      - TZ=UTC

go.mod

@@ -1,49 +1,42 @@
-module github.com/zdam-egzamin-zawodowy/backend
+module gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend
 
 go 1.17
 
 require (
-	github.com/99designs/gqlgen v0.13.0
-	github.com/Kichiyaki/appmode v0.0.0-20210502105643-0a26207c548d
-	github.com/Kichiyaki/chilogrus v0.0.0-20210717074801-6ecc28dbf6b9
+	github.com/99designs/gqlgen v0.14.0
+	github.com/Kichiyaki/appmode v1.0.1
+	github.com/Kichiyaki/chilogrus v0.1.0
 	github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210502060056-ad595ba7b858
 	github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210521204542-cc672e361b3d
-	github.com/Kichiyaki/goutil v0.0.0-20210727060523-b40a549d5a72
-	github.com/agnivade/levenshtein v1.1.0 // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/go-chi/chi/v5 v5.0.3
-	github.com/go-chi/cors v1.2.0
-	github.com/go-pg/pg/v10 v10.10.3
+	github.com/Kichiyaki/goutil v0.1.0
+	github.com/go-chi/chi/v5 v5.0.7
+	github.com/go-chi/cors v1.2.1
+	github.com/go-pg/pg/v10 v10.10.6
+	github.com/golang-jwt/jwt/v4 v4.4.1
 	github.com/google/uuid v1.3.0
-	github.com/gosimple/slug v1.10.0
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/joho/godotenv v1.3.0
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/gosimple/slug v1.12.0
+	github.com/joho/godotenv v1.4.0
 	github.com/pkg/errors v0.9.1
 	github.com/sethvargo/go-password v0.2.0
 	github.com/sirupsen/logrus v1.8.1
-	github.com/vektah/gqlparser/v2 v2.1.0
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
-	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
 )
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
+	github.com/agnivade/levenshtein v1.1.0 // indirect
 	github.com/go-pg/zerochecker v0.2.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/gosimple/unidecode v1.0.0 // indirect
+	github.com/gosimple/unidecode v1.0.1 // indirect
+	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
-	github.com/urfave/cli/v2 v2.1.1 // indirect
+	github.com/vektah/gqlparser/v2 v2.2.0 // indirect
 	github.com/vmihailenco/bufpool v0.1.11 // indirect
-	github.com/vmihailenco/msgpack/v5 v5.3.1 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
 	github.com/vmihailenco/tagparser v0.1.2 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589 // indirect
+	golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
+	golang.org/x/text v0.3.7 // indirect
 	mellium.im/sasl v0.2.1 // indirect
 )

go.sum

@@ -1,21 +1,19 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/99designs/gqlgen v0.13.0 h1:haLTcUp3Vwp80xMVEg5KRNwzfUrgFdRmtBY8fuB8scA=
-github.com/99designs/gqlgen v0.13.0/go.mod h1:NV130r6f4tpRWuAI+zsrSdooO/eWUv+Gyyoi3rEfXIk=
+github.com/99designs/gqlgen v0.14.0 h1:Wg8aNYQUjMR/4v+W3xD+7SizOy6lSvVeQ06AobNQAXI=
+github.com/99designs/gqlgen v0.14.0/go.mod h1:S7z4boV+Nx4VvzMUpVrY/YuHjFX4n7rDyuTqvAkuoRE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Kichiyaki/appmode v0.0.0-20210502105643-0a26207c548d h1:ApX13STtfJc2YPH5D2JnBa6+4AM2vt7a81so/MPr/bA=
-github.com/Kichiyaki/appmode v0.0.0-20210502105643-0a26207c548d/go.mod h1:41p1KTy/fiVocPnJR2h/iXh2NvWWVBdNoZrN8TWVXUI=
-github.com/Kichiyaki/chilogrus v0.0.0-20210717074801-6ecc28dbf6b9 h1:ze0F+qhjUaQrZ+3UdZ6Dz3L21T/mZwB6UzzZ8LdG44Y=
-github.com/Kichiyaki/chilogrus v0.0.0-20210717074801-6ecc28dbf6b9/go.mod h1:DkStLjMOKdbuZ/qFps1/fUW+17Glvefijm5NS1KCbIE=
+github.com/Kichiyaki/appmode v1.0.1 h1:DRyrRi6JeIaxK1wTZZxKFJiwD8C/Lmj0sV73il7Z2vE=
+github.com/Kichiyaki/appmode v1.0.1/go.mod h1:EY3cHa98DiSDsUiNjQk7gh3ihLhUTDAbrwBMhFi0nWM=
+github.com/Kichiyaki/chilogrus v0.1.0 h1:1Lr28v5Q2PCIE82fPccMhC6AiU3cKsA1gvCB1XXjpgE=
+github.com/Kichiyaki/chilogrus v0.1.0/go.mod h1:tLUYHMQpIsv9lPCjvo50+xZ0YWmpV2YWALrwNaZr19c=
 github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210502060056-ad595ba7b858 h1:O7EPPY5lWaKbYB/5yJzE8WMesismUYuje7gOemo1UNo=
 github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210502060056-ad595ba7b858/go.mod h1:ADHVWnGlWcRn1aGthuh7I1Lrn6zzsjkVJju151dXyDw=
 github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210521204542-cc672e361b3d h1:7ZJVfFgAR0zNf5fNc6M9v2PZbXvTgGgDjQo4/+NIezQ=
 github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210521204542-cc672e361b3d/go.mod h1:MSAEhr8oeK+Rhjhqyl31/8/AI88thYky80OyD8mheDA=
-github.com/Kichiyaki/goutil v0.0.0-20210502095630-318d17091eab/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4=
 github.com/Kichiyaki/goutil v0.0.0-20210504132659-3d843a787db7/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4=
-github.com/Kichiyaki/goutil v0.0.0-20210727060523-b40a549d5a72 h1:KVFjB2eyaiLm/fWQPvHrHSoWB2PNAnGROnqLnLAhpoU=
-github.com/Kichiyaki/goutil v0.0.0-20210727060523-b40a549d5a72/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4=
+github.com/Kichiyaki/goutil v0.1.0 h1:FxcESWhmwOuhwK2H14oDzo6kZ+J8TDOjdIulgzP/rXs=
+github.com/Kichiyaki/goutil v0.1.0/go.mod h1:c1d+I8M8Hjdb9Brn3S5cYfMQk9Nf/9mYumATyVCF3io=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
-github.com/agnivade/levenshtein v1.0.3/go.mod h1:4SFRZbbXWLF4MU1T9Qg0pGgH3Pjs+t6ie5efyrwRJXs=
 github.com/agnivade/levenshtein v1.1.0 h1:n6qGwyHG61v3ABce1rPVZklEYRT8NFpCMrpZdBUbYGM=
 github.com/agnivade/levenshtein v1.1.0/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
@@ -24,14 +22,10 @@ github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -39,18 +33,19 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/go-chi/chi v3.3.2+incompatible h1:uQNcQN3NsV1j4ANsPh42P4ew4t6rnRbJb8frvpp31qQ=
-github.com/go-chi/chi v3.3.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-chi/chi/v5 v5.0.3 h1:khYQBdPivkYG1s1TAzDQG1f6eX4kD2TItYVZexL5rS4=
 github.com/go-chi/chi/v5 v5.0.3/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE=
-github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
+github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
+github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
+github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-pg/pg/v10 v10.9.1/go.mod h1:rgmTPgHgl5EN2CNKKoMwC7QT62t8BqsdpEkUQuiZMQs=
-github.com/go-pg/pg/v10 v10.10.3 h1:WobSfk5I+v7XwD1h9x2B7n4slDzjdBIonJ5PID95Aag=
-github.com/go-pg/pg/v10 v10.10.3/go.mod h1:EmoJGYErc+stNN/1Jf+o4csXuprjxcRztBnn6cHe38E=
+github.com/go-pg/pg/v10 v10.10.6 h1:1vNtPZ4Z9dWUw/TjJwOfFUbF5nEq1IkR6yG8Mq/Iwso=
+github.com/go-pg/pg/v10 v10.10.6/go.mod h1:GLmFXufrElQHf5uzM3BQlcfwV3nsgnHue5uzjQ6Nqxg=
 github.com/go-pg/zerochecker v0.2.0 h1:pp7f72c3DobMWOb2ErtZsnrPaSvHd2W4o9//8HtF4mU=
 github.com/go-pg/zerochecker v0.2.0/go.mod h1:NJZ4wKL0NmTtz0GKCoJ8kym6Xn/EQzXRl2OnAe7MmDo=
-github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ=
+github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -75,18 +70,19 @@ github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB
 github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gosimple/slug v1.10.0 h1:3XbiQua1IpCdrvuntWvGBxVm+K99wCSxJjlxkP49GGQ=
-github.com/gosimple/slug v1.10.0/go.mod h1:MICb3w495l9KNdZm+Xn5b6T2Hn831f9DMxiJ1r+bAjw=
-github.com/gosimple/unidecode v1.0.0 h1:kPdvM+qy0tnk4/BrnkrbdJ82xe88xn7c9hcaipDz4dQ=
-github.com/gosimple/unidecode v1.0.0/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
+github.com/gosimple/slug v1.12.0 h1:xzuhj7G7cGtd34NXnW/yF0l+AGNfWqwgh/IXgFy7dnc=
+github.com/gosimple/slug v1.12.0/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
+github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
+github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
+github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
+github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
@@ -97,8 +93,8 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
-github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
@@ -120,14 +116,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sethvargo/go-password v0.2.0 h1:BTDl4CC/gjf/axHMaDQtw507ogrXLci6XRiLc7i/UHI=
 github.com/sethvargo/go-password v0.2.0/go.mod h1:Ym4Mr9JXLBycr02MFuVQ/0JHidNetSgbzutTr3zsYXE=
 github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
@@ -142,20 +136,21 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
-github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k=
 github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U=
-github.com/vektah/gqlparser/v2 v2.1.0 h1:uiKJ+T5HMGGQM2kRKQ8Pxw8+Zq9qhhZhz/lieYvCMns=
-github.com/vektah/gqlparser/v2 v2.1.0/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms=
+github.com/vektah/gqlparser/v2 v2.2.0 h1:bAc3slekAAJW6sZTi07aGq0OrfaCjj4jxARAaC7g2EM=
+github.com/vektah/gqlparser/v2 v2.2.0/go.mod h1:i3mQIGIrbK2PD1RrCeMTlVbkF2FJ6WkU1KJlJlC+3F4=
 github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
 github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=
 github.com/vmihailenco/msgpack/v5 v5.3.0/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
-github.com/vmihailenco/msgpack/v5 v5.3.1 h1:0i85a4dsZh8mC//wmyyTEzidDLPQfQAxZIOLtafGbFY=
-github.com/vmihailenco/msgpack/v5 v5.3.1/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
+github.com/vmihailenco/msgpack/v5 v5.3.4 h1:qMKAwOV+meBw2Y8k9cVwAy7qErtYCwBzZ2ellBfvnqc=
+github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
 github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
 go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc=
 go.opentelemetry.io/otel/oteltest v0.19.0/go.mod h1:tI4yxwh8U21v7JD6R3BcA/2+RBoTKFexE/PJ/nSO7IA=
@@ -165,18 +160,15 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e h1:VvfwVmMH40bpMeizC9/K7ipM5Qjucuu16RWfneFPyhQ=
-golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -184,14 +176,19 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -207,16 +204,18 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac h1:oN6lz7iLW/YC7un8pq+9bOLyXrprv2+DKfkJY+2LJJw=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -224,8 +223,10 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589 h1:rjUrONFu4kLchcZTfp3/96bR8bW8dIa8uz3cR5n0cgM=
-golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
@@ -257,14 +258,13 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 mellium.im/sasl v0.2.1 h1:nspKSRg7/SyO0cRGY71OkfHab8tf9kCts6a6oTDut0w=
 mellium.im/sasl v0.2.1/go.mod h1:ROaEDLQNuf9vjKqE1SrAfnsobm2YKXT1gnN1uDp1PjQ=
-sourcegraph.com/sourcegraph/appdash v0.0.0-20180110180208-2cc67fd64755/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
+sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
 sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:L5q+DGLGOQFpo1snNEkLOJT2d1YTW66rWNzatr3He1k=

internal/auth/jwt/token_generator.go

@@ -3,7 +3,7 @@ package jwt
 import (
 	"time"
 
-	"github.com/dgrijalva/jwt-go"
+	"github.com/golang-jwt/jwt/v4"
 	"github.com/pkg/errors"
 )
 
@@ -40,6 +40,7 @@ func (g *TokenGenerator) Generate(metadata Metadata) (string, error) {
 	if !metadata.StaySignedIn {
 		atClaims["exp"] = time.Now().Add(time.Hour * 24).Unix()
 	}
+
 	at := jwt.NewWithClaims(jwt.SigningMethodHS256, atClaims)
 	accessToken, err := at.SignedString([]byte(g.accessSecret))
 	if err != nil {
@@ -64,9 +65,11 @@ func verifyToken(secret string, tokenString string) (*jwt.Token, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "couldn't parse the token")
 	}
+
 	if !token.Valid {
 		return nil, errors.New("token is invalid")
 	}
+
 	return token, nil
 }
 
@@ -77,27 +80,28 @@ func extractTokenMetadata(secret, tokenString string) (*Metadata, error) {
 	}
 
 	claims, ok := token.Claims.(jwt.MapClaims)
-	if ok {
-		staySignedIn, ok := claims["stay_signed_in"].(bool)
-		if !ok {
-			return nil, errors.New("invalid token payload (staySignedIn should be a boolean)")
-		}
-		email, ok := claims["email"].(string)
-		if !ok {
-			return nil, errors.New("invalid token payload (email should be a string)")
-		}
-		password, ok := claims["password"].(string)
-		if !ok {
-			return nil, errors.New("invalid token payload (password should be a string)")
-		}
-		return &Metadata{
-			StaySignedIn: staySignedIn,
-			Credentials: Credentials{
-				Email:    email,
-				Password: password,
-			},
-		}, nil
+	if !ok {
+		return nil, errors.New("couldn't extract token metadata")
 	}
 
-	return nil, errors.New("couldn't extract token metadata")
+	staySignedIn, ok := claims["stay_signed_in"].(bool)
+	if !ok {
+		return nil, errors.New("invalid token payload (staySignedIn should be a boolean)")
+	}
+	email, ok := claims["email"].(string)
+	if !ok {
+		return nil, errors.New("invalid token payload (email should be a string)")
+	}
+	password, ok := claims["password"].(string)
+	if !ok {
+		return nil, errors.New("invalid token payload (password should be a string)")
+	}
+
+	return &Metadata{
+		StaySignedIn: staySignedIn,
+		Credentials: Credentials{
+			Email:    email,
+			Password: password,
+		},
+	}, nil
 }

internal/auth/usecase.go

@@ -3,7 +3,7 @@ package auth
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type Usecase interface {

internal/auth/usecase/usecase.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"github.com/pkg/errors"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/auth"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/auth/jwt"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/user"
-	"github.com/zdam-egzamin-zawodowy/backend/util/errorutil"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/auth"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/auth/jwt"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/util/errorutil"
 )
 
 type Config struct {

internal/chi/middleware/authenticate.go

@@ -5,8 +5,8 @@ import (
 	"github.com/pkg/errors"
 	"net/http"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/auth"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/auth"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 const (

internal/chi/middleware/dataloader_to_context.go

@@ -5,7 +5,7 @@ import (
 	"github.com/pkg/errors"
 	"net/http"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/dataloader"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/dataloader"
 )
 
 var (

internal/graphql/dataloader/dataloader.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/profession"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/qualification"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification"
 )
 
 const (

internal/graphql/dataloader/qualificationloader_gen.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 // QualificationLoaderConfig captures the config to create a new QualificationLoader

internal/graphql/dataloader/qualificationslicebyprofessionidloader_gen.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 // QualificationSliceByProfessionIDLoaderConfig captures the config to create a new QualificationSliceByProfessionIDLoader

internal/graphql/delivery/httpdelivery/http_handler.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/querycomplexity"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/querycomplexity"
 
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/handler/extension"
@@ -16,9 +16,9 @@ import (
 	"github.com/99designs/gqlgen/graphql/handler/transport"
 	"github.com/99designs/gqlgen/graphql/playground"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/directive"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/resolvers"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/directive"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/resolvers"
 )
 
 const (

internal/graphql/directive/directive.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/99designs/gqlgen/graphql"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/util/errorutil"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/util/errorutil"
 )
 
 type Directive struct{}

internal/graphql/generated/.gitignore

@@ -0,0 +1 @@
+*.go

internal/graphql/generated/models.go

@@ -1,32 +0,0 @@
-// Code generated by github.com/99designs/gqlgen, DO NOT EDIT.
-
-package generated
-
-import (
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-)
-
-type ProfessionList struct {
-	Total int                 `json:"total"`
-	Items []*model.Profession `json:"items"`
-}
-
-type QualificationList struct {
-	Total int                    `json:"total"`
-	Items []*model.Qualification `json:"items"`
-}
-
-type QuestionList struct {
-	Total int               `json:"total"`
-	Items []*model.Question `json:"items"`
-}
-
-type UserList struct {
-	Total int           `json:"total"`
-	Items []*model.User `json:"items"`
-}
-
-type UserWithToken struct {
-	Token string      `json:"token"`
-	User  *model.User `json:"user"`
-}

internal/graphql/gqlgen.yml

@@ -19,52 +19,52 @@ models:
       - github.com/99designs/gqlgen/graphql.Int32
   Role:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.Role
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.Role
   User:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.User
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.User
   UserFilter:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.UserFilter
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.UserFilter
   UserFilterOr:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.UserFilterOr
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.UserFilterOr
   UserInput:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.UserInput
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.UserInput
   UpdateManyUsersInput:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.UserInput
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.UserInput
   Profession:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.Profession
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.Profession
   ProfessionFilter:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.ProfessionFilter
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.ProfessionFilter
   ProfessionInput:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.ProfessionInput
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.ProfessionInput
   Qualification:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.Qualification
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.Qualification
   QualificationFilter:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.QualificationFilter
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.QualificationFilter
   QualificationFilterOr:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.QualificationFilterOr
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.QualificationFilterOr
   QualificationInput:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.QualificationInput
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.QualificationInput
   Answer:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.Answer
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.Answer
   Question:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.Question
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.Question
   QuestionFilter:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.QuestionFilter
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.QuestionFilter
   QuestionInput:
     model:
-      - github.com/zdam-egzamin-zawodowy/backend/internal/model.QuestionInput
+      - gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model.QuestionInput

internal/graphql/graphql.go

@@ -1,7 +1,3 @@
 package graphql
 
-//go:generate go run github.com/99designs/gqlgen
-
-import (
-	_ "github.com/99designs/gqlgen/cmd"
-)
+//go:generate gqlgen --verbose

internal/graphql/querycomplexity/querycomplexity.go

@@ -4,12 +4,12 @@ import (
 	"github.com/99designs/gqlgen/graphql/handler/extension"
 	"github.com/Kichiyaki/goutil/safeptr"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/profession"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/qualification"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/question"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/user"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/question"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user"
 )
 
 const (

internal/graphql/resolvers/profession_resolver.go

@@ -7,11 +7,11 @@ import (
 	"context"
 	"github.com/Kichiyaki/goutil/safeptr"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/profession"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession"
 )
 
 func (r *mutationResolver) CreateProfession(ctx context.Context, input model.ProfessionInput) (*model.Profession, error) {

internal/graphql/resolvers/qualification_resolver.go

@@ -7,9 +7,9 @@ import (
 	"context"
 	"github.com/Kichiyaki/goutil/safeptr"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/qualification"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification"
 )
 
 func (r *mutationResolver) CreateQualification(ctx context.Context, input model.QualificationInput) (*model.Qualification, error) {

internal/graphql/resolvers/question_resolver.go

@@ -7,10 +7,10 @@ import (
 	"context"
 	"github.com/Kichiyaki/goutil/safeptr"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/question"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/question"
 )
 
 func (r *mutationResolver) CreateQuestion(ctx context.Context, input model.QuestionInput) (*model.Question, error) {

internal/graphql/resolvers/resolver.go

@@ -1,12 +1,12 @@
 package resolvers
 
 import (
-	"github.com/zdam-egzamin-zawodowy/backend/internal/auth"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/profession"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/qualification"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/question"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/user"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/auth"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/question"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user"
 )
 
 // This file will not be regenerated automatically.

internal/graphql/resolvers/user_resolver.go

@@ -7,10 +7,10 @@ import (
 	"context"
 	"github.com/Kichiyaki/goutil/safeptr"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/user"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/chi/middleware"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user"
 )
 
 func (r *mutationResolver) CreateUser(ctx context.Context, input model.UserInput) (*model.User, error) {

internal/postgres/postgres.go

@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sethvargo/go-password/password"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 var log = logrus.WithField("package", "internal/postgres")

internal/profession/repository.go

@@ -3,7 +3,7 @@ package profession
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type FetchConfig struct {

internal/profession/repository/pg_repository.go

@@ -6,12 +6,12 @@ import (
 	"github.com/pkg/errors"
 	"strings"
 
-	"github.com/zdam-egzamin-zawodowy/backend/util/errorutil"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/util/errorutil"
 
 	"github.com/go-pg/pg/v10"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/profession"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession"
 )
 
 type PGRepositoryConfig struct {

internal/profession/usecase.go

@@ -3,7 +3,7 @@ package profession
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type Usecase interface {

internal/profession/usecase/usecase.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"github.com/pkg/errors"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/profession"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/profession"
 )
 
 type Config struct {

internal/qualification/repository.go

@@ -3,7 +3,7 @@ package qualification
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type FetchConfig struct {

internal/qualification/repository/pg_repository.go

@@ -6,12 +6,12 @@ import (
 	"github.com/pkg/errors"
 	"strings"
 
-	"github.com/zdam-egzamin-zawodowy/backend/util/errorutil"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/util/errorutil"
 
 	"github.com/go-pg/pg/v10"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/qualification"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification"
 )
 
 type PGRepositoryConfig struct {

internal/qualification/usecase.go

@@ -3,7 +3,7 @@ package qualification
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type Usecase interface {

internal/qualification/usecase/usecase.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"github.com/pkg/errors"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/qualification"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/qualification"
 )
 
 type Config struct {

internal/question/repository.go

@@ -3,7 +3,7 @@ package question
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type FetchConfig struct {

internal/question/repository/pg_repository.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/go-pg/pg/v10"
 
-	"github.com/zdam-egzamin-zawodowy/backend/fstorage"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/question"
-	"github.com/zdam-egzamin-zawodowy/backend/util/errorutil"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/fstorage"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/question"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/util/errorutil"
 )
 
 type PGRepositoryConfig struct {

internal/question/repository/repository.go

@@ -3,12 +3,12 @@ package repository
 import (
 	"path/filepath"
 
-	"github.com/zdam-egzamin-zawodowy/backend/fstorage/fstorageutil"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/fstorage/fstorageutil"
 
 	"github.com/99designs/gqlgen/graphql"
 
-	"github.com/zdam-egzamin-zawodowy/backend/fstorage"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/fstorage"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type repository struct {

internal/question/usecase.go

@@ -3,7 +3,7 @@ package question
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type Usecase interface {

internal/question/usecase/usecase.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"github.com/pkg/errors"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/question"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/question"
 )
 
 var (

internal/user/repository.go

@@ -3,7 +3,7 @@ package user
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type FetchConfig struct {

internal/user/repository/pg_repository.go

@@ -6,12 +6,12 @@ import (
 	"github.com/pkg/errors"
 	"strings"
 
-	"github.com/zdam-egzamin-zawodowy/backend/util/errorutil"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/util/errorutil"
 
 	"github.com/go-pg/pg/v10"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/user"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user"
 )
 
 type PGRepositoryConfig struct {

internal/user/usecase.go

@@ -3,7 +3,7 @@ package user
 import (
 	"context"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
 )
 
 type Usecase interface {

internal/user/usecase/usecase.go

@@ -5,8 +5,8 @@ import (
 	"github.com/Kichiyaki/goutil/strutil"
 	"github.com/pkg/errors"
 
-	"github.com/zdam-egzamin-zawodowy/backend/internal/model"
-	"github.com/zdam-egzamin-zawodowy/backend/internal/user"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/model"
+	"gitea.dwysokinski.me/zdam-egzamin-zawodowy/backend/internal/user"
 )
 
 type Config struct {