chore: send notification on successful import

Add Open Graph meta tags

.dockerignore

@@ -1 +1,10 @@
-.env
+.env
+config*.yml
+!config.default.yml
+*.db
+*.exe
+wakapi
+Dockerfile
+docker-compose.yml
+.dockerignore
+.git*

.github/workflows/docker.yml

@@ -0,0 +1,42 @@
+name: Publish Docker Image
+
+on:
+  push:
+    tags:
+      - '*.*.*'
+      - '!*.*.*-*'
+
+jobs:
+  docker-publish:
+    runs-on: ubuntu-latest
+    steps:
+      # https://stackoverflow.com/questions/58177786
+      - name: Get version
+        run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: |
+            n1try/wakapi:${{ env.GIT_TAG }}
+            n1try/wakapi:latest
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/linux-build-on-release.yml

@@ -1,13 +1,16 @@
 name: Build Wakapi on Linux
 
 on:
+  push:
+    branches:
+  pull_request:
   release:
-    types: 
-      - created
+    types:
+      - published
 
 jobs:
   build-and-release:
-    name: Build and add to Release
+    name: Build
     runs-on: ubuntu-latest
     steps:
 
@@ -22,18 +25,21 @@ jobs:
 
     - name: Get dependencies
       run: |
-        go get -v -t -d ./...
-      
+        go get github.com/markbates/pkger/cmd/pkger
+        go get
+        go generate
+
     - name: Build
       run: GO111MODULE=on go build -v .
 
-    - name: Zip Release
-      uses: TheDoctor0/zip-release@v0.3.0
-      with:
-        filename: release.zip
-        exclusions: '*.git*'
+    - name: Zip executable and sample config
+      if: github.event_name == 'release'
+      run: |
+        cp config.default.yml config.yml
+        zip -9 release.zip wakapi config.yml
 
     - name: Upload built executable to Release
+      if: github.event_name == 'release'
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/win-build-on-release.yml

@@ -1,13 +1,16 @@
 name: Build Wakapi on Windows
 
 on:
+  push:
+    branches:
+  pull_request:
   release:
-    types: 
-      - created
+    types:
+      - published
 
 jobs:
   build-and-release:
-    name: Build and add to release
+    name: Build
     runs-on: windows-latest
     steps:
 
@@ -22,18 +25,24 @@ jobs:
 
     - name: Get dependencies
       run: |
-        go get -v -t -d ./...
+        go get github.com/markbates/pkger/cmd/pkger
+        go get
+        go generate
 
     - name: Enable Go 1.11 modules
       run: cmd /c "set GO111MODULE=on"
-      
+
     - name: Build
       run: go build -v .
-  
+
     - name: Compress working folder
-      run: Compress-Archive -Path .\* -DestinationPath release.zip
+      if: github.event_name == 'release'
+      run: |
+        cp .\config.default.yml .\config.yml
+        Compress-Archive -Path .\wakapi.exe, .\config.yml -DestinationPath release.zip
 
     - name: Upload built executable to Release
+      if: github.event_name == 'release'
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,6 +1,5 @@
 launch.json
 .vscode
-.env
 wakapi
 .idea
 build
@@ -8,4 +7,4 @@ build
 *.db
 config*.yml
 !config.default.yml
-config.ini
+pkged.go

Dockerfile

@@ -1,30 +1,36 @@
 # Build Stage
 
-FROM golang:1.13 AS build-env
+FROM golang:1.15 AS build-env
 WORKDIR /src
+
 ADD ./go.mod .
-RUN go mod download
+RUN go mod download && go get github.com/markbates/pkger/cmd/pkger
+
+RUN curl "https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh" -o wait-for-it.sh && \
+    chmod +x wait-for-it.sh
 
 ADD . .
-RUN go build -o wakapi
+RUN go generate && go build -o wakapi
 
-# Final Stage
+WORKDIR /app
+RUN cp /src/wakapi . && \
+    cp /src/config.default.yml config.yml && \
+    sed -i 's/listen_ipv6: ::1/listen_ipv6: /g' config.yml && \
+    cp /src/wait-for-it.sh . && \
+    cp /src/entrypoint.sh .
+
+# Run Stage
 
 # When running the application using `docker run`, you can pass environment variables
 # to override config values using `-e` syntax.
-# Available options are:
-# – WAKAPI_DB_TYPE
-# – WAKAPI_DB_USER
-# – WAKAPI_DB_PASSWORD
-# – WAKAPI_DB_HOST
-# – WAKAPI_DB_PORT
-# – WAKAPI_DB_NAME
-# – WAKAPI_PASSWORD_SALT
-# – WAKAPI_BASE_PATH
+# Available options can be found in [README.md#-configuration](README.md#-configuration)
 
 FROM debian
 WORKDIR /app
 
+RUN apt update && \
+    apt install -y ca-certificates
+
 ENV ENVIRONMENT prod
 ENV WAKAPI_DB_TYPE sqlite3
 ENV WAKAPI_DB_USER ''
@@ -32,20 +38,12 @@ ENV WAKAPI_DB_PASSWORD ''
 ENV WAKAPI_DB_HOST ''
 ENV WAKAPI_DB_NAME=/data/wakapi.db
 ENV WAKAPI_PASSWORD_SALT ''
+ENV WAKAPI_LISTEN_IPV4 '0.0.0.0'
+ENV WAKAPI_INSECURE_COOKIES 'true'
+ENV WAKAPI_ALLOW_SIGNUP 'true'
 
-COPY --from=build-env /src/wakapi /app/
-COPY --from=build-env /src/config.default.yml /app/config.yml
-COPY --from=build-env /src/version.txt /app/
-
-RUN sed -i 's/listen_ipv4: 127.0.0.1/listen_ipv4: 0.0.0.0/g' /app/config.yml
-RUN sed -i 's/insecure_cookies: false/insecure_cookies: true/g' /app/config.yml
-
-ADD static /app/static
-ADD data /app/data
-ADD migrations /app/migrations
-ADD views /app/views
-ADD wait-for-it.sh .
+COPY --from=build-env /app .
 
 VOLUME /data
 
-ENTRYPOINT ./wait-for-it.sh
+ENTRYPOINT ./entrypoint.sh

README.md

@@ -1,69 +1,159 @@
-# 📈 wakapi
+<p align="center">
+  <img src="static/assets/images/logo-gh.svg" width="350">
+</p>
 
-![](https://badges.fw-web.space/github/license/muety/wakapi)
-![GitHub release (latest by date)](https://badges.fw-web.space/github/v/release/muety/wakapi)
-![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/muety/wakapi)
-![Docker Cloud Build Status](https://badges.fw-web.space/docker/cloud/build/n1try/wakapi)
-![GitHub issues](https://img.shields.io/github/issues/muety/wakapi)
-![GitHub last commit](https://img.shields.io/github/last-commit/muety/wakapi)
-[![Say thanks](https://badges.fw-web.space/badge/SayThanks.io-%E2%98%BC-1EAEDB.svg)](https://saythanks.io/to/n1try)
-[![](https://badges.fw-web.space/liberapay/receives/muety.svg?logo=liberapay)](https://liberapay.com/muety/)
-![GitHub go.mod Go version](https://badges.fw-web.space/github/go-mod/go-version/muety/wakapi)
-[![Go Report Card](https://goreportcard.com/badge/github.com/muety/wakapi)](https://goreportcard.com/report/github.com/muety/wakapi)
-![Coding Activity](https://badges.fw-web.space/endpoint?url=https://wakapi.dev/api/compat/shields/v1/n1try/interval:any/project:wakapi&color=blue)
-[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=security_rating)](https://sonarcloud.io/dashboard?id=muety_wakapi)
-[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=muety_wakapi)
-[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=sqale_index)](https://sonarcloud.io/dashboard?id=muety_wakapi)
-[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=ncloc)](https://sonarcloud.io/dashboard?id=muety_wakapi)
----
+<p align="center">
+  <img src="https://badges.fw-web.space/github/license/muety/wakapi">
+  <a href="https://saythanks.io/to/n1try"><img src="https://badges.fw-web.space/badge/SayThanks.io-%E2%98%BC-1EAEDB.svg"></a>
+  <a href="https://liberapay.com/muety/"><img src="https://badges.fw-web.space/liberapay/receives/muety.svg?logo=liberapay"></a>
+  <img src="https://badges.fw-web.space/endpoint?url=https://wakapi.dev/api/compat/shields/v1/n1try/interval:any/project:wakapi&color=blue&label=wakapi">
+</p>
 
-**A minimalist, self-hosted WakaTime-compatible backend for coding statistics**
+<p align="center">
+  <a href="https://goreportcard.com/report/github.com/muety/wakapi"><img src="https://goreportcard.com/badge/github.com/muety/wakapi"></a>
+  <img src="https://badges.fw-web.space/github/languages/code-size/muety/wakapi">
+  <a href="https://sonarcloud.io/dashboard?id=muety_wakapi"><img src="https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=sqale_index"></a>
+  <a href="https://sonarcloud.io/dashboard?id=muety_wakapi"><img src="https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=ncloc"></a>
+</p>
 
-![Wakapi screenshot](https://anchr.io/i/bxQ69.png)
+<h3 align="center">A minimalist, self-hosted WakaTime-compatible backend for coding statistics.</h3>
 
-If you like this project, please consider supporting it 🙂. You can donate either through [buying me a coffee](https://buymeacoff.ee/n1try) or becoming a GitHub sponsor. Every little donation is highly appreciated and boosts the developers' motivation to keep improving Wakapi!
+<div align="center">
+  <h3>
+    <a href="https://wakapi.dev">Website</a>
+    <span> | </span>
+    <a href="#-features">Features</a>
+    <span> | </span>
+    <a href="#-how-to-use">How to use</a>
+    <span> | </span>
+    <a href="https://github.com/muety/wakapi/issues">Issues</a>
+    <span> | </span>
+    <a href="https://github.com/muety">Contact</a>
+  </h3>
+</div>
 
-## 👀 Hosted Service
-🔥 **New:** Wakapi is available as a hosted service now. Check out **[wakapi.dev](https://wakapi.dev)**. Please use responsibly.
+<p align="center">
+  <img src="static/assets/images/screenshot.png" width="500px">
+</p>
 
-To use the hosted version set `api_url = https://wakapi.dev/api/heartbeat`. However, we do not guarantee data persistence, so you might potentially lose your data if the service is taken down some day ❕
+## Table of Contents
+* [User Survey](#-user-survey)
+* [Features](#-features)
+* [Roadmap](#-roadmap)
+* [How to use](#-how-to-use)
+* [Configuration Options](#-configuration-options)
+* [API Endpoints](#-api-endpoints)
+* [Integrations](#-integrations)
+* [Best Practices](#-best-practices)
+* [Developer Notes](#-developer-notes)
+* [Support](#-support)
+* [FAQs](#-faqs)
 
-## ⚙️ Prerequisites
-**On the server side:**
+Further instructions can be found in the [Wiki](https://github.com/muety/wakapi/wiki).
+
+## 📬 **User Survey**
+I'd love to get some community feedback from active Wakapi users. If you want, please participate in the recent [user survey](https://github.com/muety/wakapi/issues/82). Thanks a lot!
+
+## 🚀 Features
+* ✅ 100 % free and open-source
+* ✅ Built by developers for developers
+* ✅ Statistics for projects, languages, editors, hosts and operating systems
+* ✅ Badges
+* ✅ REST API
+* ✅ Partially compatible with WakaTime
+* ✅ WakaTime integration
+* ✅ Support for Prometheus exports
+* ✅ Lightning fast
+* ✅ Self-hosted
+
+## 🚧 Roadmap
+Plans for the near future mainly include, besides usual improvements and bug fixes, a UI redesign as well as additional types of charts and statistics (see [#101](https://github.com/muety/wakapi/issues/101), [#80](https://github.com/muety/wakapi/issues/80), [#76](https://github.com/muety/wakapi/issues/76), [#12](https://github.com/muety/wakapi/issues/12)). If you have feature requests or any kind of improvement proposals feel free to open an issue or share them in our [user survey](https://github.com/muety/wakapi/issues/82). 
+
+## ⌨️ How to use?
+There are different options for how to use Wakapi, ranging from our hosted cloud service to self-hosting it. Regardless of which option choose, you will always have to do the [client setup](#-client-setup) in addition. 
+
+### ☁️ Option 1: Use [wakapi.dev](https://wakapi.dev)
+If you want to you out free, hosted cloud service, all you need to do is create an account and the set up your client-side tooling (see below).
+
+However, we do not guarantee data persistence, so you might potentially lose your data if the service is taken down some day ❕
+
+### 🐳 Option 2: Use Docker
+```bash
+# Create a persistent volume
+$ docker volume create wakapi-data
+
+# Run the container
+$ docker run -d \
+  -p 3000:3000 \
+  -e "WAKAPI_PASSWORD_SALT=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1)" \
+  -v wakapi-data:/data \
+  --name wakapi n1try/wakapi
+```
+
+**Note:** By default, SQLite is used as a database. To run Wakapi in Docker with MySQL or Postgres, see [Dockerfile](https://github.com/muety/wakapi/blob/master/Dockerfile) and [config.default.yml](https://github.com/muety/wakapi/blob/master/config.default.yml) for further options.
+
+If you want to run Wakapi on **Kubernetes**, there is [wakapi-helm-chart](https://github.com/andreymaznyak/wakapi-helm-chart) for quick and easy deployment.
+
+### 📦 Option 3: Run a release
+```bash
+# Download the release and unpack it
+$ wget https://github.com/muety/wakapi/releases/download/1.20.2/wakapi_linux_amd64.zip
+$ unzip wakapi_linux_amd64.zip
+
+# Optionally adapt config to your needs
+$ vi config.yml
+
+# Run it
+$ ./wakapi
+```
+
+### 🧑‍💻 Option 4: Run from source
+#### Prerequisites
 * Go >= 1.13 (with `$GOPATH` properly set)
 * gcc (to compile [go-sqlite3](https://github.com/mattn/go-sqlite3))
     * Fedora / RHEL: `dnf install @development-tools`
     * Ubuntu / Debian: `apt install build-essential`
     * Windows: See [here](https://github.com/mattn/go-sqlite3/issues/214#issuecomment-253216476)
-* _Optional_: A MySQL- or Postgres database
 
-**On your local machine:**
-* [WakaTime plugin](https://wakatime.com/plugins) for your editor / IDE
-
-## ⌨️ Server Setup
-### Run from source
-1. Clone the project
-1. Copy `config.default.yml` to `config.yml` and adapt it to your needs
-1. Build executable: `GO111MODULE=on go build`
-1. Run server: `./wakapi`
-
-**As an alternative** to building from source you can also grab a pre-built [release](https://github.com/muety/wakapi/releases). Steps 2, 3 and 5 apply analogously.
-
-**Note:** By default, the application is running in dev mode. However, it is recommended to set `ENV=production` for enhanced performance and security. To still be able to log in when using production mode, you either have to run Wakapi behind a reverse proxy, that enables for HTTPS encryption (see [best practices](#best-practices)) or set `security.insecure_cookies` to `true` in `config.yml`. 
-
-### Run with Docker
+#### Compile & Run
 ```bash
-docker run -d -p 3000:3000 --name wakapi n1try/wakapi
+# Adapt config to your needs
+$ cp config.default.yml config.yml
+$ vi config.yml
+
+# Install packaging tool
+$ export GO111MODULE=on
+$ go get github.com/markbates/pkger/cmd/pkger
+
+# Build the executable
+$ go generate
+$ go build -o wakapi
+
+# Run it
+$ ./wakapi
 ```
 
-By default, SQLite is used as a database. To run Wakapi in Docker with MySQL or Postgres, see [Dockerfile](https://github.com/muety/wakapi/blob/master/Dockerfile) and [config.default.yml](https://github.com/muety/wakapi/blob/master/config.default.yml) for further options.
+**Note:** By default, the application is running in dev mode. However, it is recommended to set `ENV=production` for enhanced performance and security. To still be able to log in when using production mode, you either have to run Wakapi behind a reverse proxy, that enables for HTTPS encryption (see [best practices](#best-practices)) or set `security.insecure_cookies = true` in `config.yml`.
 
-### Running tests
-```bash
-CGO_FLAGS="-g -O2 -Wno-return-local-addr" -coverprofile=coverage/coverage.out go test ./...
+### 💻 Client Setup
+Wakapi relies on the open-source [WakaTime](https://github.com/wakatime/wakatime) client tools. In order to collect statistics to Wakapi, you need to set them up.
+
+1. **Set up WakaTime** for your specific IDE or editor. Please refer to the respective [plugin guide](https://wakatime.com/plugins)
+2. **Editing your local `~/.wakatime.cfg`** file as follows
+
+```ini
+[settings]
+
+# Your Wakapi server URL or 'https://wakapi.dev/api/heartbeat' when using the cloud server
+api_url = http://localhost:3000/api/heartbeat
+
+# Your Wakapi API key (get it from the web interface after having created an account)
+api_key = 406fe41f-6d69-4183-a4cc-121e0c524c2b
 ```
 
-## 🔧 Configuration
+Optionally, you can set up a [client-side proxy](https://github.com/muety/wakapi/wiki/Advanced-Setup:-Client-side-proxy) in addition.
+
+## 🔧 Configuration Options
 You can specify configuration options either via a config file (default: `config.yml`, customziable through the `-c` argument) or via environment variables. Here is an overview of all options.
 
 | YAML Key                  | Environment Variable      | Default      | Description                                                         |
@@ -71,79 +161,191 @@ You can specify configuration options either via a config file (default: `config
 | `env`                       | `ENVIRONMENT`               | `dev`          | Whether to use development- or production settings                  |
 | `app.custom_languages`      | -                           | -              | Map from file endings to language names                             |
 | `server.port`               | `WAKAPI_PORT`               | `3000`         | Port to listen on                                                   |
-| `server.listen_ipv4`        | `WAKAPI_LISTEN_IPV4`        | `127.0.0.1`    | Network address to listen on                                        |
+| `server.listen_ipv4`        | `WAKAPI_LISTEN_IPV4`        | `127.0.0.1`    | IPv4 network address to listen on (leave blank to disable IPv4)     |
+| `server.listen_ipv6`        | `WAKAPI_LISTEN_IPV6`        | `::1`          | IPv6 network address to listen on (leave blank to disable IPv6)     |
+| `server.tls_cert_path`      | `WAKAPI_TLS_CERT_PATH`      | -              | Path of SSL server certificate (leave blank to not use HTTPS)       |
+| `server.tls_key_path`       | `WAKAPI_TLS_KEY_PATH`       | -              | Path of SSL server private key (leave blank to not use HTTPS)       |
 | `server.base_path`          | `WAKAPI_BASE_PATH`          | `/`            | Web base path (change when running behind a proxy under a sub-path) |
 | `security.password_salt`    | `WAKAPI_PASSWORD_SALT`      | -              | Pepper to use for password hashing                                  |
 | `security.insecure_cookies` | `WAKAPI_INSECURE_COOKIES`   | `false`        | Whether or not to allow cookies over HTTP                           |
-| `security.cookie_max_age`   | `WAKAPI_COOKIE_MAX_AGE  `   | `172800`       | Lifetime of authentication cookies in seconds or `0` to use [Session](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#Define_the_lifetime_of_a_cookie) cookies 
-|
+| `security.cookie_max_age`   | `WAKAPI_COOKIE_MAX_AGE`     | `172800`       | Lifetime of authentication cookies in seconds or `0` to use [Session](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#Define_the_lifetime_of_a_cookie) cookies |
+| `security.allow_signup`     | `WAKAPI_ALLOW_SIGNUP`       | `true`         | Whether to enable user registration                                 |
+| `security.expose_metrics`   | `WAKAPI_EXPOSE_METRICS`     | `false`        | Whether to expose Prometheus metrics under `/api/metrics`               |
 | `db.host`                   | `WAKAPI_DB_HOST`            | -              | Database host                                                       |
 | `db.port`                   | `WAKAPI_DB_PORT`            | -              | Database port                                                       |
 | `db.user`                   | `WAKAPI_DB_USER`            | -              | Database user                                                       |
 | `db.password`               | `WAKAPI_DB_PASSWORD`        | -              | Database password                                                   |
 | `db.name`                   | `WAKAPI_DB_NAME`            | `wakapi_db.db` | Database name                                                       |
-| `db.dialect`                | `WAKAPI_DB_TYPE`            | `sqlite3`      | Database type (one of sqlite3, mysql, postgres)                     |
+| `db.dialect`                | `WAKAPI_DB_TYPE`            | `sqlite3`      | Database type (one of `sqlite3`, `mysql`, `postgres`, `cockroach`)  |
+| `db.charset`                | `WAKAPI_DB_CHARSET`         | `utf8mb4`      | Database connection charset (for MySQL only)                        |
 | `db.max_conn`               | `WAKAPI_DB_MAX_CONNECTIONS` | `2`            | Maximum number of database connections                              |
+| `db.ssl`                    | `WAKAPI_DB_SSL`             | `false`        | Whether to use TLS encryption for database connection (Postgres and CockroachDB only) |
+| `mail.enabled`              | `WAKAPI_MAIL_ENABLED`       | `true`         | Whether to allow Wakapi to send e-mail (e.g. for password resets) |
+| `mail.provider`             | `WAKAPI_MAIL_PROVIDER`      | `smtp`         | Implementation to use for sending mails (one of [`smtp`, `mailwhale`]) |
+| `mail.smtp.*`               | `WAKAPI_MAIL_SMTP_*`        | `-`            | Various options to configure SMTP. See [default config](config.default.yaml) for details |
+| `mail.mailwhale.*`          | `WAKAPI_MAIL_MAILWHALE_*`   | `-`            | Various options to configure [MailWhale](https://mailwhale.dev) sending service. See [default config](config.default.yaml) for details |
+| `sentry.dsn`                | `WAKAPI_SENTRY_DSN`         | –              | DSN for to integrate [Sentry](https://sentry.io) for error logging and tracing (leave empty to disable) |
+| `sentry.enable_tracing`     | `WAKAPI_SENTRY_TRACING`     | `false`        | Whether to enable Sentry request tracing                           |
+| `sentry.sample_rate`        | `WAKAPI_SENTRY_SAMPLE_RATE` | `0.75`         | Probability of tracing a request in Sentry                         |
+| `sentry.sample_rate_heartbats` | `WAKAPI_SENTRY_SAMPLE_RATE_HEARTBEATS` | `0.1` | Probability of tracing a heartbeats request in Sentry         |
 
-## 💻 Client Setup
-Wakapi relies on the open-source [WakaTime](https://github.com/wakatime/wakatime) client tools. In order to collect statistics to Wakapi, you need to set them up.
+### Supported databases
+Wakapi uses [GORM](https://gorm.io) as an ORM. As a consequence, a set of different relational databases is supported.
+* [SQLite](https://sqlite.org/) (_default, easy setup_)
+* [MySQL](https://hub.docker.com/_/mysql) (_recommended, because most extensively tested_)
+* [MariaDB](https://hub.docker.com/_/mariadb) (_open-source MySQL alternative_)
+* [Postgres](https://hub.docker.com/_/postgres) (_open-source as well_)
+* [CockroachDB](https://www.cockroachlabs.com/docs/stable/install-cockroachdb-linux.html) (_cloud-native, distributed, Postgres-compatible API_)
 
-1. **Set up WakaTime** for your specific IDE or editor. Please refer to the respective [plugin guide](https://wakatime.com/plugins)
-2. Make your local WakaTime client talk to Wakapi by **editing your local `~/.wakatime.cfg`** file as follows
-
-```
-api_url = https://your.server:someport/api/heartbeat`
-api_key = the_api_key_printed_to_the_console_after_starting_the_server`
-```
-
-You can view your API Key after logging in to the web interface.
-
-## 🔵 Customization
-
-### Aliases
-There is an option to add aliases for project names, editors, operating systems and languages. For instance, if you want to map two projects – `myapp-frontend` and `myapp-backend` – two a common project name – `myapp-web` – in your statistics, you can add project aliases.
-
-At the moment, this can only be done via raw database queries. For the above example, you would need to add two aliases, like this:
-
-```sql
-INSERT INTO aliases (`type`, `user_id`, `key`, `value`) VALUES (0, 'your_username', 'myapp-web', 'myapp-frontend');
-```
-
-#### Types
-* Project ~  type **0**
-* Language ~  type **1**
-* Editor ~ type **2**
-* OS ~  type **3**
-* Machine ~  type **4**
+### Client-side proxy (`optional`)
+See the [advanced setup instructions](docs/advanced_setup.md).
 
 ## 🔧 API Endpoints
-The following API endpoints are available. A more detailed Swagger documentation is about to come ([#40](https://github.com/muety/wakapi/issues/40)).
+See our [Swagger API Documentation](https://wakapi.dev/swagger-ui).
 
-* `POST /api/heartbeat`
-* `GET /api/summary`
-  * `string` parameter `interval`: One of `today`, `day`, `week`, `month`, `year`, `any`
-* `GET /api/compat/wakatime/v1/users/current/all_time_since_today` (see [Wakatime API docs](https://wakatime.com/developers#all_time_since_today))
-* `GET /api/compat/wakatime/v1/users/current/summaries` (see [Wakatime API docs](https://wakatime.com/developers#summaries))
-* `GET /api/health`
+### Generating Swagger docs
+```bash
+$ go get -u github.com/swaggo/swag/cmd/swag
+$ swag init -o static/docs
+```
 
-## ⤴️ Prometheus Export
-If you want to export your Wakapi statistics to Prometheus to view them in a Grafana dashboard or so please refer to an excellent tool called **[wakatime_exporter](https://github.com/MacroPower/wakatime_exporter)**.
+## 🤝 Integrations
+### Prometheus Export
+You can export your Wakapi statistics to Prometheus to view them in a Grafana dashboard or so. Here is how.
 
-[![](https://github-readme-stats.vercel.app/api/pin/?username=MacroPower&repo=wakatime_exporter&show_owner=true)](https://github.com/MacroPower/wakatime_exporter)
+```bash
+# 1. Start Wakapi with the feature enabled
+$ export WAKAPI_EXPOSE_METRICS=true
+$ ./wakapi
 
-It is a standalone webserver that connects to your Wakapi instance and exposes the data as Prometheus metrics. Although originally developed to scrape data from WakaTime, it will mostly for with Wakapi as well, as the APIs are partially compatible.
+# 2. Get your API key and hash it
+$ echo "<YOUR_API_KEY>" | base64
 
-Simply configure the exporter with `WAKA_SCRAPE_URI` to equal `"https://wakapi.your-server.com/api/compat/wakatime/v1"` and set your API key accordingly.
+# 3. Add a Prometheus scrape config to your prometheus.yml (see below)
+```
 
-## 🏷 Badges
-We recently introduced support for [Shields.io](https://shields.io) badges (see above). Visit your Wakapi server's settings page to see details.
+#### Scrape config example
+```yml
+# prometheus.yml
+# (assuming your Wakapi instance listens at localhost, port 3000)
+
+scrape_configs:
+  - job_name: 'wakapi'
+    scrape_interval: 1m
+    metrics_path: '/api/metrics'
+    bearer_token: '<YOUR_BASE64_HASHED_TOKEN>'
+    static_configs:
+      - targets: ['localhost:3000']
+```
+
+#### Grafana 
+There is also a [nice Grafana dashboard](https://grafana.com/grafana/dashboards/12790), provided by the author of [wakatime_exporter](https://github.com/MacroPower/wakatime_exporter).
+
+![](https://grafana.com/api/dashboards/12790/images/8741/image)
+
+### WakaTime Integration
+Wakapi plays well together with [WakaTime](https://wakatime.com). For one thing, you can **forward heartbeats** from Wakapi to WakaTime to effectively use both services simultaneously. In addition, there is the option to **import historic data** from WakaTime for consistency between both services. Both features can be enabled in the _Integrations_ section of your Wakapi instance's settings page.     
+
+### GitHub Readme Stats Integrations
+Wakapi also integrates with [GitHub Readme Stats](https://github.com/anuraghazra/github-readme-stats#wakatime-week-stats) to generate fancy cards for you. Here is an example.
+
+![](https://github-readme-stats.vercel.app/api/wakatime?username=n1try&api_domain=wakapi.dev&bg_color=2D3748&title_color=2F855A&icon_color=2F855A&text_color=ffffff&custom_title=Wakapi%20Week%20Stats&layout=compact)
 
 ## 👍 Best Practices
 It is recommended to use wakapi behind a **reverse proxy**, like [Caddy](https://caddyserver.com) or _nginx_ to enable **TLS encryption** (HTTPS).
 However, if you want to expose your wakapi instance to the public anyway, you need to set `server.listen_ipv4` to `0.0.0.0` in `config.yml`
 
-## ⚠️ Important Note
-**This is not an alternative to using WakaTime.** It is just a custom, non-commercial, self-hosted application to collect coding statistics using the already existing editor plugins provided by the WakaTime community. It was created for personal use only and with the purpose of keeping the sovereignity of your own data. However, if you like the official product, **please support the authors and buy an official WakaTime subscription!**
+## 🤓 Developer Notes
+### Running tests
+```bash
+CGO_FLAGS="-g -O2 -Wno-return-local-addr" go test -json -coverprofile=coverage/coverage.out ./... -run ./...
+```
+
+### Building Tailwind
+To keep things minimal, Wakapi does not contain a `package.json`, `node_modules` or any sort of frontend build step. Instead, all JS and CSS assets are included as static files and checked in to Git. This way we can avoid requiring NodeJS to build Wakapi. However, for [TailwindCSS](https://tailwindcss.com/docs/installation#building-for-production) it makes sense to run it through a "build" step to benefit from purging and significantly reduce it in size. To only require this at the time of development, the compiled asset is checked in to Git as well. 
+
+```bash
+$ tailwindcss-cli build static/assets/vendor/tailwind.css -o static/assets/vendor/tailwind.dist.css
+```
+
+## 🙏 Support
+If you like this project, please consider supporting it 🙂. You can donate either through [buying me a coffee](https://buymeacoff.ee/n1try) or becoming a GitHub sponsor. Every little donation is highly appreciated and boosts the developers' motivation to keep improving Wakapi!
+
+## ❔ FAQs
+Since Wakapi heavily relies on the concepts provided by WakaTime, [their FAQs](https://wakatime.com/faq) apply to Wakapi for large parts as well. You might find answers there.
+
+<details>
+<summary><b>What data is sent to Wakapi?</b></summary>
+
+<ul>
+  <li>File names</li>
+  <li>Project names</li>
+  <li>Editor names</li>
+  <li>You computer's host name</li>
+  <li>Timestamps for every action you take in your editor</li>
+  <li>...</li>
+</ul>
+
+See the related [WakaTime FAQ section](https://wakatime.com/faq#data-collected) for details.
+
+If you host Wakapi yourself, you have control over all your data. However, if you use our webservice and are concerned about privacy, you can also [exclude or obfuscate](https://wakatime.com/faq#exclude-paths) certain file- or project names.  
+</details>
+
+<details>
+<summary><b>What happens if I'm offline?</b></summary>
+
+All data is cached locally on your machine and sent in batches once you're online again.
+</details>
+
+<details>
+<summary><b>How did Wakapi come about?</b></summary>
+
+Wakapi was started when I was a student, who wanted to track detailed statistics about my coding time. Although I'm a big fan of WakaTime I didn't want to pay <a href="https://wakatime.com/pricing)">9 $ a month</a> back then. Luckily, most parts of WakaTime are open source!  
+</details>
+
+<details>
+<summary><b>How does Wakapi compare to WakaTime?</b></summary>
+
+Wakapi is a small subset of WakaTime and has a lot less features. Cool WakaTime features, that are missing Wakapi, include:
+
+<ul>
+  <li>Leaderboards</li>
+  <li><a href="https://wakatime.com/share/embed">Embeddable Charts</a></li>
+  <li>Personal Goals</li>
+  <li>Team- / Organization Support</li>
+  <li>Integrations (with GitLab, etc.)</li>
+  <li>Richer API</li>
+</ul>
+
+WakaTime is worth the price. However, if you only want basic statistics and keep sovereignty over your data, you might want to go with Wakapi.
+</details>
+
+<details>
+<summary><b>How are durations calculated?</b></summary>
+
+Inferring a measure for your coding time from heartbeats works a bit different than in WakaTime. While WakaTime has <a href="https://wakatime.com/faq#timeout">timeout intervals</a>, Wakapi essentially just pads every heartbeat, that occurs after a longer pause, with 2 extra minutes.
+
+Here is an example (circles are heartbeats):
+
+```
+|---o---o--------------o---o---|
+|   |10s|      3m      |10s|   |
+
+```
+
+It is unclear how to handle the three minutes in between. Did the developer do a 3-minute break or were just no heartbeats being sent, e.g. because the developer was starring at the screen find a solution, but not actually typing code.
+
+<ul>
+  <li><b>WakaTime</b> (with 5 min timeout): 3 min 20 sec
+  <li><b>WakaTime</b> (with 2 min timeout): 20 sec
+  <li><b>Wakapi:</b> 10 sec + 2 min + 10 sec = 2 min 20 sec</li>
+</ul>
+
+Wakapi adds a "padding" of two minutes before the third heartbeat. This is why total times will slightly vary between Wakapi and WakaTime.
+</details>
+
+## 🙏 Thanks
+I highly appreciate the efforts of [@alanhamlett](https://github.com/alanhamlett) and the WakaTime team and am thankful for their software being open source. 
 
 ## 📓 License
 GPL-v3 @ [Ferdinand Mütsch](https://muetsch.io)

config.default.yml

@@ -1,15 +1,21 @@
 env: development
 
 server:
-  listen_ipv4: 127.0.0.1
+  listen_ipv4: 127.0.0.1            # leave blank to disable ipv4
+  listen_ipv6: ::1                  # leave blank to disable ipv6
+  tls_cert_path:                    # leave blank to not use https
+  tls_key_path:                     # leave blank to not use https
   port: 3000
   base_path: /
+  public_url: http://localhost:3000 # required for links (e.g. password reset) in e-mail
 
 app:
   aggregation_time: '02:15' # time at which to run daily aggregation batch jobs
+  inactive_days: 7          # time of previous days within a user must have logged in to be considered active
   custom_languages:
     vue: Vue
     jsx: JSX
+    svelte: Svelte
 
 db:
   host:                     # leave blank when using sqlite3
@@ -18,9 +24,34 @@ db:
   password:                 # leave blank when using sqlite3
   name: wakapi_db.db        # database name for mysql / postgres or file path for sqlite (e.g. /tmp/wakapi.db)
   dialect: sqlite3          # mysql, postgres, sqlite3
-  max_conn: 2
+  charset: utf8mb4          # only used for mysql connections
+  max_conn: 2               # maximum number of concurrent connections to maintain
+  ssl: false                # whether to use tls for db connection (must be true for cockroachdb) (ignored for mysql and sqlite)
 
 security:
   password_salt:            # CHANGE !
-  insecure_cookies: false
-  cookie_max_age: 172800
+  insecure_cookies: false   # You need to set this to 'true' when on localhost
+  cookie_max_age: 172800
+  allow_signup: true
+  expose_metrics: false
+
+sentry:
+  dsn:                        # leave blank to disable sentry integration
+  enable_tracing: true        # whether to use performance monitoring
+  sample_rate: 0.75           # probability of tracing a request
+  sample_rate_heartbeats: 0.1 # probability of tracing a heartbeat request
+
+mail:
+  enabled: true                         # whether to enable mails (used for password resets, reports, etc.)
+  provider: smtp                        # method for sending mails, currently one of ['smtp', 'mailwhale']
+  smtp:                                 # smtp settings when sending mails via smtp
+    host:
+    port:
+    username:
+    password:
+    tls:
+    sender: Wakapi <noreply@wakapi.dev>
+  mailwhale:                            # mailwhale.dev settings when using mailwhale as sending service
+    url:
+    client_id:
+    client_secret:

config/config.go

@@ -4,8 +4,11 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/getsentry/sentry-go"
 	"github.com/gorilla/securecookie"
 	"github.com/jinzhu/configor"
+	"github.com/markbates/pkger"
 	"github.com/muety/wakapi/models"
 	migrate "github.com/rubenv/sql-migrate"
 	"gorm.io/driver/mysql"
@@ -13,32 +16,64 @@ import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"os"
 	"strings"
 )
 
 const (
-	defaultConfigPath          = "config.yml"
-	defaultConfigPathLegacy    = "config.ini"
-	defaultEnvConfigPathLegacy = ".env"
+	defaultConfigPath = "config.yml"
 
 	SQLDialectMysql    = "mysql"
 	SQLDialectPostgres = "postgres"
 	SQLDialectSqlite   = "sqlite3"
+
+	KeyLatestTotalTime  = "latest_total_time"
+	KeyLatestTotalUsers = "latest_total_users"
+	KeyLastImportImport = "last_import"
+
+	SimpleDateFormat     = "2006-01-02"
+	SimpleDateTimeFormat = "2006-01-02 15:04:05"
+
+	ErrUnauthorized        = "401 unauthorized"
+	ErrInternalServerError = "500 internal server error"
 )
 
+const (
+	WakatimeApiUrl               = "https://wakatime.com/api/v1"
+	WakatimeApiUserUrl           = "/users/current"
+	WakatimeApiAllTimeUrl        = "/users/current/all_time_since_today"
+	WakatimeApiHeartbeatsUrl     = "/users/current/heartbeats"
+	WakatimeApiHeartbeatsBulkUrl = "/users/current/heartbeats.bulk"
+	WakatimeApiUserAgentsUrl     = "/users/current/user_agents"
+	WakatimeApiMachineNamesUrl   = "/users/current/machine_names"
+)
+
+const (
+	MailProviderSmtp      = "smtp"
+	MailProviderMailWhale = "mailwhale"
+)
+
+var emailProviders = []string{
+	MailProviderSmtp,
+	MailProviderMailWhale,
+}
+
 var cfg *Config
 var cFlag = flag.String("config", defaultConfigPath, "config file location")
 
 type appConfig struct {
-	AggregationTime string            `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
-	CustomLanguages map[string]string `yaml:"custom_languages"`
-	LanguageColors  map[string]string `yaml:"-"`
+	AggregationTime  string                       `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
+	ImportBackoffMin int                          `yaml:"import_backoff_min" default:"5" env:"WAKAPI_IMPORT_BACKOFF_MIN"`
+	ImportBatchSize  int                          `yaml:"import_batch_size" default:"100" env:"WAKAPI_IMPORT_BATCH_SIZE"`
+	InactiveDays     int                          `yaml:"inactive_days" default:"7" env:"WAKAPI_INACTIVE_DAYS"`
+	CustomLanguages  map[string]string            `yaml:"custom_languages"`
+	Colors           map[string]map[string]string `yaml:"-"`
 }
 
 type securityConfig struct {
+	AllowSignup   bool `yaml:"allow_signup" default:"true" env:"WAKAPI_ALLOW_SIGNUP"`
+	ExposeMetrics bool `yaml:"expose_metrics" default:"false" env:"WAKAPI_EXPOSE_METRICS"`
 	// this is actually a pepper (https://en.wikipedia.org/wiki/Pepper_(cryptography))
 	PasswordSalt    string                     `yaml:"password_salt" default:"" env:"WAKAPI_PASSWORD_SALT"`
 	InsecureCookies bool                       `yaml:"insecure_cookies" default:"false" env:"WAKAPI_INSECURE_COOKIES"`
@@ -52,14 +87,50 @@ type dbConfig struct {
 	User     string `env:"WAKAPI_DB_USER"`
 	Password string `env:"WAKAPI_DB_PASSWORD"`
 	Name     string `default:"wakapi_db.db" env:"WAKAPI_DB_NAME"`
-	Dialect  string `default:"sqlite3" env:"WAKAPI_DB_TYPE"`
+	Dialect  string `yaml:"-"`
+	Charset  string `default:"utf8mb4" env:"WAKAPI_DB_CHARSET"`
+	Type     string `yaml:"dialect" default:"sqlite3" env:"WAKAPI_DB_TYPE"`
 	MaxConn  uint   `yaml:"max_conn" default:"2" env:"WAKAPI_DB_MAX_CONNECTIONS"`
+	Ssl      bool   `default:"false" env:"WAKAPI_DB_SSL"`
 }
 
 type serverConfig struct {
-	Port       int    `default:"3000" env:"WAKAPI_PORT"`
-	ListenIpV4 string `yaml:"listen_ipv4" default:"127.0.0.1" env:"WAKAPI_LISTEN_IPV4"`
-	BasePath   string `yaml:"base_path" default:"/" env:"WAKAPI_BASE_PATH"`
+	Port        int    `default:"3000" env:"WAKAPI_PORT"`
+	ListenIpV4  string `yaml:"listen_ipv4" default:"127.0.0.1" env:"WAKAPI_LISTEN_IPV4"`
+	ListenIpV6  string `yaml:"listen_ipv6" default:"::1" env:"WAKAPI_LISTEN_IPV6"`
+	BasePath    string `yaml:"base_path" default:"/" env:"WAKAPI_BASE_PATH"`
+	PublicUrl   string `yaml:"public_url" default:"http://localhost:3000" env:"WAKAPI_PUBLIC_URL"`
+	TlsCertPath string `yaml:"tls_cert_path" default:"" env:"WAKAPI_TLS_CERT_PATH"`
+	TlsKeyPath  string `yaml:"tls_key_path" default:"" env:"WAKAPI_TLS_KEY_PATH"`
+}
+
+type sentryConfig struct {
+	Dsn                  string  `env:"WAKAPI_SENTRY_DSN"`
+	EnableTracing        bool    `yaml:"enable_tracing" env:"WAKAPI_SENTRY_TRACING"`
+	SampleRate           float32 `yaml:"sample_rate" default:"0.75" env:"WAKAPI_SENTRY_SAMPLE_RATE"`
+	SampleRateHeartbeats float32 `yaml:"sample_rate_heartbeats" default:"0.1" env:"WAKAPI_SENTRY_SAMPLE_RATE_HEARTBEATS"`
+}
+
+type mailConfig struct {
+	Enabled   bool                 `env:"WAKAPI_MAIL_ENABLED" default:"true"`
+	Provider  string               `env:"WAKAPI_MAIL_PROVIDER" default:"smtp"`
+	MailWhale *MailwhaleMailConfig `yaml:"mailwhale"`
+	Smtp      *SMTPMailConfig      `yaml:"smtp"`
+}
+
+type MailwhaleMailConfig struct {
+	Url          string `env:"WAKAPI_MAIL_MAILWHALE_URL"`
+	ClientId     string `yaml:"client_id" env:"WAKAPI_MAIL_MAILWHALE_CLIENT_ID"`
+	ClientSecret string `yaml:"client_secret" env:"WAKAPI_MAIL_MAILWHALE_CLIENT_SECRET"`
+}
+
+type SMTPMailConfig struct {
+	Host     string `env:"WAKAPI_MAIL_SMTP_HOST"`
+	Port     uint   `env:"WAKAPI_MAIL_SMTP_PORT"`
+	Username string `env:"WAKAPI_MAIL_SMTP_USER"`
+	Password string `env:"WAKAPI_MAIL_SMTP_PASS"`
+	TLS      bool   `env:"WAKAPI_MAIL_SMTP_TLS"`
+	Sender   string `env:"WAKAPI_MAIL_SMTP_SENDER"`
 }
 
 type Config struct {
@@ -69,6 +140,8 @@ type Config struct {
 	Security securityConfig
 	Db       dbConfig
 	Server   serverConfig
+	Sentry   sentryConfig
+	Mail     mailConfig
 }
 
 func (c *Config) CreateCookie(name, value, path string) *http.Cookie {
@@ -95,6 +168,10 @@ func (c *Config) IsDev() bool {
 	return IsDev(c.Env)
 }
 
+func (c *Config) UseTLS() bool {
+	return c.Server.TlsCertPath != "" && c.Server.TlsKeyPath != ""
+}
+
 func (c *Config) GetMigrationFunc(dbDialect string) models.MigrationFunc {
 	switch dbDialect {
 	default:
@@ -113,8 +190,8 @@ func (c *Config) GetMigrationFunc(dbDialect string) models.MigrationFunc {
 
 func (c *Config) GetFixturesFunc(dbDialect string) models.MigrationFunc {
 	return func(db *gorm.DB) error {
-		migrations := &migrate.FileMigrationSource{
-			Dir: "migrations/common/fixtures",
+		migrations := &migrate.HttpFileSystemMigrationSource{
+			FileSystem: pkger.Dir("/migrations"),
 		}
 
 		migrate.SetIgnoreUnknown(true)
@@ -124,7 +201,7 @@ func (c *Config) GetFixturesFunc(dbDialect string) models.MigrationFunc {
 			return err
 		}
 
-		log.Printf("applied %d fixtures\n", n)
+		logbuch.Info("applied %d fixtures", n)
 		return nil
 	}
 }
@@ -148,23 +225,30 @@ func (c *dbConfig) GetDialector() gorm.Dialector {
 
 func mysqlConnectionString(config *dbConfig) string {
 	//location, _ := time.LoadLocation("Local")
-	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
+	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=%s&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
 		config.User,
 		config.Password,
 		config.Host,
 		config.Port,
 		config.Name,
+		config.Charset,
 		"Local",
 	)
 }
 
 func postgresConnectionString(config *dbConfig) string {
-	return fmt.Sprintf("host=%s port=%d user=%s dbname=%s password=%s sslmode=disable",
+	sslmode := "disable"
+	if config.Ssl {
+		sslmode = "require"
+	}
+
+	return fmt.Sprintf("host=%s port=%d user=%s dbname=%s password=%s sslmode=%s",
 		config.Host,
 		config.Port,
 		config.User,
 		config.Name,
 		config.Password,
+		sslmode,
 	)
 }
 
@@ -172,45 +256,72 @@ func sqliteConnectionString(config *dbConfig) string {
 	return config.Name
 }
 
+func (c *appConfig) GetCustomLanguages() map[string]string {
+	return cloneStringMap(c.CustomLanguages, false)
+}
+
+func (c *appConfig) GetLanguageColors() map[string]string {
+	return cloneStringMap(c.Colors["languages"], true)
+}
+
+func (c *appConfig) GetEditorColors() map[string]string {
+	return cloneStringMap(c.Colors["editors"], true)
+}
+
+func (c *appConfig) GetOSColors() map[string]string {
+	return cloneStringMap(c.Colors["operating_systems"], true)
+}
+
+func (c *serverConfig) GetPublicUrl() string {
+	return strings.TrimSuffix(c.PublicUrl, "/")
+}
+
+func (c *SMTPMailConfig) ConnStr() string {
+	return fmt.Sprintf("%s:%d", c.Host, c.Port)
+}
+
 func IsDev(env string) bool {
 	return env == "dev" || env == "development"
 }
 
 func readVersion() string {
-	file, err := os.Open("version.txt")
+	file, err := pkger.Open("/version.txt")
 	if err != nil {
-		log.Fatal(err)
+		logbuch.Fatal(err.Error())
 	}
 	defer file.Close()
 
 	bytes, err := ioutil.ReadAll(file)
 	if err != nil {
-		log.Fatal(err)
+		logbuch.Fatal(err.Error())
 	}
 
-	return string(bytes)
+	return strings.TrimSpace(string(bytes))
 }
 
-func readLanguageColors() map[string]string {
+func readColors() map[string]map[string]string {
 	// Read language colors
-	// Source: https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
-	var colors = make(map[string]string)
-	var rawColors map[string]struct {
-		Color string `json:"color"`
-		Url   string `json:"url"`
-	}
+	// Source:
+	// – https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
+	// – https://wakatime.com/colors/operating_systems
+	// - https://wakatime.com/colors/editors
+	// Extracted from Wakatime website with XPath (see below) and did a bit of regex magic after.
+	// – $x('//span[@class="editor-icon tip"]/@data-original-title').map(e => e.nodeValue)
+	// – $x('//span[@class="editor-icon tip"]/div[1]/text()').map(e => e.nodeValue)
+	var colors = make(map[string]map[string]string)
 
-	data, err := ioutil.ReadFile("data/colors.json")
+	file, err := pkger.Open("/data/colors.json")
 	if err != nil {
-		log.Fatal(err)
+		logbuch.Fatal(err.Error())
+	}
+	defer file.Close()
+	bytes, err := ioutil.ReadAll(file)
+	if err != nil {
+		logbuch.Fatal(err.Error())
 	}
 
-	if err := json.Unmarshal(data, &rawColors); err != nil {
-		log.Fatal(err)
-	}
-
-	for k, v := range rawColors {
-		colors[strings.ToLower(k)] = v.Color
+	if err := json.Unmarshal(bytes, &colors); err != nil {
+		logbuch.Fatal(err.Error())
 	}
 
 	return colors
@@ -218,12 +329,65 @@ func readLanguageColors() map[string]string {
 
 func mustReadConfigLocation() string {
 	if _, err := os.Stat(*cFlag); err != nil {
-		log.Fatalf("failed to find config file at '%s'\n", *cFlag)
+		logbuch.Fatal("failed to find config file at '%s'", *cFlag)
 	}
-
 	return *cFlag
 }
 
+func resolveDbDialect(dbType string) string {
+	if dbType == "cockroach" {
+		return "postgres"
+	}
+	return dbType
+}
+
+func initSentry(config sentryConfig, debug bool) {
+	if err := sentry.Init(sentry.ClientOptions{
+		Dsn:   config.Dsn,
+		Debug: debug,
+		TracesSampler: sentry.TracesSamplerFunc(func(ctx sentry.SamplingContext) sentry.Sampled {
+			if !config.EnableTracing {
+				return sentry.SampledFalse
+			}
+
+			hub := sentry.GetHubFromContext(ctx.Span.Context())
+			txName := hub.Scope().Transaction()
+
+			if strings.HasPrefix(txName, "GET /assets") || strings.HasPrefix(txName, "GET /api/health") {
+				return sentry.SampledFalse
+			}
+			if txName == "POST /api/heartbeat" {
+				return sentry.UniformTracesSampler(config.SampleRateHeartbeats).Sample(ctx)
+			}
+			return sentry.UniformTracesSampler(config.SampleRate).Sample(ctx)
+		}),
+		BeforeSend: func(event *sentry.Event, hint *sentry.EventHint) *sentry.Event {
+			type principalGetter interface {
+				GetPrincipal() *models.User
+			}
+			if hint.Context != nil {
+				if req, ok := hint.Context.Value(sentry.RequestContextKey).(*http.Request); ok {
+					if p := req.Context().Value("principal"); p != nil {
+						event.User.ID = p.(principalGetter).GetPrincipal().ID
+					}
+				}
+			}
+			return event
+		},
+	}); err != nil {
+		logbuch.Fatal("failed to initialized sentry – %v", err)
+	}
+}
+
+func findString(needle string, haystack []string, defaultVal string) string {
+	for _, s := range haystack {
+		if s == needle {
+			return s
+		}
+	}
+	return defaultVal
+}
+
 func Set(config *Config) {
 	cfg = config
 }
@@ -237,14 +401,13 @@ func Load() *Config {
 
 	flag.Parse()
 
-	maybeMigrateLegacyConfig()
-
 	if err := configor.New(&configor.Config{}).Load(config, mustReadConfigLocation()); err != nil {
-		log.Fatalf("failed to read config: %v\n", err)
+		logbuch.Fatal("failed to read config: %v", err)
 	}
 
 	config.Version = readVersion()
-	config.App.LanguageColors = readLanguageColors()
+	config.App.Colors = readColors()
+	config.Db.Dialect = resolveDbDialect(config.Db.Type)
 	config.Security.SecureCookie = securecookie.New(
 		securecookie.GenerateRandomKey(64),
 		securecookie.GenerateRandomKey(32),
@@ -260,6 +423,23 @@ func Load() *Config {
 		}
 	}
 
+	if config.Server.ListenIpV4 == "" && config.Server.ListenIpV6 == "" {
+		logbuch.Fatal("either of listen_ipv4 or listen_ipv6 must be set")
+	}
+
+	if config.Db.MaxConn <= 0 {
+		logbuch.Fatal("you must allow at least one database connection")
+	}
+
+	if config.Sentry.Dsn != "" {
+		logbuch.Info("enabling sentry integration")
+		initSentry(config.Sentry, config.IsDev())
+	}
+
+	if config.Mail.Provider != "" && findString(config.Mail.Provider, emailProviders, "") == "" {
+		logbuch.Fatal("unknown mail provider '%s'", config.Mail.Provider)
+	}
+
 	Set(config)
 	return Get()
 }

config/config_test.go

@@ -22,11 +22,12 @@ func Test_mysqlConnectionString(t *testing.T) {
 		Password: "test_password",
 		Name:     "test_name",
 		Dialect:  "mysql",
+		Charset:  "utf8mb4",
 		MaxConn:  10,
 	}
 
 	assert.Equal(t, fmt.Sprintf(
-		"%s:%s@tcp(%s:%d)/%s?charset=utf8&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
+		"%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
 		c.User,
 		c.Password,
 		c.Host,

config/legacy.go

@@ -1,124 +0,0 @@
-package config
-
-import (
-	"github.com/joho/godotenv"
-	"gopkg.in/ini.v1"
-	"gopkg.in/yaml.v2"
-	"io/ioutil"
-	"log"
-	"os"
-	"strconv"
-)
-
-func maybeMigrateLegacyConfig() {
-	if yes, err := shouldMigrateLegacyConfig(); err != nil {
-		log.Fatalf("failed to determine whether to migrate legacy config: %v\n", err)
-	} else if yes {
-		log.Printf("migrating legacy config (%s, %s) to new format (%s); see https://github.com/muety/wakapi/issues/54\n", defaultConfigPathLegacy, defaultEnvConfigPathLegacy, defaultConfigPath)
-		if err := migrateLegacyConfig(); err != nil {
-			log.Fatalf("failed to migrate legacy config: %v\n", err)
-		}
-		log.Printf("config migration successful; please delete %s and %s now\n", defaultConfigPathLegacy, defaultEnvConfigPathLegacy)
-	}
-}
-
-func shouldMigrateLegacyConfig() (bool, error) {
-	if _, err := os.Stat(defaultConfigPath); err == nil {
-		return false, nil
-	} else if !os.IsNotExist(err) {
-		return true, err
-	}
-	return true, nil
-}
-
-func migrateLegacyConfig() error {
-	// step 1: read envVars file parameters
-	envFile, err := os.Open(defaultEnvConfigPathLegacy)
-	if err != nil {
-		return err
-	}
-	envVars, err := godotenv.Parse(envFile)
-	if err != nil {
-		return err
-	}
-
-	env := envVars["ENV"]
-	dbType := envVars["WAKAPI_DB_TYPE"]
-	dbUser := envVars["WAKAPI_DB_USER"]
-	dbPassword := envVars["WAKAPI_DB_PASSWORD"]
-	dbHost := envVars["WAKAPI_DB_HOST"]
-	dbName := envVars["WAKAPI_DB_NAME"]
-	dbPortStr := envVars["WAKAPI_DB_PORT"]
-	passwordSalt := envVars["WAKAPI_PASSWORD_SALT"]
-	dbPort, _ := strconv.Atoi(dbPortStr)
-
-	// step 2: read ini file
-	cfg, err := ini.Load(defaultConfigPathLegacy)
-	if err != nil {
-		return err
-	}
-
-	if dbType == "" {
-		dbType = SQLDialectSqlite
-	}
-
-	dbMaxConn := cfg.Section("database").Key("max_connections").MustUint(2)
-	addr := cfg.Section("server").Key("listen").MustString("127.0.0.1")
-	insecureCookies := cfg.Section("server").Key("insecure_cookies").MustBool(false)
-	port, err := strconv.Atoi(os.Getenv("PORT"))
-	if err != nil {
-		port = cfg.Section("server").Key("port").MustInt()
-	}
-
-	basePathEnv, basePathEnvExists := os.LookupEnv("WAKAPI_BASE_PATH")
-	basePath := cfg.Section("server").Key("base_path").MustString("/")
-	if basePathEnvExists {
-		basePath = basePathEnv
-	}
-
-	// Read custom languages
-	customLangs := make(map[string]string)
-	languageKeys := cfg.Section("languages").Keys()
-	for _, k := range languageKeys {
-		customLangs[k.Name()] = k.MustString("unknown")
-	}
-
-	// step 3: instantiate config
-	config := &Config{
-		Env: env,
-		App: appConfig{
-			CustomLanguages: customLangs,
-		},
-		Security: securityConfig{
-			PasswordSalt:    passwordSalt,
-			InsecureCookies: insecureCookies,
-		},
-		Db: dbConfig{
-			Host:     dbHost,
-			Port:     uint(dbPort),
-			User:     dbUser,
-			Password: dbPassword,
-			Name:     dbName,
-			Dialect:  dbType,
-			MaxConn:  dbMaxConn,
-		},
-		Server: serverConfig{
-			Port:       port,
-			ListenIpV4: addr,
-			BasePath:   basePath,
-		},
-	}
-
-	// step 4: serialize to yaml
-	yamlConfig, err := yaml.Marshal(config)
-	if err != nil {
-		return err
-	}
-
-	// step 5: write file
-	if err := ioutil.WriteFile(defaultConfigPath, yamlConfig, 0600); err != nil {
-		return err
-	}
-
-	return nil
-}

config/templates.go

@@ -1,10 +1,12 @@
 package config
 
 const (
-	IndexTemplate    = "index.tpl.html"
-	LoginTemplate    = "login.tpl.html"
-	ImprintTemplate  = "imprint.tpl.html"
-	SignupTemplate   = "signup.tpl.html"
-	SettingsTemplate = "settings.tpl.html"
-	SummaryTemplate  = "summary.tpl.html"
+	IndexTemplate         = "index.tpl.html"
+	LoginTemplate         = "login.tpl.html"
+	ImprintTemplate       = "imprint.tpl.html"
+	SignupTemplate        = "signup.tpl.html"
+	SetPasswordTemplate   = "set-password.tpl.html"
+	ResetPasswordTemplate = "reset-password.tpl.html"
+	SettingsTemplate      = "settings.tpl.html"
+	SummaryTemplate       = "summary.tpl.html"
 )

config/utils.go

@@ -0,0 +1,14 @@
+package config
+
+import "strings"
+
+func cloneStringMap(m map[string]string, keysToLower bool) map[string]string {
+	m2 := make(map[string]string)
+	for k, v := range m {
+		if keysToLower {
+			k = strings.ToLower(k)
+		}
+		m2[k] = v
+	}
+	return m2
+}

coverage/coverage.out

@@ -1,41 +1,16 @@
 mode: set
-github.com/muety/wakapi/models/filters.go:16.56,17.16 1 0
-github.com/muety/wakapi/models/filters.go:29.2,29.19 1 0
-github.com/muety/wakapi/models/filters.go:18.22,19.32 1 0
-github.com/muety/wakapi/models/filters.go:20.17,21.27 1 0
-github.com/muety/wakapi/models/filters.go:22.23,23.33 1 0
-github.com/muety/wakapi/models/filters.go:24.21,25.31 1 0
-github.com/muety/wakapi/models/filters.go:26.22,27.32 1 0
-github.com/muety/wakapi/models/filters.go:32.49,33.21 1 0
-github.com/muety/wakapi/models/filters.go:44.2,44.21 1 0
-github.com/muety/wakapi/models/filters.go:33.21,35.3 1 0
-github.com/muety/wakapi/models/filters.go:35.8,35.23 1 0
-github.com/muety/wakapi/models/filters.go:35.23,37.3 1 0
-github.com/muety/wakapi/models/filters.go:37.8,37.29 1 0
-github.com/muety/wakapi/models/filters.go:37.29,39.3 1 0
-github.com/muety/wakapi/models/filters.go:39.8,39.27 1 0
-github.com/muety/wakapi/models/filters.go:39.27,41.3 1 0
-github.com/muety/wakapi/models/filters.go:41.8,41.28 1 0
-github.com/muety/wakapi/models/filters.go:41.28,43.3 1 0
-github.com/muety/wakapi/models/filters.go:47.42,50.21 2 1
-github.com/muety/wakapi/models/filters.go:53.2,53.20 1 1
-github.com/muety/wakapi/models/filters.go:56.2,56.22 1 1
-github.com/muety/wakapi/models/filters.go:59.2,59.21 1 1
-github.com/muety/wakapi/models/filters.go:62.2,62.16 1 1
-github.com/muety/wakapi/models/filters.go:66.2,66.12 1 1
-github.com/muety/wakapi/models/filters.go:50.21,52.3 1 1
-github.com/muety/wakapi/models/filters.go:53.20,55.3 1 0
-github.com/muety/wakapi/models/filters.go:56.22,58.3 1 1
-github.com/muety/wakapi/models/filters.go:59.21,61.3 1 0
-github.com/muety/wakapi/models/filters.go:62.16,64.3 1 0
-github.com/muety/wakapi/models/heartbeat.go:26.34,28.2 1 1
-github.com/muety/wakapi/models/heartbeat.go:30.65,31.28 1 1
-github.com/muety/wakapi/models/heartbeat.go:34.2,35.45 2 1
-github.com/muety/wakapi/models/heartbeat.go:38.2,39.44 2 1
-github.com/muety/wakapi/models/heartbeat.go:42.2,42.42 1 1
-github.com/muety/wakapi/models/heartbeat.go:31.28,33.3 1 1
-github.com/muety/wakapi/models/heartbeat.go:35.45,37.3 1 0
-github.com/muety/wakapi/models/heartbeat.go:39.44,41.3 1 0
+github.com/muety/wakapi/models/user.go:13.13,15.2 1 1
+github.com/muety/wakapi/models/user.go:78.43,81.2 1 0
+github.com/muety/wakapi/models/user.go:83.45,86.2 1 0
+github.com/muety/wakapi/models/user.go:88.33,93.2 1 0
+github.com/muety/wakapi/models/user.go:95.41,97.2 1 0
+github.com/muety/wakapi/models/user.go:99.45,101.2 1 0
+github.com/muety/wakapi/models/user.go:103.45,105.2 1 0
+github.com/muety/wakapi/models/user.go:107.39,109.2 1 0
+github.com/muety/wakapi/models/heartbeat.go:32.34,34.2 1 1
+github.com/muety/wakapi/models/heartbeat.go:36.65,37.46 1 1
+github.com/muety/wakapi/models/heartbeat.go:37.46,38.46 1 1
+github.com/muety/wakapi/models/heartbeat.go:38.46,41.4 2 1
 github.com/muety/wakapi/models/heartbeat.go:45.50,46.11 1 1
 github.com/muety/wakapi/models/heartbeat.go:59.2,59.15 1 1
 github.com/muety/wakapi/models/heartbeat.go:63.2,63.12 1 1
@@ -45,61 +20,10 @@ github.com/muety/wakapi/models/heartbeat.go:51.23,52.19 1 1
 github.com/muety/wakapi/models/heartbeat.go:53.17,54.26 1 1
 github.com/muety/wakapi/models/heartbeat.go:55.22,56.18 1 1
 github.com/muety/wakapi/models/heartbeat.go:59.15,61.3 1 1
-github.com/muety/wakapi/models/models.go:3.14,5.2 0 1
-github.com/muety/wakapi/models/summary.go:29.27,33.2 1 0
-github.com/muety/wakapi/models/summary.go:83.29,85.2 1 1
-github.com/muety/wakapi/models/summary.go:87.37,94.2 6 0
-github.com/muety/wakapi/models/summary.go:96.35,98.2 1 1
-github.com/muety/wakapi/models/summary.go:100.57,108.2 1 1
-github.com/muety/wakapi/models/summary.go:121.33,126.26 4 1
-github.com/muety/wakapi/models/summary.go:133.2,133.37 1 1
-github.com/muety/wakapi/models/summary.go:137.2,140.33 2 1
-github.com/muety/wakapi/models/summary.go:126.26,127.30 1 1
-github.com/muety/wakapi/models/summary.go:127.30,129.4 1 1
-github.com/muety/wakapi/models/summary.go:133.37,135.3 1 0
-github.com/muety/wakapi/models/summary.go:140.33,146.3 1 1
-github.com/muety/wakapi/models/summary.go:149.45,154.30 3 1
-github.com/muety/wakapi/models/summary.go:163.2,163.30 1 1
-github.com/muety/wakapi/models/summary.go:154.30,155.47 1 1
-github.com/muety/wakapi/models/summary.go:155.47,156.32 1 1
-github.com/muety/wakapi/models/summary.go:159.4,159.9 1 1
-github.com/muety/wakapi/models/summary.go:156.32,158.5 1 1
-github.com/muety/wakapi/models/summary.go:166.73,168.55 2 1
-github.com/muety/wakapi/models/summary.go:173.2,173.16 1 1
-github.com/muety/wakapi/models/summary.go:168.55,169.31 1 1
-github.com/muety/wakapi/models/summary.go:169.31,171.4 1 1
-github.com/muety/wakapi/models/summary.go:176.88,178.55 2 1
-github.com/muety/wakapi/models/summary.go:186.2,186.16 1 1
-github.com/muety/wakapi/models/summary.go:178.55,179.31 1 1
-github.com/muety/wakapi/models/summary.go:179.31,180.23 1 1
-github.com/muety/wakapi/models/summary.go:183.4,183.46 1 1
-github.com/muety/wakapi/models/summary.go:180.23,181.13 1 1
-github.com/muety/wakapi/models/summary.go:189.79,190.33 1 1
-github.com/muety/wakapi/models/summary.go:193.2,193.16 1 1
-github.com/muety/wakapi/models/summary.go:190.33,192.3 1 1
-github.com/muety/wakapi/models/summary.go:196.71,197.63 1 1
-github.com/muety/wakapi/models/summary.go:237.2,243.10 6 1
-github.com/muety/wakapi/models/summary.go:197.63,200.45 2 1
-github.com/muety/wakapi/models/summary.go:209.3,209.31 1 1
-github.com/muety/wakapi/models/summary.go:216.3,216.31 1 1
-github.com/muety/wakapi/models/summary.go:233.3,233.16 1 1
-github.com/muety/wakapi/models/summary.go:200.45,201.32 1 1
-github.com/muety/wakapi/models/summary.go:206.4,206.14 1 1
-github.com/muety/wakapi/models/summary.go:201.32,202.24 1 1
-github.com/muety/wakapi/models/summary.go:202.24,204.6 1 1
-github.com/muety/wakapi/models/summary.go:209.31,211.60 1 1
-github.com/muety/wakapi/models/summary.go:211.60,213.5 1 1
-github.com/muety/wakapi/models/summary.go:216.31,218.60 1 1
-github.com/muety/wakapi/models/summary.go:218.60,219.55 1 1
-github.com/muety/wakapi/models/summary.go:219.55,221.6 1 1
-github.com/muety/wakapi/models/summary.go:221.11,229.6 1 1
-github.com/muety/wakapi/models/summary.go:246.33,248.2 1 0
-github.com/muety/wakapi/models/summary.go:250.43,252.2 1 0
-github.com/muety/wakapi/models/summary.go:254.38,256.2 1 0
-github.com/muety/wakapi/models/user.go:34.43,37.2 1 0
-github.com/muety/wakapi/models/user.go:39.33,43.2 1 0
-github.com/muety/wakapi/models/user.go:45.45,47.2 1 0
-github.com/muety/wakapi/models/user.go:49.45,51.2 1 0
+github.com/muety/wakapi/models/heartbeat.go:66.37,82.2 1 0
+github.com/muety/wakapi/models/heartbeat.go:90.41,92.16 2 0
+github.com/muety/wakapi/models/heartbeat.go:95.2,96.10 2 0
+github.com/muety/wakapi/models/heartbeat.go:92.16,94.3 1 0
 github.com/muety/wakapi/models/heartbeats.go:7.31,9.2 1 0
 github.com/muety/wakapi/models/heartbeats.go:11.41,13.2 1 0
 github.com/muety/wakapi/models/heartbeats.go:15.36,17.2 1 0
@@ -110,29 +34,217 @@ github.com/muety/wakapi/models/heartbeats.go:26.18,28.3 1 0
 github.com/muety/wakapi/models/heartbeats.go:32.40,34.18 1 0
 github.com/muety/wakapi/models/heartbeats.go:37.2,37.24 1 0
 github.com/muety/wakapi/models/heartbeats.go:34.18,36.3 1 0
+github.com/muety/wakapi/models/shared.go:35.52,37.2 1 0
+github.com/muety/wakapi/models/shared.go:39.52,42.16 3 0
+github.com/muety/wakapi/models/shared.go:45.2,47.12 3 0
+github.com/muety/wakapi/models/shared.go:42.16,44.3 1 0
+github.com/muety/wakapi/models/shared.go:51.52,57.22 2 0
+github.com/muety/wakapi/models/shared.go:73.2,76.12 3 0
+github.com/muety/wakapi/models/shared.go:58.14,60.17 2 0
+github.com/muety/wakapi/models/shared.go:63.13,65.8 2 0
+github.com/muety/wakapi/models/shared.go:66.17,68.8 2 0
+github.com/muety/wakapi/models/shared.go:69.10,70.64 1 0
+github.com/muety/wakapi/models/shared.go:60.17,62.4 1 0
+github.com/muety/wakapi/models/shared.go:79.45,81.2 1 0
+github.com/muety/wakapi/models/shared.go:83.51,86.2 2 0
+github.com/muety/wakapi/models/shared.go:88.37,91.2 2 0
+github.com/muety/wakapi/models/shared.go:93.35,95.2 1 0
+github.com/muety/wakapi/models/shared.go:97.34,99.2 1 0
+github.com/muety/wakapi/models/summary.go:69.29,71.2 1 1
+github.com/muety/wakapi/models/summary.go:73.37,80.2 6 1
+github.com/muety/wakapi/models/summary.go:82.35,84.2 1 1
+github.com/muety/wakapi/models/summary.go:86.57,94.2 1 1
+github.com/muety/wakapi/models/summary.go:96.64,98.2 1 0
+github.com/muety/wakapi/models/summary.go:111.33,116.26 4 1
+github.com/muety/wakapi/models/summary.go:123.2,123.37 1 1
+github.com/muety/wakapi/models/summary.go:127.2,130.33 2 1
+github.com/muety/wakapi/models/summary.go:116.26,117.30 1 1
+github.com/muety/wakapi/models/summary.go:117.30,119.4 1 1
+github.com/muety/wakapi/models/summary.go:123.37,125.3 1 0
+github.com/muety/wakapi/models/summary.go:130.33,136.3 1 1
+github.com/muety/wakapi/models/summary.go:139.45,144.30 3 1
+github.com/muety/wakapi/models/summary.go:153.2,153.30 1 1
+github.com/muety/wakapi/models/summary.go:144.30,145.47 1 1
+github.com/muety/wakapi/models/summary.go:145.47,146.32 1 1
+github.com/muety/wakapi/models/summary.go:149.4,149.9 1 1
+github.com/muety/wakapi/models/summary.go:146.32,148.5 1 1
+github.com/muety/wakapi/models/summary.go:156.73,158.55 2 1
+github.com/muety/wakapi/models/summary.go:163.2,163.16 1 1
+github.com/muety/wakapi/models/summary.go:158.55,159.31 1 1
+github.com/muety/wakapi/models/summary.go:159.31,161.4 1 1
+github.com/muety/wakapi/models/summary.go:166.88,168.55 2 1
+github.com/muety/wakapi/models/summary.go:176.2,176.16 1 1
+github.com/muety/wakapi/models/summary.go:168.55,169.31 1 1
+github.com/muety/wakapi/models/summary.go:169.31,170.23 1 1
+github.com/muety/wakapi/models/summary.go:173.4,173.46 1 1
+github.com/muety/wakapi/models/summary.go:170.23,171.13 1 1
+github.com/muety/wakapi/models/summary.go:179.70,181.8 2 1
+github.com/muety/wakapi/models/summary.go:184.2,184.10 1 1
+github.com/muety/wakapi/models/summary.go:181.8,183.3 1 1
+github.com/muety/wakapi/models/summary.go:187.71,188.63 1 1
+github.com/muety/wakapi/models/summary.go:228.2,234.10 6 1
+github.com/muety/wakapi/models/summary.go:188.63,191.45 2 1
+github.com/muety/wakapi/models/summary.go:200.3,200.31 1 1
+github.com/muety/wakapi/models/summary.go:207.3,207.31 1 1
+github.com/muety/wakapi/models/summary.go:224.3,224.16 1 1
+github.com/muety/wakapi/models/summary.go:191.45,192.32 1 1
+github.com/muety/wakapi/models/summary.go:197.4,197.14 1 1
+github.com/muety/wakapi/models/summary.go:192.32,193.24 1 1
+github.com/muety/wakapi/models/summary.go:193.24,195.6 1 1
+github.com/muety/wakapi/models/summary.go:200.31,202.60 1 1
+github.com/muety/wakapi/models/summary.go:202.60,204.5 1 1
+github.com/muety/wakapi/models/summary.go:207.31,209.60 1 1
+github.com/muety/wakapi/models/summary.go:209.60,210.55 1 1
+github.com/muety/wakapi/models/summary.go:210.55,212.6 1 1
+github.com/muety/wakapi/models/summary.go:212.11,220.6 1 1
+github.com/muety/wakapi/models/summary.go:237.33,239.2 1 1
+github.com/muety/wakapi/models/summary.go:241.43,243.2 1 1
+github.com/muety/wakapi/models/summary.go:245.38,247.2 1 1
+github.com/muety/wakapi/models/models.go:3.14,5.2 0 1
+github.com/muety/wakapi/models/alias.go:12.32,14.2 1 0
+github.com/muety/wakapi/models/alias.go:16.37,17.35 1 0
+github.com/muety/wakapi/models/alias.go:22.2,22.14 1 0
+github.com/muety/wakapi/models/alias.go:17.35,18.18 1 0
+github.com/muety/wakapi/models/alias.go:18.18,20.4 1 0
+github.com/muety/wakapi/models/filters.go:16.56,17.16 1 0
+github.com/muety/wakapi/models/filters.go:29.2,29.19 1 0
+github.com/muety/wakapi/models/filters.go:18.22,19.32 1 0
+github.com/muety/wakapi/models/filters.go:20.17,21.27 1 0
+github.com/muety/wakapi/models/filters.go:22.23,23.33 1 0
+github.com/muety/wakapi/models/filters.go:24.21,25.31 1 0
+github.com/muety/wakapi/models/filters.go:26.22,27.32 1 0
+github.com/muety/wakapi/models/filters.go:32.47,33.21 1 1
+github.com/muety/wakapi/models/filters.go:44.2,44.21 1 1
+github.com/muety/wakapi/models/filters.go:33.21,35.3 1 1
+github.com/muety/wakapi/models/filters.go:35.8,35.23 1 1
+github.com/muety/wakapi/models/filters.go:35.23,37.3 1 0
+github.com/muety/wakapi/models/filters.go:37.8,37.29 1 1
+github.com/muety/wakapi/models/filters.go:37.29,39.3 1 1
+github.com/muety/wakapi/models/filters.go:39.8,39.27 1 1
+github.com/muety/wakapi/models/filters.go:39.27,41.3 1 0
+github.com/muety/wakapi/models/filters.go:41.8,41.28 1 1
+github.com/muety/wakapi/models/filters.go:41.28,43.3 1 0
+github.com/muety/wakapi/models/interval.go:39.47,40.23 1 0
+github.com/muety/wakapi/models/interval.go:45.2,45.14 1 0
+github.com/muety/wakapi/models/interval.go:40.23,41.13 1 0
+github.com/muety/wakapi/models/interval.go:41.13,43.4 1 0
 github.com/muety/wakapi/models/language_mapping.go:11.42,13.2 1 0
 github.com/muety/wakapi/models/language_mapping.go:15.51,17.2 1 0
 github.com/muety/wakapi/models/language_mapping.go:19.52,21.2 1 0
-github.com/muety/wakapi/models/shared.go:34.52,37.16 3 0
-github.com/muety/wakapi/models/shared.go:40.2,42.12 3 0
-github.com/muety/wakapi/models/shared.go:37.16,39.3 1 0
-github.com/muety/wakapi/models/shared.go:46.52,52.22 2 0
-github.com/muety/wakapi/models/shared.go:68.2,71.12 3 0
-github.com/muety/wakapi/models/shared.go:53.14,55.17 2 0
-github.com/muety/wakapi/models/shared.go:58.13,60.8 2 0
-github.com/muety/wakapi/models/shared.go:61.17,63.8 2 0
-github.com/muety/wakapi/models/shared.go:64.10,65.64 1 0
-github.com/muety/wakapi/models/shared.go:55.17,57.4 1 0
-github.com/muety/wakapi/models/shared.go:74.51,77.2 2 0
-github.com/muety/wakapi/models/shared.go:79.37,82.2 2 0
-github.com/muety/wakapi/models/shared.go:84.35,86.2 1 0
-github.com/muety/wakapi/models/shared.go:88.34,90.2 1 0
-github.com/muety/wakapi/utils/common.go:9.48,11.2 1 0
-github.com/muety/wakapi/utils/common.go:13.40,15.2 1 0
-github.com/muety/wakapi/utils/common.go:17.45,19.2 1 0
-github.com/muety/wakapi/utils/common.go:21.56,24.45 3 1
-github.com/muety/wakapi/utils/common.go:27.2,27.40 1 1
-github.com/muety/wakapi/utils/common.go:24.45,26.3 1 1
+github.com/muety/wakapi/config/config.go:134.70,136.2 1 0
+github.com/muety/wakapi/config/config.go:138.65,140.2 1 0
+github.com/muety/wakapi/config/config.go:142.82,152.2 1 0
+github.com/muety/wakapi/config/config.go:154.31,156.2 1 0
+github.com/muety/wakapi/config/config.go:158.32,160.2 1 0
+github.com/muety/wakapi/config/config.go:162.74,163.19 1 0
+github.com/muety/wakapi/config/config.go:164.10,165.34 1 0
+github.com/muety/wakapi/config/config.go:165.34,174.4 8 0
+github.com/muety/wakapi/config/config.go:178.73,179.33 1 0
+github.com/muety/wakapi/config/config.go:179.33,187.17 5 0
+github.com/muety/wakapi/config/config.go:191.3,192.13 2 0
+github.com/muety/wakapi/config/config.go:187.17,189.4 1 0
+github.com/muety/wakapi/config/config.go:196.50,197.19 1 0
+github.com/muety/wakapi/config/config.go:210.2,210.12 1 0
+github.com/muety/wakapi/config/config.go:198.23,202.5 1 0
+github.com/muety/wakapi/config/config.go:203.26,206.5 1 0
+github.com/muety/wakapi/config/config.go:207.24,208.48 1 0
+github.com/muety/wakapi/config/config.go:213.53,224.2 1 1
+github.com/muety/wakapi/config/config.go:226.56,228.16 2 1
+github.com/muety/wakapi/config/config.go:232.2,239.3 1 1
+github.com/muety/wakapi/config/config.go:228.16,230.3 1 0
+github.com/muety/wakapi/config/config.go:242.54,244.2 1 1
+github.com/muety/wakapi/config/config.go:246.60,248.2 1 0
+github.com/muety/wakapi/config/config.go:250.59,252.2 1 0
+github.com/muety/wakapi/config/config.go:254.57,256.2 1 0
+github.com/muety/wakapi/config/config.go:258.53,260.2 1 0
+github.com/muety/wakapi/config/config.go:262.46,264.2 1 0
+github.com/muety/wakapi/config/config.go:266.29,268.2 1 1
+github.com/muety/wakapi/config/config.go:270.27,272.16 2 0
+github.com/muety/wakapi/config/config.go:275.2,278.16 3 0
+github.com/muety/wakapi/config/config.go:282.2,282.41 1 0
+github.com/muety/wakapi/config/config.go:272.16,274.3 1 0
+github.com/muety/wakapi/config/config.go:278.16,280.3 1 0
+github.com/muety/wakapi/config/config.go:285.48,297.16 3 0
+github.com/muety/wakapi/config/config.go:300.2,302.16 3 0
+github.com/muety/wakapi/config/config.go:306.2,306.55 1 0
+github.com/muety/wakapi/config/config.go:310.2,310.15 1 0
+github.com/muety/wakapi/config/config.go:297.16,299.3 1 0
+github.com/muety/wakapi/config/config.go:302.16,304.3 1 0
+github.com/muety/wakapi/config/config.go:306.55,308.3 1 0
+github.com/muety/wakapi/config/config.go:313.38,314.43 1 0
+github.com/muety/wakapi/config/config.go:317.2,317.15 1 0
+github.com/muety/wakapi/config/config.go:314.43,316.3 1 0
+github.com/muety/wakapi/config/config.go:320.45,321.27 1 0
+github.com/muety/wakapi/config/config.go:324.2,324.15 1 0
+github.com/muety/wakapi/config/config.go:321.27,323.3 1 0
+github.com/muety/wakapi/config/config.go:327.50,331.91 1 0
+github.com/muety/wakapi/config/config.go:331.91,332.29 1 0
+github.com/muety/wakapi/config/config.go:336.4,339.48 3 0
+github.com/muety/wakapi/config/config.go:342.4,342.39 1 0
+github.com/muety/wakapi/config/config.go:345.4,345.69 1 0
+github.com/muety/wakapi/config/config.go:332.29,334.5 1 0
+github.com/muety/wakapi/config/config.go:339.48,341.5 1 0
+github.com/muety/wakapi/config/config.go:342.39,344.5 1 0
+github.com/muety/wakapi/config/config.go:347.79,351.27 2 0
+github.com/muety/wakapi/config/config.go:358.4,358.16 1 0
+github.com/muety/wakapi/config/config.go:351.27,352.84 1 0
+github.com/muety/wakapi/config/config.go:352.84,353.57 1 0
+github.com/muety/wakapi/config/config.go:353.57,355.7 1 0
+github.com/muety/wakapi/config/config.go:360.17,362.3 1 0
+github.com/muety/wakapi/config/config.go:365.77,366.29 1 0
+github.com/muety/wakapi/config/config.go:371.2,371.19 1 0
+github.com/muety/wakapi/config/config.go:366.29,367.18 1 0
+github.com/muety/wakapi/config/config.go:367.18,369.4 1 0
+github.com/muety/wakapi/config/config.go:374.26,376.2 1 0
+github.com/muety/wakapi/config/config.go:378.20,380.2 1 0
+github.com/muety/wakapi/config/config.go:382.21,387.96 3 0
+github.com/muety/wakapi/config/config.go:391.2,399.52 5 0
+github.com/muety/wakapi/config/config.go:403.2,403.47 1 0
+github.com/muety/wakapi/config/config.go:409.2,409.70 1 0
+github.com/muety/wakapi/config/config.go:413.2,413.28 1 0
+github.com/muety/wakapi/config/config.go:417.2,417.29 1 0
+github.com/muety/wakapi/config/config.go:422.2,422.94 1 0
+github.com/muety/wakapi/config/config.go:426.2,427.14 2 0
+github.com/muety/wakapi/config/config.go:387.96,389.3 1 0
+github.com/muety/wakapi/config/config.go:399.52,401.3 1 0
+github.com/muety/wakapi/config/config.go:403.47,404.14 1 0
+github.com/muety/wakapi/config/config.go:404.14,406.4 1 0
+github.com/muety/wakapi/config/config.go:409.70,411.3 1 0
+github.com/muety/wakapi/config/config.go:413.28,415.3 1 0
+github.com/muety/wakapi/config/config.go:417.29,420.3 2 0
+github.com/muety/wakapi/config/config.go:422.94,424.3 1 0
+github.com/muety/wakapi/config/utils.go:5.78,7.22 2 0
+github.com/muety/wakapi/config/utils.go:13.2,13.11 1 0
+github.com/muety/wakapi/config/utils.go:7.22,8.18 1 0
+github.com/muety/wakapi/config/utils.go:11.3,11.12 1 0
+github.com/muety/wakapi/config/utils.go:8.18,10.4 1 0
+github.com/muety/wakapi/utils/template.go:8.41,10.16 2 0
+github.com/muety/wakapi/utils/template.go:13.2,13.23 1 0
+github.com/muety/wakapi/utils/template.go:10.16,12.3 1 0
+github.com/muety/wakapi/utils/template.go:16.37,17.30 1 0
+github.com/muety/wakapi/utils/template.go:20.2,20.10 1 0
+github.com/muety/wakapi/utils/template.go:17.30,19.3 1 0
+github.com/muety/wakapi/utils/filesystem.go:14.68,16.16 2 0
+github.com/muety/wakapi/utils/filesystem.go:20.2,21.15 2 0
+github.com/muety/wakapi/utils/filesystem.go:33.2,33.15 1 0
+github.com/muety/wakapi/utils/filesystem.go:16.16,18.3 1 0
+github.com/muety/wakapi/utils/filesystem.go:21.15,23.47 2 0
+github.com/muety/wakapi/utils/filesystem.go:23.47,25.23 2 0
+github.com/muety/wakapi/utils/filesystem.go:29.4,29.19 1 0
+github.com/muety/wakapi/utils/filesystem.go:25.23,27.5 1 0
+github.com/muety/wakapi/utils/color.go:8.90,10.32 2 0
+github.com/muety/wakapi/utils/color.go:15.2,15.15 1 0
+github.com/muety/wakapi/utils/color.go:10.32,11.50 1 0
+github.com/muety/wakapi/utils/color.go:11.50,13.4 1 0
+github.com/muety/wakapi/utils/common.go:10.48,12.2 1 0
+github.com/muety/wakapi/utils/common.go:14.52,16.2 1 0
+github.com/muety/wakapi/utils/common.go:18.40,20.2 1 0
+github.com/muety/wakapi/utils/common.go:22.44,24.2 1 0
+github.com/muety/wakapi/utils/common.go:26.45,28.2 1 0
+github.com/muety/wakapi/utils/common.go:30.24,32.2 1 0
+github.com/muety/wakapi/utils/common.go:34.56,37.45 3 1
+github.com/muety/wakapi/utils/common.go:40.2,40.40 1 1
+github.com/muety/wakapi/utils/common.go:37.45,39.3 1 1
 github.com/muety/wakapi/utils/date.go:8.31,10.2 1 0
 github.com/muety/wakapi/utils/date.go:12.43,14.2 1 0
 github.com/muety/wakapi/utils/date.go:16.30,20.2 3 0
@@ -158,262 +270,293 @@ github.com/muety/wakapi/utils/strings.go:12.77,13.29 1 0
 github.com/muety/wakapi/utils/strings.go:18.2,18.19 1 0
 github.com/muety/wakapi/utils/strings.go:13.29,14.18 1 0
 github.com/muety/wakapi/utils/strings.go:14.18,16.4 1 0
-github.com/muety/wakapi/utils/summary.go:10.71,13.18 2 0
-github.com/muety/wakapi/utils/summary.go:37.2,37.22 1 0
-github.com/muety/wakapi/utils/summary.go:14.28,15.24 1 0
-github.com/muety/wakapi/utils/summary.go:16.32,18.22 2 0
-github.com/muety/wakapi/utils/summary.go:19.31,20.23 1 0
-github.com/muety/wakapi/utils/summary.go:21.32,22.24 1 0
-github.com/muety/wakapi/utils/summary.go:23.31,24.23 1 0
-github.com/muety/wakapi/utils/summary.go:25.32,26.42 1 0
-github.com/muety/wakapi/utils/summary.go:27.33,28.43 1 0
-github.com/muety/wakapi/utils/summary.go:29.35,30.43 1 0
-github.com/muety/wakapi/utils/summary.go:31.26,32.21 1 0
-github.com/muety/wakapi/utils/summary.go:33.10,34.39 1 0
-github.com/muety/wakapi/utils/summary.go:40.73,47.56 5 0
-github.com/muety/wakapi/utils/summary.go:61.2,68.8 2 0
-github.com/muety/wakapi/utils/summary.go:47.56,49.3 1 0
-github.com/muety/wakapi/utils/summary.go:49.8,51.17 2 0
-github.com/muety/wakapi/utils/summary.go:55.3,56.17 2 0
-github.com/muety/wakapi/utils/summary.go:51.17,53.4 1 0
-github.com/muety/wakapi/utils/summary.go:56.17,58.4 1 0
-github.com/muety/wakapi/utils/template.go:8.41,10.16 2 0
-github.com/muety/wakapi/utils/template.go:13.2,13.23 1 0
-github.com/muety/wakapi/utils/template.go:10.16,12.3 1 0
-github.com/muety/wakapi/utils/auth.go:18.79,20.54 2 0
-github.com/muety/wakapi/utils/auth.go:24.2,26.16 3 0
-github.com/muety/wakapi/utils/auth.go:30.2,32.45 3 0
-github.com/muety/wakapi/utils/auth.go:35.2,36.32 2 0
-github.com/muety/wakapi/utils/auth.go:20.54,22.3 1 0
-github.com/muety/wakapi/utils/auth.go:26.16,28.3 1 0
-github.com/muety/wakapi/utils/auth.go:32.45,34.3 1 0
-github.com/muety/wakapi/utils/auth.go:39.65,41.54 2 0
-github.com/muety/wakapi/utils/auth.go:45.2,46.30 2 0
-github.com/muety/wakapi/utils/auth.go:41.54,43.3 1 0
-github.com/muety/wakapi/utils/auth.go:49.97,51.16 2 0
-github.com/muety/wakapi/utils/auth.go:55.2,55.104 1 0
-github.com/muety/wakapi/utils/auth.go:59.2,59.19 1 0
-github.com/muety/wakapi/utils/auth.go:51.16,53.3 1 0
-github.com/muety/wakapi/utils/auth.go:55.104,57.3 1 0
-github.com/muety/wakapi/utils/auth.go:62.30,64.2 1 0
-github.com/muety/wakapi/utils/auth.go:66.56,70.2 3 0
-github.com/muety/wakapi/utils/auth.go:73.53,75.2 1 0
-github.com/muety/wakapi/utils/auth.go:77.55,80.16 3 0
-github.com/muety/wakapi/utils/auth.go:83.2,83.16 1 0
-github.com/muety/wakapi/utils/auth.go:80.16,82.3 1 0
-github.com/muety/wakapi/utils/auth.go:86.43,91.2 4 0
-github.com/muety/wakapi/utils/color.go:8.93,10.41 2 0
-github.com/muety/wakapi/utils/color.go:15.2,15.15 1 0
-github.com/muety/wakapi/utils/color.go:10.41,11.50 1 0
-github.com/muety/wakapi/utils/color.go:11.50,13.4 1 0
-github.com/muety/wakapi/config/config.go:74.70,76.2 1 0
-github.com/muety/wakapi/config/config.go:78.65,80.2 1 0
-github.com/muety/wakapi/config/config.go:82.82,92.2 1 0
-github.com/muety/wakapi/config/config.go:94.31,96.2 1 0
-github.com/muety/wakapi/config/config.go:98.74,99.19 1 0
-github.com/muety/wakapi/config/config.go:100.10,101.34 1 0
-github.com/muety/wakapi/config/config.go:101.34,110.4 8 0
-github.com/muety/wakapi/config/config.go:114.73,115.33 1 0
-github.com/muety/wakapi/config/config.go:115.33,123.17 5 0
-github.com/muety/wakapi/config/config.go:127.3,128.13 2 0
-github.com/muety/wakapi/config/config.go:123.17,125.4 1 0
-github.com/muety/wakapi/config/config.go:132.50,133.19 1 0
-github.com/muety/wakapi/config/config.go:146.2,146.12 1 0
-github.com/muety/wakapi/config/config.go:134.23,138.5 1 0
-github.com/muety/wakapi/config/config.go:139.26,142.5 1 0
-github.com/muety/wakapi/config/config.go:143.24,144.48 1 0
-github.com/muety/wakapi/config/config.go:149.53,159.2 1 1
-github.com/muety/wakapi/config/config.go:161.56,169.2 1 1
-github.com/muety/wakapi/config/config.go:171.54,173.2 1 1
-github.com/muety/wakapi/config/config.go:175.29,177.2 1 1
-github.com/muety/wakapi/config/config.go:179.27,181.16 2 0
-github.com/muety/wakapi/config/config.go:184.2,187.16 3 0
-github.com/muety/wakapi/config/config.go:191.2,191.22 1 0
-github.com/muety/wakapi/config/config.go:181.16,183.3 1 0
-github.com/muety/wakapi/config/config.go:187.16,189.3 1 0
-github.com/muety/wakapi/config/config.go:194.45,204.16 4 0
-github.com/muety/wakapi/config/config.go:208.2,208.57 1 0
-github.com/muety/wakapi/config/config.go:212.2,212.30 1 0
-github.com/muety/wakapi/config/config.go:216.2,216.15 1 0
-github.com/muety/wakapi/config/config.go:204.16,206.3 1 0
-github.com/muety/wakapi/config/config.go:208.57,210.3 1 0
-github.com/muety/wakapi/config/config.go:212.30,214.3 1 0
-github.com/muety/wakapi/config/config.go:219.38,220.43 1 0
-github.com/muety/wakapi/config/config.go:224.2,224.15 1 0
-github.com/muety/wakapi/config/config.go:220.43,222.3 1 0
-github.com/muety/wakapi/config/config.go:227.26,229.2 1 0
-github.com/muety/wakapi/config/config.go:231.20,233.2 1 0
-github.com/muety/wakapi/config/config.go:235.21,242.96 4 0
-github.com/muety/wakapi/config/config.go:246.2,253.52 4 0
-github.com/muety/wakapi/config/config.go:257.2,257.47 1 0
-github.com/muety/wakapi/config/config.go:263.2,264.14 2 0
-github.com/muety/wakapi/config/config.go:242.96,244.3 1 0
-github.com/muety/wakapi/config/config.go:253.52,255.3 1 0
-github.com/muety/wakapi/config/config.go:257.47,258.14 1 0
-github.com/muety/wakapi/config/config.go:258.14,260.4 1 0
-github.com/muety/wakapi/config/legacy.go:13.33,14.57 1 0
-github.com/muety/wakapi/config/legacy.go:14.57,16.3 1 0
-github.com/muety/wakapi/config/legacy.go:16.8,16.16 1 0
-github.com/muety/wakapi/config/legacy.go:16.16,18.47 2 0
-github.com/muety/wakapi/config/legacy.go:21.3,21.128 1 0
-github.com/muety/wakapi/config/legacy.go:18.47,20.4 1 0
-github.com/muety/wakapi/config/legacy.go:25.48,26.54 1 0
-github.com/muety/wakapi/config/legacy.go:31.2,31.18 1 0
-github.com/muety/wakapi/config/legacy.go:26.54,28.3 1 0
-github.com/muety/wakapi/config/legacy.go:28.8,28.32 1 0
-github.com/muety/wakapi/config/legacy.go:28.32,30.3 1 0
-github.com/muety/wakapi/config/legacy.go:34.34,37.16 2 0
-github.com/muety/wakapi/config/legacy.go:40.2,41.16 2 0
-github.com/muety/wakapi/config/legacy.go:45.2,57.16 11 0
-github.com/muety/wakapi/config/legacy.go:61.2,61.18 1 0
-github.com/muety/wakapi/config/legacy.go:65.2,69.16 5 0
-github.com/muety/wakapi/config/legacy.go:73.2,75.23 3 0
-github.com/muety/wakapi/config/legacy.go:80.2,82.33 3 0
-github.com/muety/wakapi/config/legacy.go:87.2,114.16 3 0
-github.com/muety/wakapi/config/legacy.go:119.2,119.78 1 0
-github.com/muety/wakapi/config/legacy.go:123.2,123.12 1 0
-github.com/muety/wakapi/config/legacy.go:37.16,39.3 1 0
-github.com/muety/wakapi/config/legacy.go:41.16,43.3 1 0
-github.com/muety/wakapi/config/legacy.go:57.16,59.3 1 0
-github.com/muety/wakapi/config/legacy.go:61.18,63.3 1 0
-github.com/muety/wakapi/config/legacy.go:69.16,71.3 1 0
-github.com/muety/wakapi/config/legacy.go:75.23,77.3 1 0
-github.com/muety/wakapi/config/legacy.go:82.33,84.3 1 0
-github.com/muety/wakapi/config/legacy.go:114.16,116.3 1 0
-github.com/muety/wakapi/config/legacy.go:119.78,121.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:27.116,34.2 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:36.71,37.71 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:37.71,39.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:42.107,43.37 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:50.2,53.16 3 0
-github.com/muety/wakapi/middlewares/authenticate.go:57.2,57.16 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:67.2,70.29 3 0
-github.com/muety/wakapi/middlewares/authenticate.go:43.37,44.58 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:44.58,47.4 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:53.16,55.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:57.16,58.44 1 0
+github.com/muety/wakapi/utils/summary.go:10.66,11.40 1 0
+github.com/muety/wakapi/utils/summary.go:16.2,16.48 1 0
+github.com/muety/wakapi/utils/summary.go:11.40,12.27 1 0
+github.com/muety/wakapi/utils/summary.go:12.27,14.4 1 0
+github.com/muety/wakapi/utils/summary.go:19.67,22.2 2 0
+github.com/muety/wakapi/utils/summary.go:24.74,26.16 2 0
+github.com/muety/wakapi/utils/summary.go:29.2,29.32 1 0
+github.com/muety/wakapi/utils/summary.go:26.16,28.3 1 0
+github.com/muety/wakapi/utils/summary.go:32.84,35.18 2 0
+github.com/muety/wakapi/utils/summary.go:70.2,70.22 1 0
+github.com/muety/wakapi/utils/summary.go:36.28,37.24 1 0
+github.com/muety/wakapi/utils/summary.go:38.32,40.22 2 0
+github.com/muety/wakapi/utils/summary.go:41.31,42.23 1 0
+github.com/muety/wakapi/utils/summary.go:43.31,45.21 2 0
+github.com/muety/wakapi/utils/summary.go:46.32,47.24 1 0
+github.com/muety/wakapi/utils/summary.go:48.32,50.22 2 0
+github.com/muety/wakapi/utils/summary.go:51.31,52.23 1 0
+github.com/muety/wakapi/utils/summary.go:53.32,54.42 1 0
+github.com/muety/wakapi/utils/summary.go:55.41,57.40 2 0
+github.com/muety/wakapi/utils/summary.go:58.33,59.43 1 0
+github.com/muety/wakapi/utils/summary.go:60.33,61.43 1 0
+github.com/muety/wakapi/utils/summary.go:62.35,63.43 1 0
+github.com/muety/wakapi/utils/summary.go:64.26,65.21 1 0
+github.com/muety/wakapi/utils/summary.go:66.10,67.39 1 0
+github.com/muety/wakapi/utils/summary.go:73.73,80.56 5 0
+github.com/muety/wakapi/utils/summary.go:102.2,109.8 2 0
+github.com/muety/wakapi/utils/summary.go:80.56,82.3 1 0
+github.com/muety/wakapi/utils/summary.go:82.8,82.54 1 0
+github.com/muety/wakapi/utils/summary.go:82.54,84.3 1 0
+github.com/muety/wakapi/utils/summary.go:84.8,86.17 2 0
+github.com/muety/wakapi/utils/summary.go:93.3,94.17 2 0
+github.com/muety/wakapi/utils/summary.go:86.17,88.18 2 0
+github.com/muety/wakapi/utils/summary.go:88.18,90.5 1 0
+github.com/muety/wakapi/utils/summary.go:94.17,96.18 2 0
+github.com/muety/wakapi/utils/summary.go:96.18,98.5 1 0
+github.com/muety/wakapi/utils/summary.go:112.48,116.51 2 0
+github.com/muety/wakapi/utils/summary.go:119.2,119.12 1 0
+github.com/muety/wakapi/utils/summary.go:116.51,118.3 1 0
+github.com/muety/wakapi/utils/auth.go:16.79,18.54 2 0
+github.com/muety/wakapi/utils/auth.go:22.2,24.16 3 0
+github.com/muety/wakapi/utils/auth.go:28.2,30.45 3 0
+github.com/muety/wakapi/utils/auth.go:33.2,34.32 2 0
+github.com/muety/wakapi/utils/auth.go:18.54,20.3 1 0
+github.com/muety/wakapi/utils/auth.go:24.16,26.3 1 0
+github.com/muety/wakapi/utils/auth.go:30.45,32.3 1 0
+github.com/muety/wakapi/utils/auth.go:37.65,39.85 2 0
+github.com/muety/wakapi/utils/auth.go:43.2,44.30 2 0
+github.com/muety/wakapi/utils/auth.go:39.85,41.3 1 0
+github.com/muety/wakapi/utils/auth.go:47.94,49.16 2 0
+github.com/muety/wakapi/utils/auth.go:53.2,53.107 1 0
+github.com/muety/wakapi/utils/auth.go:57.2,57.22 1 0
+github.com/muety/wakapi/utils/auth.go:49.16,51.3 1 0
+github.com/muety/wakapi/utils/auth.go:53.107,55.3 1 0
+github.com/muety/wakapi/utils/auth.go:60.56,64.2 3 0
+github.com/muety/wakapi/utils/auth.go:66.55,69.16 3 0
+github.com/muety/wakapi/utils/auth.go:72.2,72.16 1 0
+github.com/muety/wakapi/utils/auth.go:69.16,71.3 1 0
+github.com/muety/wakapi/middlewares/filetype.go:13.83,14.43 1 0
+github.com/muety/wakapi/middlewares/filetype.go:14.43,19.3 1 0
+github.com/muety/wakapi/middlewares/filetype.go:22.84,24.34 2 0
+github.com/muety/wakapi/middlewares/filetype.go:31.2,31.27 1 0
+github.com/muety/wakapi/middlewares/filetype.go:24.34,25.50 1 0
+github.com/muety/wakapi/middlewares/filetype.go:25.50,29.4 3 0
+github.com/muety/wakapi/middlewares/logging.go:20.102,21.43 1 0
+github.com/muety/wakapi/middlewares/logging.go:21.43,27.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:30.80,39.44 7 0
+github.com/muety/wakapi/middlewares/logging.go:45.2,54.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:39.44,40.38 1 0
+github.com/muety/wakapi/middlewares/logging.go:40.38,42.4 1 0
+github.com/muety/wakapi/middlewares/logging.go:57.41,59.14 2 0
+github.com/muety/wakapi/middlewares/logging.go:62.2,62.14 1 0
+github.com/muety/wakapi/middlewares/logging.go:65.2,65.11 1 0
+github.com/muety/wakapi/middlewares/logging.go:59.14,61.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:62.14,64.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:68.41,69.42 1 0
+github.com/muety/wakapi/middlewares/logging.go:72.2,72.12 1 0
+github.com/muety/wakapi/middlewares/logging.go:69.42,71.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:103.52,105.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:117.45,118.20 1 0
+github.com/muety/wakapi/middlewares/logging.go:118.20,122.3 3 0
+github.com/muety/wakapi/middlewares/logging.go:124.54,127.18 3 0
+github.com/muety/wakapi/middlewares/logging.go:134.2,135.15 2 0
+github.com/muety/wakapi/middlewares/logging.go:127.18,130.17 2 0
+github.com/muety/wakapi/middlewares/logging.go:130.17,132.4 1 0
+github.com/muety/wakapi/middlewares/logging.go:137.42,138.20 1 0
+github.com/muety/wakapi/middlewares/logging.go:138.20,140.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:142.36,144.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:145.42,147.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:148.40,150.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:151.52,153.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:15.62,17.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:19.58,21.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:42.71,43.43 1 0
+github.com/muety/wakapi/middlewares/principal.go:43.43,45.3 1 0
+github.com/muety/wakapi/middlewares/principal.go:48.81,51.2 2 0
+github.com/muety/wakapi/middlewares/principal.go:53.55,54.52 1 0
+github.com/muety/wakapi/middlewares/principal.go:54.52,56.3 1 0
+github.com/muety/wakapi/middlewares/principal.go:59.49,60.52 1 0
+github.com/muety/wakapi/middlewares/principal.go:63.2,63.12 1 0
+github.com/muety/wakapi/middlewares/principal.go:60.52,62.3 1 0
+github.com/muety/wakapi/middlewares/sentry.go:14.60,15.43 1 0
+github.com/muety/wakapi/middlewares/sentry.go:15.43,19.3 1 0
+github.com/muety/wakapi/middlewares/sentry.go:22.78,25.54 3 0
+github.com/muety/wakapi/middlewares/sentry.go:25.54,26.43 1 0
+github.com/muety/wakapi/middlewares/sentry.go:26.43,28.4 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:19.91,25.2 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:27.90,30.2 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:32.90,35.2 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:37.71,38.71 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:38.71,40.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:43.107,47.16 3 0
+github.com/muety/wakapi/middlewares/authenticate.go:51.2,51.31 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:67.2,68.12 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:47.16,49.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:51.31,52.31 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:57.3,57.29 1 0
 github.com/muety/wakapi/middlewares/authenticate.go:64.3,64.9 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:58.44,60.4 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:52.31,55.4 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:57.29,60.4 2 0
 github.com/muety/wakapi/middlewares/authenticate.go:60.9,63.4 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:73.92,75.16 2 1
-github.com/muety/wakapi/middlewares/authenticate.go:79.2,82.9 4 1
-github.com/muety/wakapi/middlewares/authenticate.go:90.2,90.18 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:75.16,77.3 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:82.9,84.17 2 1
-github.com/muety/wakapi/middlewares/authenticate.go:84.17,86.4 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:87.8,89.3 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:93.92,95.16 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:99.2,101.8 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:105.2,106.16 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:110.2,110.88 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:114.2,114.18 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:95.16,97.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:101.8,103.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:106.16,108.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:110.88,112.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:118.127,119.32 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:127.2,127.65 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:119.32,120.58 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:125.3,125.15 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:120.58,124.4 3 0
-github.com/muety/wakapi/middlewares/logging.go:11.48,13.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:15.66,17.2 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:71.70,72.39 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:77.2,77.14 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:72.39,73.60 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:73.60,75.4 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:80.92,82.16 2 1
+github.com/muety/wakapi/middlewares/authenticate.go:86.2,89.16 4 1
+github.com/muety/wakapi/middlewares/authenticate.go:92.2,92.18 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:82.16,84.3 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:89.16,91.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:95.92,97.16 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:101.2,102.16 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:109.2,109.18 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:97.16,99.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:102.16,104.3 1 0
+github.com/muety/wakapi/services/alias.go:17.77,22.2 1 1
+github.com/muety/wakapi/services/alias.go:26.60,27.43 1 1
+github.com/muety/wakapi/services/alias.go:30.2,30.14 1 1
+github.com/muety/wakapi/services/alias.go:27.43,29.3 1 1
+github.com/muety/wakapi/services/alias.go:33.62,35.16 2 1
+github.com/muety/wakapi/services/alias.go:38.2,38.12 1 1
+github.com/muety/wakapi/services/alias.go:35.16,37.3 1 1
+github.com/muety/wakapi/services/alias.go:41.76,43.16 2 0
+github.com/muety/wakapi/services/alias.go:46.2,46.21 1 0
+github.com/muety/wakapi/services/alias.go:43.16,45.3 1 0
+github.com/muety/wakapi/services/alias.go:49.113,51.16 2 0
+github.com/muety/wakapi/services/alias.go:54.2,54.21 1 0
+github.com/muety/wakapi/services/alias.go:51.16,53.3 1 0
+github.com/muety/wakapi/services/alias.go:57.108,58.32 1 1
+github.com/muety/wakapi/services/alias.go:64.2,65.46 2 1
+github.com/muety/wakapi/services/alias.go:70.2,70.19 1 1
+github.com/muety/wakapi/services/alias.go:58.32,59.52 1 1
+github.com/muety/wakapi/services/alias.go:59.52,61.4 1 1
+github.com/muety/wakapi/services/alias.go:65.46,66.48 1 1
+github.com/muety/wakapi/services/alias.go:66.48,68.4 1 1
+github.com/muety/wakapi/services/alias.go:73.77,75.16 2 0
+github.com/muety/wakapi/services/alias.go:78.2,79.20 2 0
+github.com/muety/wakapi/services/alias.go:75.16,77.3 1 0
+github.com/muety/wakapi/services/alias.go:82.60,83.24 1 0
+github.com/muety/wakapi/services/alias.go:86.2,88.12 3 0
+github.com/muety/wakapi/services/alias.go:83.24,85.3 1 0
+github.com/muety/wakapi/services/alias.go:91.69,94.28 3 0
+github.com/muety/wakapi/services/alias.go:102.2,104.31 2 0
+github.com/muety/wakapi/services/alias.go:108.2,108.12 1 0
+github.com/muety/wakapi/services/alias.go:94.28,95.21 1 0
+github.com/muety/wakapi/services/alias.go:98.3,99.16 2 0
+github.com/muety/wakapi/services/alias.go:95.21,97.4 1 0
+github.com/muety/wakapi/services/alias.go:104.31,106.3 1 0
+github.com/muety/wakapi/services/alias.go:111.52,112.51 1 0
+github.com/muety/wakapi/services/alias.go:112.51,114.3 1 0
 github.com/muety/wakapi/services/aggregation.go:24.142,31.2 1 0
 github.com/muety/wakapi/services/aggregation.go:40.43,42.37 1 0
-github.com/muety/wakapi/services/aggregation.go:46.2,47.18 2 0
+github.com/muety/wakapi/services/aggregation.go:46.2,48.19 3 0
 github.com/muety/wakapi/services/aggregation.go:42.37,44.3 1 0
-github.com/muety/wakapi/services/aggregation.go:50.67,54.40 3 0
-github.com/muety/wakapi/services/aggregation.go:58.2,58.50 1 0
-github.com/muety/wakapi/services/aggregation.go:63.2,63.60 1 0
-github.com/muety/wakapi/services/aggregation.go:69.2,69.35 1 0
-github.com/muety/wakapi/services/aggregation.go:54.40,56.3 1 0
-github.com/muety/wakapi/services/aggregation.go:58.50,60.3 1 0
-github.com/muety/wakapi/services/aggregation.go:63.60,67.3 3 0
-github.com/muety/wakapi/services/aggregation.go:72.109,73.24 1 0
-github.com/muety/wakapi/services/aggregation.go:73.24,74.111 1 0
-github.com/muety/wakapi/services/aggregation.go:74.111,76.4 1 0
-github.com/muety/wakapi/services/aggregation.go:76.9,79.4 2 0
-github.com/muety/wakapi/services/aggregation.go:83.80,84.33 1 0
-github.com/muety/wakapi/services/aggregation.go:84.33,85.60 1 0
-github.com/muety/wakapi/services/aggregation.go:85.60,87.4 1 0
-github.com/muety/wakapi/services/aggregation.go:91.100,95.59 3 0
-github.com/muety/wakapi/services/aggregation.go:110.2,111.16 2 0
-github.com/muety/wakapi/services/aggregation.go:117.2,118.16 2 0
-github.com/muety/wakapi/services/aggregation.go:124.2,125.44 2 0
-github.com/muety/wakapi/services/aggregation.go:130.2,130.41 1 0
-github.com/muety/wakapi/services/aggregation.go:144.2,144.12 1 0
-github.com/muety/wakapi/services/aggregation.go:95.59,98.3 2 0
-github.com/muety/wakapi/services/aggregation.go:98.8,98.47 1 0
-github.com/muety/wakapi/services/aggregation.go:98.47,100.30 2 0
-github.com/muety/wakapi/services/aggregation.go:100.30,101.43 1 0
-github.com/muety/wakapi/services/aggregation.go:101.43,103.5 1 0
-github.com/muety/wakapi/services/aggregation.go:105.8,107.3 1 0
-github.com/muety/wakapi/services/aggregation.go:111.16,114.3 2 0
-github.com/muety/wakapi/services/aggregation.go:118.16,121.3 2 0
-github.com/muety/wakapi/services/aggregation.go:125.44,127.3 1 0
-github.com/muety/wakapi/services/aggregation.go:130.41,131.21 1 0
-github.com/muety/wakapi/services/aggregation.go:131.21,135.4 1 0
-github.com/muety/wakapi/services/aggregation.go:135.9,135.62 1 0
-github.com/muety/wakapi/services/aggregation.go:135.62,139.4 1 0
-github.com/muety/wakapi/services/aggregation.go:147.83,162.41 5 0
-github.com/muety/wakapi/services/aggregation.go:162.41,172.3 3 0
-github.com/muety/wakapi/services/aggregation.go:175.34,178.2 2 0
-github.com/muety/wakapi/services/alias.go:16.77,21.2 1 1
-github.com/muety/wakapi/services/alias.go:25.63,27.16 2 1
-github.com/muety/wakapi/services/alias.go:30.2,30.12 1 1
-github.com/muety/wakapi/services/alias.go:27.16,29.3 1 1
-github.com/muety/wakapi/services/alias.go:33.108,34.32 1 1
-github.com/muety/wakapi/services/alias.go:40.2,41.46 2 1
-github.com/muety/wakapi/services/alias.go:46.2,46.19 1 1
-github.com/muety/wakapi/services/alias.go:34.32,35.53 1 1
-github.com/muety/wakapi/services/alias.go:35.53,37.4 1 1
-github.com/muety/wakapi/services/alias.go:41.46,42.48 1 1
-github.com/muety/wakapi/services/alias.go:42.48,44.4 1 1
-github.com/muety/wakapi/services/alias.go:49.60,50.43 1 1
-github.com/muety/wakapi/services/alias.go:53.2,53.14 1 1
-github.com/muety/wakapi/services/alias.go:50.43,52.3 1 1
+github.com/muety/wakapi/services/aggregation.go:51.67,55.40 3 0
+github.com/muety/wakapi/services/aggregation.go:59.2,59.50 1 0
+github.com/muety/wakapi/services/aggregation.go:64.2,64.60 1 0
+github.com/muety/wakapi/services/aggregation.go:70.2,70.35 1 0
+github.com/muety/wakapi/services/aggregation.go:55.40,57.3 1 0
+github.com/muety/wakapi/services/aggregation.go:59.50,61.3 1 0
+github.com/muety/wakapi/services/aggregation.go:64.60,68.3 3 0
+github.com/muety/wakapi/services/aggregation.go:73.109,74.24 1 0
+github.com/muety/wakapi/services/aggregation.go:74.24,75.111 1 0
+github.com/muety/wakapi/services/aggregation.go:75.111,77.4 1 0
+github.com/muety/wakapi/services/aggregation.go:77.9,80.4 2 0
+github.com/muety/wakapi/services/aggregation.go:84.80,85.33 1 0
+github.com/muety/wakapi/services/aggregation.go:85.33,86.60 1 0
+github.com/muety/wakapi/services/aggregation.go:86.60,88.4 1 0
+github.com/muety/wakapi/services/aggregation.go:92.100,96.59 3 0
+github.com/muety/wakapi/services/aggregation.go:111.2,112.16 2 0
+github.com/muety/wakapi/services/aggregation.go:118.2,119.16 2 0
+github.com/muety/wakapi/services/aggregation.go:125.2,126.44 2 0
+github.com/muety/wakapi/services/aggregation.go:131.2,131.41 1 0
+github.com/muety/wakapi/services/aggregation.go:145.2,145.12 1 0
+github.com/muety/wakapi/services/aggregation.go:96.59,99.3 2 0
+github.com/muety/wakapi/services/aggregation.go:99.8,99.47 1 0
+github.com/muety/wakapi/services/aggregation.go:99.47,101.30 2 0
+github.com/muety/wakapi/services/aggregation.go:101.30,102.43 1 0
+github.com/muety/wakapi/services/aggregation.go:102.43,104.5 1 0
+github.com/muety/wakapi/services/aggregation.go:106.8,108.3 1 0
+github.com/muety/wakapi/services/aggregation.go:112.16,115.3 2 0
+github.com/muety/wakapi/services/aggregation.go:119.16,122.3 2 0
+github.com/muety/wakapi/services/aggregation.go:126.44,128.3 1 0
+github.com/muety/wakapi/services/aggregation.go:131.41,132.21 1 0
+github.com/muety/wakapi/services/aggregation.go:132.21,136.4 1 0
+github.com/muety/wakapi/services/aggregation.go:136.9,136.62 1 0
+github.com/muety/wakapi/services/aggregation.go:136.62,140.4 1 0
+github.com/muety/wakapi/services/aggregation.go:148.83,163.41 5 0
+github.com/muety/wakapi/services/aggregation.go:163.41,173.3 3 0
+github.com/muety/wakapi/services/aggregation.go:176.34,179.2 2 0
 github.com/muety/wakapi/services/heartbeat.go:17.141,23.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:25.80,27.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:29.111,31.16 2 0
-github.com/muety/wakapi/services/heartbeat.go:34.2,34.43 1 0
-github.com/muety/wakapi/services/heartbeat.go:31.16,33.3 1 0
-github.com/muety/wakapi/services/heartbeat.go:37.78,39.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:41.62,43.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:45.116,47.16 2 0
-github.com/muety/wakapi/services/heartbeat.go:51.2,51.28 1 0
-github.com/muety/wakapi/services/heartbeat.go:55.2,55.24 1 0
-github.com/muety/wakapi/services/heartbeat.go:47.16,49.3 1 0
-github.com/muety/wakapi/services/heartbeat.go:51.28,53.3 1 0
+github.com/muety/wakapi/services/heartbeat.go:25.72,27.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:29.80,34.32 3 0
+github.com/muety/wakapi/services/heartbeat.go:41.2,41.55 1 0
+github.com/muety/wakapi/services/heartbeat.go:34.32,35.36 1 0
+github.com/muety/wakapi/services/heartbeat.go:35.36,38.4 2 0
+github.com/muety/wakapi/services/heartbeat.go:44.53,46.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:48.76,50.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:52.96,54.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:56.111,58.16 2 0
+github.com/muety/wakapi/services/heartbeat.go:61.2,61.43 1 0
+github.com/muety/wakapi/services/heartbeat.go:58.16,60.3 1 0
+github.com/muety/wakapi/services/heartbeat.go:64.116,66.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:68.78,70.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:72.62,74.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:76.116,78.16 2 0
+github.com/muety/wakapi/services/heartbeat.go:82.2,82.28 1 0
+github.com/muety/wakapi/services/heartbeat.go:86.2,86.24 1 0
+github.com/muety/wakapi/services/heartbeat.go:78.16,80.3 1 0
+github.com/muety/wakapi/services/heartbeat.go:82.28,84.3 1 0
 github.com/muety/wakapi/services/key_value.go:14.89,19.2 1 0
 github.com/muety/wakapi/services/key_value.go:21.83,23.2 1 0
-github.com/muety/wakapi/services/key_value.go:25.72,27.2 1 0
-github.com/muety/wakapi/services/key_value.go:29.60,31.2 1 0
-github.com/muety/wakapi/services/language_mapping.go:17.118,23.2 1 0
-github.com/muety/wakapi/services/language_mapping.go:25.86,27.2 1 0
-github.com/muety/wakapi/services/language_mapping.go:29.96,30.53 1 0
-github.com/muety/wakapi/services/language_mapping.go:34.2,35.16 2 0
-github.com/muety/wakapi/services/language_mapping.go:38.2,39.22 2 0
-github.com/muety/wakapi/services/language_mapping.go:30.53,32.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:35.16,37.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:42.92,45.16 3 0
-github.com/muety/wakapi/services/language_mapping.go:49.2,49.33 1 0
-github.com/muety/wakapi/services/language_mapping.go:52.2,52.22 1 0
-github.com/muety/wakapi/services/language_mapping.go:45.16,47.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:49.33,51.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:55.109,57.16 2 0
-github.com/muety/wakapi/services/language_mapping.go:61.2,62.20 2 0
-github.com/muety/wakapi/services/language_mapping.go:57.16,59.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:65.82,69.2 3 0
-github.com/muety/wakapi/services/language_mapping.go:71.73,73.2 1 0
+github.com/muety/wakapi/services/key_value.go:25.78,27.16 2 0
+github.com/muety/wakapi/services/key_value.go:33.2,33.11 1 0
+github.com/muety/wakapi/services/key_value.go:27.16,32.3 1 0
+github.com/muety/wakapi/services/key_value.go:36.72,38.2 1 0
+github.com/muety/wakapi/services/key_value.go:40.60,42.2 1 0
+github.com/muety/wakapi/services/language_mapping.go:18.118,24.2 1 0
+github.com/muety/wakapi/services/language_mapping.go:26.86,28.2 1 0
+github.com/muety/wakapi/services/language_mapping.go:30.96,31.53 1 0
+github.com/muety/wakapi/services/language_mapping.go:35.2,36.16 2 0
+github.com/muety/wakapi/services/language_mapping.go:39.2,40.22 2 0
+github.com/muety/wakapi/services/language_mapping.go:31.53,33.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:36.16,38.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:43.92,46.16 3 0
+github.com/muety/wakapi/services/language_mapping.go:50.2,50.33 1 0
+github.com/muety/wakapi/services/language_mapping.go:53.2,53.22 1 0
+github.com/muety/wakapi/services/language_mapping.go:46.16,48.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:50.33,52.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:56.109,58.16 2 0
+github.com/muety/wakapi/services/language_mapping.go:62.2,63.20 2 0
+github.com/muety/wakapi/services/language_mapping.go:58.16,60.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:66.82,67.26 1 0
+github.com/muety/wakapi/services/language_mapping.go:70.2,72.12 3 0
+github.com/muety/wakapi/services/language_mapping.go:67.26,69.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:75.74,78.2 1 0
+github.com/muety/wakapi/services/misc.go:23.126,30.2 1 0
+github.com/muety/wakapi/services/misc.go:42.50,44.48 1 0
+github.com/muety/wakapi/services/misc.go:48.2,50.19 3 0
+github.com/muety/wakapi/services/misc.go:44.48,46.3 1 0
+github.com/muety/wakapi/services/misc.go:53.51,59.40 4 0
+github.com/muety/wakapi/services/misc.go:63.2,66.56 2 0
+github.com/muety/wakapi/services/misc.go:77.2,77.12 1 0
+github.com/muety/wakapi/services/misc.go:59.40,61.3 1 0
+github.com/muety/wakapi/services/misc.go:66.56,67.27 1 0
+github.com/muety/wakapi/services/misc.go:67.27,72.4 1 0
+github.com/muety/wakapi/services/misc.go:73.8,75.3 1 0
+github.com/muety/wakapi/services/misc.go:80.116,81.24 1 0
+github.com/muety/wakapi/services/misc.go:81.24,82.151 1 0
+github.com/muety/wakapi/services/misc.go:91.3,91.48 1 0
+github.com/muety/wakapi/services/misc.go:82.151,84.4 1 0
+github.com/muety/wakapi/services/misc.go:84.9,90.4 2 0
+github.com/muety/wakapi/services/misc.go:91.48,94.4 2 0
+github.com/muety/wakapi/services/misc.go:98.86,101.30 3 0
+github.com/muety/wakapi/services/misc.go:106.2,109.17 1 0
+github.com/muety/wakapi/services/misc.go:113.2,116.17 1 0
+github.com/muety/wakapi/services/misc.go:101.30,104.3 2 0
+github.com/muety/wakapi/services/misc.go:109.17,111.3 1 0
+github.com/muety/wakapi/services/misc.go:116.17,118.3 1 0
 github.com/muety/wakapi/services/summary.go:27.149,35.2 1 1
-github.com/muety/wakapi/services/summary.go:39.120,42.52 2 1
+github.com/muety/wakapi/services/summary.go:39.136,42.66 2 1
 github.com/muety/wakapi/services/summary.go:47.2,47.44 1 1
-github.com/muety/wakapi/services/summary.go:53.2,53.66 1 1
+github.com/muety/wakapi/services/summary.go:53.2,53.65 1 1
 github.com/muety/wakapi/services/summary.go:58.2,59.16 2 1
 github.com/muety/wakapi/services/summary.go:64.2,66.30 3 1
-github.com/muety/wakapi/services/summary.go:42.52,44.3 1 0
+github.com/muety/wakapi/services/summary.go:42.66,44.3 1 0
 github.com/muety/wakapi/services/summary.go:47.44,50.3 2 1
-github.com/muety/wakapi/services/summary.go:53.66,55.3 1 0
+github.com/muety/wakapi/services/summary.go:53.65,55.3 1 0
 github.com/muety/wakapi/services/summary.go:59.16,61.3 1 0
 github.com/muety/wakapi/services/summary.go:69.101,72.52 2 1
 github.com/muety/wakapi/services/summary.go:77.2,78.16 2 1
@@ -494,18 +637,33 @@ github.com/muety/wakapi/services/summary.go:324.54,326.3 1 1
 github.com/muety/wakapi/services/summary.go:331.59,333.25 2 1
 github.com/muety/wakapi/services/summary.go:336.2,336.32 1 1
 github.com/muety/wakapi/services/summary.go:333.25,335.3 1 1
-github.com/muety/wakapi/services/user.go:16.73,21.2 1 0
-github.com/muety/wakapi/services/user.go:23.74,25.2 1 0
-github.com/muety/wakapi/services/user.go:27.72,29.2 1 0
-github.com/muety/wakapi/services/user.go:31.58,33.2 1 0
-github.com/muety/wakapi/services/user.go:35.88,42.93 2 0
-github.com/muety/wakapi/services/user.go:48.2,48.38 1 0
-github.com/muety/wakapi/services/user.go:42.93,44.3 1 0
-github.com/muety/wakapi/services/user.go:44.8,46.3 1 0
-github.com/muety/wakapi/services/user.go:51.73,53.2 1 0
-github.com/muety/wakapi/services/user.go:55.78,58.2 2 0
-github.com/muety/wakapi/services/user.go:60.79,62.2 1 0
-github.com/muety/wakapi/services/user.go:64.106,66.96 2 0
-github.com/muety/wakapi/services/user.go:71.2,71.68 1 0
-github.com/muety/wakapi/services/user.go:66.96,68.3 1 0
-github.com/muety/wakapi/services/user.go:68.8,70.3 1 0
+github.com/muety/wakapi/services/user.go:19.73,25.2 1 0
+github.com/muety/wakapi/services/user.go:27.74,28.40 1 0
+github.com/muety/wakapi/services/user.go:32.2,33.16 2 0
+github.com/muety/wakapi/services/user.go:37.2,38.15 2 0
+github.com/muety/wakapi/services/user.go:28.40,30.3 1 0
+github.com/muety/wakapi/services/user.go:33.16,35.3 1 0
+github.com/muety/wakapi/services/user.go:41.72,42.37 1 0
+github.com/muety/wakapi/services/user.go:46.2,47.16 2 0
+github.com/muety/wakapi/services/user.go:51.2,52.15 2 0
+github.com/muety/wakapi/services/user.go:42.37,44.3 1 0
+github.com/muety/wakapi/services/user.go:47.16,49.3 1 0
+github.com/muety/wakapi/services/user.go:55.76,57.2 1 0
+github.com/muety/wakapi/services/user.go:59.86,61.2 1 0
+github.com/muety/wakapi/services/user.go:63.58,65.2 1 0
+github.com/muety/wakapi/services/user.go:67.61,70.2 2 0
+github.com/muety/wakapi/services/user.go:72.48,74.2 1 0
+github.com/muety/wakapi/services/user.go:76.102,85.93 2 0
+github.com/muety/wakapi/services/user.go:91.2,91.38 1 0
+github.com/muety/wakapi/services/user.go:85.93,87.3 1 0
+github.com/muety/wakapi/services/user.go:87.8,89.3 1 0
+github.com/muety/wakapi/services/user.go:94.73,97.2 2 0
+github.com/muety/wakapi/services/user.go:99.78,103.2 3 0
+github.com/muety/wakapi/services/user.go:105.99,108.2 2 0
+github.com/muety/wakapi/services/user.go:110.106,113.96 3 0
+github.com/muety/wakapi/services/user.go:118.2,118.68 1 0
+github.com/muety/wakapi/services/user.go:113.96,115.3 1 0
+github.com/muety/wakapi/services/user.go:115.8,117.3 1 0
+github.com/muety/wakapi/services/user.go:121.85,123.2 1 0
+github.com/muety/wakapi/services/user.go:125.57,128.2 2 0
+github.com/muety/wakapi/services/user.go:130.38,132.2 1 0

entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ "$WAKAPI_DB_TYPE" == "sqlite3" ] || [ "$WAKAPI_DB_TYPE" == "" ]; then
+  ./wakapi
+else
+  echo "Waiting for database to come up"
+  ./wait-for-it.sh   "$WAKAPI_DB_HOST:$WAKAPI_DB_PORT" -s -t 60 -- ./wakapi
+fi

go.mod

@@ -3,26 +3,34 @@ module github.com/muety/wakapi
 go 1.13
 
 require (
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
+	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
+	github.com/emersion/go-smtp v0.15.0
+	github.com/emvi/logbuch v1.1.1
+	github.com/getsentry/sentry-go v0.10.0
 	github.com/go-co-op/gocron v0.3.3
+	github.com/go-openapi/spec v0.20.2 // indirect
 	github.com/gorilla/handlers v1.4.2
 	github.com/gorilla/mux v1.7.3
 	github.com/gorilla/schema v1.1.0
 	github.com/gorilla/securecookie v1.1.1
 	github.com/jinzhu/configor v1.2.0
-	github.com/joho/godotenv v1.3.0
-	github.com/kr/text v0.2.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/markbates/pkger v0.17.1
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/mitchellh/hashstructure/v2 v2.0.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc
 	github.com/satori/go.uuid v1.2.0
 	github.com/stretchr/testify v1.6.1
+	github.com/swaggo/swag v1.7.0
+	go.uber.org/atomic v1.6.0
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/ini.v1 v1.50.0
-	gopkg.in/yaml.v2 v2.2.8
+	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
+	golang.org/x/tools v0.1.0 // indirect
 	gorm.io/driver/mysql v1.0.3
 	gorm.io/driver/postgres v1.0.5
 	gorm.io/driver/sqlite v1.1.3
-	gorm.io/gorm v1.20.5
+	gorm.io/gorm v1.20.11
 )

go.sum

@@ -1,13 +1,26 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
+github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
+github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
+github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -21,6 +34,7 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
+github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -35,6 +49,7 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -42,7 +57,9 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+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/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -50,28 +67,68 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 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/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-smtp v0.15.0 h1:3+hMGMGrqP/lqd7qoxZc1hTU8LY8gHV9RFGWlqSDmP8=
+github.com/emersion/go-smtp v0.15.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
+github.com/emvi/logbuch v1.1.1 h1:poBGNbHy/nB95oNoqLKAaJoBrcKxTO0W9DhMijKEkkU=
+github.com/emvi/logbuch v1.1.1/go.mod h1:J2Wgbr3BuSc1JO+D2MBVh6q3WPVSK5GzktwWz8pvkKw=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
+github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/getsentry/sentry-go v0.10.0 h1:6gwY+66NHKqyZrdi6O2jGdo7wGdo9b3B69E01NFgT5g=
+github.com/getsentry/sentry-go v0.10.0/go.mod h1:kELm/9iCblqUYh+ZRML7PNdCvEuw24wBvJPYyi86cws=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-co-op/gocron v0.3.3 h1:QnarcMZWWKrEP25uCbtDiLsnnGw+PhCjL3wNITdWJOs=
 github.com/go-co-op/gocron v0.3.3/go.mod h1:Y9PWlYqDChf2Nbgg7kfS+ZsXHDTZbMZYPEQ0MILqH+M=
+github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.19.4 h1:3Vw+rh13uq2JFNxgnMTGE1rnoieU9FmyE1gvnyylsYg=
+github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM=
+github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/spec v0.19.14 h1:r4fbYFo6N4ZelmSX8G6p+cv/hZRXzcuqQIADGT1iNKM=
+github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA=
+github.com/go-openapi/spec v0.20.2 h1:pFPUZsiIbZ20kLUcuCGeuQWG735fPMxW7wHF9BWlnQU=
+github.com/go-openapi/spec v0.20.2/go.mod h1:RW6Xcbs6LOyWLU/mXGdzn2Qc+3aj+ASfI7rvSZh1Vls=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.11 h1:RFTu/dlFySpyVvJDfp/7674JY4SDglYWKztbiIGFpmc=
+github.com/go-openapi/swag v0.19.11/go.mod h1:Uc0gKkdR+ojzsEpjh39QChyu92vPgIr72POcgHMAgSY=
+github.com/go-openapi/swag v0.19.13 h1:233UVgMy1DlmCYYfOiFpta6e2urloh+sEs5id6lyzog=
+github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-redis/redis v6.15.5+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -81,12 +138,17 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
 github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8=
 github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
+github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
+github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
 github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg=
 github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
 github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4=
 github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
 github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
 github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg=
 github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
@@ -94,7 +156,6 @@ github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFG
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -104,12 +165,15 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -126,6 +190,7 @@ github.com/gorilla/schema v1.1.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlI
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
@@ -152,8 +217,14 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
+github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
+github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
+github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
+github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
+github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
+github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
 github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
@@ -216,14 +287,26 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
 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/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
+github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
+github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
+github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
+github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
+github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -234,6 +317,8 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -243,6 +328,14 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno=
+github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -261,13 +354,18 @@ github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO
 github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
+github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/hashstructure/v2 v2.0.1 h1:L60q1+q7cXE4JeEJJKMnh2brFIe3rZxCihYAB61ypAY=
+github.com/mitchellh/hashstructure/v2 v2.0.1/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -275,6 +373,7 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
@@ -293,8 +392,10 @@ github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2f
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -313,6 +414,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -348,16 +451,22 @@ github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OK
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc h1:+2DdDcxVYlarHjYcZTt8dZ4Ec8cXZirzL5ko0mkKPjU=
 github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc/go.mod h1:DCgfY80j8GYL7MLEfvcpSFvjD0L5yZq/aZUJmhZklyg=
+github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+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/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+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/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
@@ -387,16 +496,36 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E=
+github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
@@ -408,6 +537,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
@@ -428,6 +558,7 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -436,9 +567,12 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
+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=
@@ -450,12 +584,21 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/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-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -465,6 +608,8 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -481,6 +626,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -488,19 +634,32 @@ golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+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-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+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 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181221001348-537d06c36207/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-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -509,13 +668,21 @@ golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200103221440-774c71fcf114 h1:DnSr2mCsxyCE6ZgIkmcWUQY2R5cH/6wL7eIxEmQOMSE=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e h1:t96dS3DO8DGjawSLJL/HIdz8CycAd2v07XxqB3UPTi0=
+golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 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=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -544,22 +711,32 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw=
 gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
-gopkg.in/ini.v1 v1.50.0 h1:c/4YI/GUgB7d2yOkxdsQyYDhW67nWrTl6Zyd9vagYmg=
-gopkg.in/ini.v1 v1.50.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7/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-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/mysql v1.0.3 h1:+JKBYPfn1tygR1/of/Fh2T8iwuVwzt+PEJmKaXzMQXg=
 gorm.io/driver/mysql v1.0.3/go.mod h1:twGxftLBlFgNVNakL7F+P/x9oYqoymG3YYT8cAfI9oI=
 gorm.io/driver/postgres v1.0.5 h1:raX6ezL/ciUmaYTvOq48jq1GE95aMC0CmxQYbxQ4Ufw=
@@ -568,8 +745,8 @@ gorm.io/driver/sqlite v1.1.3 h1:BYfdVuZB5He/u9dt4qDpZqiqDJ6KhPqs5QUqsr/Eeuc=
 gorm.io/driver/sqlite v1.1.3/go.mod h1:AKDgRWk8lcSQSw+9kxCJnX/yySj8G3rdwYlU57cB45c=
 gorm.io/gorm v1.20.1/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.20.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-gorm.io/gorm v1.20.5 h1:g3tpSF9kggASzReK+Z3dYei1IJODLqNUbOjSuCczY8g=
-gorm.io/gorm v1.20.5/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.11 h1:jYHQ0LLUViV85V8dM1TP9VBBkfzKTnuTXDjYObkI6yc=
+gorm.io/gorm v1.20.11/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 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=

main.go

@@ -1,12 +1,21 @@
 package main
 
+//go:generate $GOPATH/bin/pkger
+
 import (
+	"github.com/emvi/logbuch"
 	"github.com/gorilla/handlers"
+	"github.com/markbates/pkger"
 	conf "github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/migrations/common"
+	"github.com/muety/wakapi/migrations"
 	"github.com/muety/wakapi/repositories"
+	"github.com/muety/wakapi/routes/api"
+	"github.com/muety/wakapi/services/mail"
+	"github.com/muety/wakapi/utils"
+	"gorm.io/gorm/logger"
 	"log"
 	"net/http"
+	"os"
 	"strconv"
 	"time"
 
@@ -43,22 +52,56 @@ var (
 	languageMappingService services.ILanguageMappingService
 	summaryService         services.ISummaryService
 	aggregationService     services.IAggregationService
+	mailService            services.IMailService
 	keyValueService        services.IKeyValueService
+	miscService            services.IMiscService
 )
 
 // TODO: Refactor entire project to be structured after business domains
 
+// @title Wakapi API
+// @version 1.0
+// @description REST API to interact with [Wakapi](https://wakapi.dev)
+// @description
+// @description ## Authentication
+// @description Set header `Authorization` to your API Key encoded as Base64 and prefixed with `Basic`
+// @description **Example:** `Basic ODY2NDhkNzQtMTljNS00NTJiLWJhMDEtZmIzZWM3MGQ0YzJmCg==`
+
+// @contact.name Ferdinand Mütsch
+// @contact.url https://github.com/muety
+// @contact.email ferdinand@muetsch.io
+
+// @license.name GPL-3.0
+// @license.url https://github.com/muety/wakapi/blob/master/LICENSE
+
+// @securitydefinitions.apikey ApiKeyAuth
+// @in header
+// @name Authorization
+
+// @BasePath /api
 func main() {
 	config = conf.Load()
 
-	// Enable line numbers in logging
+	// Set log level
 	if config.IsDev() {
-		log.SetFlags(log.LstdFlags | log.Lshortfile)
+		logbuch.SetLevel(logbuch.LevelDebug)
+	} else {
+		logbuch.SetLevel(logbuch.LevelInfo)
 	}
 
+	// Set up GORM
+	gormLogger := logger.New(
+		log.New(os.Stdout, "", log.LstdFlags),
+		logger.Config{
+			SlowThreshold: time.Minute,
+			Colorful:      false,
+			LogLevel:      logger.Silent,
+		},
+	)
+
 	// Connect to database
 	var err error
-	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{})
+	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{Logger: gormLogger})
 	if config.Db.Dialect == "sqlite3" {
 		db.Raw("PRAGMA foreign_keys = ON;")
 	}
@@ -70,15 +113,13 @@ func main() {
 	sqlDb.SetMaxIdleConns(int(config.Db.MaxConn))
 	sqlDb.SetMaxOpenConns(int(config.Db.MaxConn))
 	if err != nil {
-		log.Println(err)
-		log.Fatal("could not connect to database")
+		logbuch.Error(err.Error())
+		logbuch.Fatal("could not connect to database")
 	}
 	defer sqlDb.Close()
 
 	// Migrate database schema
-	common.RunCustomPreMigrations(db, config)
-	runDatabaseMigrations()
-	common.RunCustomPostMigrations(db, config)
+	migrations.Run(db, config)
 
 	// Repositories
 	aliasRepository = repositories.NewAliasRepository(db)
@@ -95,102 +136,137 @@ func main() {
 	heartbeatService = services.NewHeartbeatService(heartbeatRepository, languageMappingService)
 	summaryService = services.NewSummaryService(summaryRepository, heartbeatService, aliasService)
 	aggregationService = services.NewAggregationService(userService, summaryService, heartbeatService)
+	mailService = mail.NewMailService()
 	keyValueService = services.NewKeyValueService(keyValueRepository)
+	miscService = services.NewMiscService(userService, summaryService, keyValueService)
 
-	// Aggregate heartbeats to summaries and persist them
+	// Schedule background tasks
 	go aggregationService.Schedule()
-
-	// TODO: move endpoint registration to the respective routes files
+	go miscService.ScheduleCountTotalTime()
 
 	routes.Init()
 
-	// Handlers
-	summaryHandler := routes.NewSummaryHandler(summaryService)
-	healthHandler := routes.NewHealthHandler(db)
-	heartbeatHandler := routes.NewHeartbeatHandler(heartbeatService, languageMappingService)
-	settingsHandler := routes.NewSettingsHandler(userService, summaryService, aggregationService, languageMappingService)
-	homeHandler := routes.NewHomeHandler()
-	loginHandler := routes.NewLoginHandler(userService)
-	imprintHandler := routes.NewImprintHandler(keyValueService)
-	wakatimeV1AllHandler := wtV1Routes.NewAllTimeHandler(summaryService)
-	wakatimeV1SummariesHandler := wtV1Routes.NewSummariesHandler(summaryService)
+	// API Handlers
+	healthApiHandler := api.NewHealthApiHandler(db)
+	heartbeatApiHandler := api.NewHeartbeatApiHandler(userService, heartbeatService, languageMappingService)
+	summaryApiHandler := api.NewSummaryApiHandler(userService, summaryService)
+	metricsHandler := api.NewMetricsHandler(userService, summaryService, heartbeatService, keyValueService)
+
+	// Compat Handlers
+	wakatimeV1AllHandler := wtV1Routes.NewAllTimeHandler(userService, summaryService)
+	wakatimeV1SummariesHandler := wtV1Routes.NewSummariesHandler(userService, summaryService)
+	wakatimeV1StatsHandler := wtV1Routes.NewStatsHandler(userService, summaryService)
 	shieldV1BadgeHandler := shieldsV1Routes.NewBadgeHandler(summaryService, userService)
 
+	// MVC Handlers
+	summaryHandler := routes.NewSummaryHandler(summaryService, userService)
+	settingsHandler := routes.NewSettingsHandler(userService, heartbeatService, summaryService, aliasService, aggregationService, languageMappingService, keyValueService, mailService)
+	homeHandler := routes.NewHomeHandler(keyValueService)
+	loginHandler := routes.NewLoginHandler(userService, mailService)
+	imprintHandler := routes.NewImprintHandler(keyValueService)
+
 	// Setup Routers
 	router := mux.NewRouter()
-	publicRouter := router.PathPrefix("/").Subrouter()
-	settingsRouter := publicRouter.PathPrefix("/settings").Subrouter()
-	summaryRouter := publicRouter.PathPrefix("/summary").Subrouter()
-	apiRouter := router.PathPrefix("/api").Subrouter()
-	compatRouter := apiRouter.PathPrefix("/compat").Subrouter()
-	wakatimeV1Router := compatRouter.PathPrefix("/wakatime/v1").Subrouter()
-	shieldsV1Router := compatRouter.PathPrefix("/shields/v1").Subrouter()
+	rootRouter := router.PathPrefix("/").Subrouter()
+	apiRouter := router.PathPrefix("/api").Subrouter().StrictSlash(true)
 
-	// Middlewares
-	recoveryMiddleware := handlers.RecoveryHandler()
-	loggingMiddleware := middlewares.NewLoggingMiddleware().Handler
-	corsMiddleware := handlers.CORS()
-	authenticateMiddleware := middlewares.NewAuthenticateMiddleware(
-		userService,
-		[]string{"/api/health", "/api/compat/shields/v1"},
-	).Handler
+	// Globally used middlewares
+	router.Use(middlewares.NewPrincipalMiddleware())
+	router.Use(middlewares.NewLoggingMiddleware(logbuch.Info, []string{"/assets"}))
+	router.Use(handlers.RecoveryHandler())
+	if config.Sentry.Dsn != "" {
+		router.Use(middlewares.NewSentryMiddleware())
+	}
 
-	// Router configs
-	router.Use(loggingMiddleware, recoveryMiddleware)
-	summaryRouter.Use(authenticateMiddleware)
-	settingsRouter.Use(authenticateMiddleware)
-	apiRouter.Use(corsMiddleware, authenticateMiddleware)
+	// Route registrations
+	homeHandler.RegisterRoutes(rootRouter)
+	loginHandler.RegisterRoutes(rootRouter)
+	imprintHandler.RegisterRoutes(rootRouter)
+	summaryHandler.RegisterRoutes(rootRouter)
+	settingsHandler.RegisterRoutes(rootRouter)
 
-	// Public Routes
-	publicRouter.Path("/").Methods(http.MethodGet).HandlerFunc(homeHandler.GetIndex)
-	publicRouter.Path("/login").Methods(http.MethodGet).HandlerFunc(loginHandler.GetIndex)
-	publicRouter.Path("/login").Methods(http.MethodPost).HandlerFunc(loginHandler.PostLogin)
-	publicRouter.Path("/logout").Methods(http.MethodPost).HandlerFunc(loginHandler.PostLogout)
-	publicRouter.Path("/signup").Methods(http.MethodGet).HandlerFunc(loginHandler.GetSignup)
-	publicRouter.Path("/signup").Methods(http.MethodPost).HandlerFunc(loginHandler.PostSignup)
-	publicRouter.Path("/imprint").Methods(http.MethodGet).HandlerFunc(imprintHandler.GetImprint)
-
-	// Summary Routes
-	summaryRouter.Methods(http.MethodGet).HandlerFunc(summaryHandler.GetIndex)
-
-	// Settings Routes
-	settingsRouter.Methods(http.MethodGet).HandlerFunc(settingsHandler.GetIndex)
-	settingsRouter.Path("/credentials").Methods(http.MethodPost).HandlerFunc(settingsHandler.PostCredentials)
-	settingsRouter.Path("/language_mappings").Methods(http.MethodPost).HandlerFunc(settingsHandler.PostLanguageMapping)
-	settingsRouter.Path("/language_mappings/delete").Methods(http.MethodPost).HandlerFunc(settingsHandler.DeleteLanguageMapping)
-	settingsRouter.Path("/reset").Methods(http.MethodPost).HandlerFunc(settingsHandler.PostResetApiKey)
-	settingsRouter.Path("/badges").Methods(http.MethodPost).HandlerFunc(settingsHandler.PostToggleBadges)
-	settingsRouter.Path("/regenerate").Methods(http.MethodPost).HandlerFunc(settingsHandler.PostRegenerateSummaries)
-
-	// API Routes
-	apiRouter.Path("/heartbeat").Methods(http.MethodPost).HandlerFunc(heartbeatHandler.ApiPost)
-	apiRouter.Path("/summary").Methods(http.MethodGet).HandlerFunc(summaryHandler.ApiGet)
-	apiRouter.Path("/health").Methods(http.MethodGet).HandlerFunc(healthHandler.ApiGet)
-
-	// Wakatime compat V1 API Routes
-	wakatimeV1Router.Path("/users/{user}/all_time_since_today").Methods(http.MethodGet).HandlerFunc(wakatimeV1AllHandler.ApiGet)
-	wakatimeV1Router.Path("/users/{user}/summaries").Methods(http.MethodGet).HandlerFunc(wakatimeV1SummariesHandler.ApiGet)
-
-	// Shields.io compat API Routes
-	shieldsV1Router.PathPrefix("/{user}").Methods(http.MethodGet).HandlerFunc(shieldV1BadgeHandler.ApiGet)
+	// API route registrations
+	summaryApiHandler.RegisterRoutes(apiRouter)
+	healthApiHandler.RegisterRoutes(apiRouter)
+	heartbeatApiHandler.RegisterRoutes(apiRouter)
+	metricsHandler.RegisterRoutes(apiRouter)
+	wakatimeV1AllHandler.RegisterRoutes(apiRouter)
+	wakatimeV1SummariesHandler.RegisterRoutes(apiRouter)
+	wakatimeV1StatsHandler.RegisterRoutes(apiRouter)
+	shieldV1BadgeHandler.RegisterRoutes(apiRouter)
 
 	// Static Routes
-	router.PathPrefix("/assets").Handler(http.FileServer(http.Dir("./static")))
+	fileServer := http.FileServer(utils.NeuteredFileSystem{Fs: pkger.Dir("/static")})
+	router.PathPrefix("/assets").Handler(fileServer)
+	router.PathPrefix("/swagger-ui").Handler(fileServer)
+	router.PathPrefix("/docs").Handler(
+		middlewares.NewFileTypeFilterMiddleware([]string{".go"})(fileServer),
+	)
 
 	// Listen HTTP
-	portString := config.Server.ListenIpV4 + ":" + strconv.Itoa(config.Server.Port)
-	s := &http.Server{
-		Handler:      router,
-		Addr:         portString,
-		ReadTimeout:  10 * time.Second,
-		WriteTimeout: 10 * time.Second,
-	}
-	log.Printf("Listening on %+s\n", portString)
-	s.ListenAndServe()
+	listen(router)
 }
 
-func runDatabaseMigrations() {
-	if err := config.GetMigrationFunc(config.Db.Dialect)(db); err != nil {
-		log.Fatal(err)
+func listen(handler http.Handler) {
+	var s4, s6 *http.Server
+
+	// IPv4
+	if config.Server.ListenIpV4 != "" {
+		bindString4 := config.Server.ListenIpV4 + ":" + strconv.Itoa(config.Server.Port)
+		s4 = &http.Server{
+			Handler:      handler,
+			Addr:         bindString4,
+			ReadTimeout:  10 * time.Second,
+			WriteTimeout: 10 * time.Second,
+		}
 	}
+
+	// IPv6
+	if config.Server.ListenIpV6 != "" {
+		bindString6 := "[" + config.Server.ListenIpV6 + "]:" + strconv.Itoa(config.Server.Port)
+		s6 = &http.Server{
+			Handler:      handler,
+			Addr:         bindString6,
+			ReadTimeout:  10 * time.Second,
+			WriteTimeout: 10 * time.Second,
+		}
+	}
+
+	if config.UseTLS() {
+		if s4 != nil {
+			logbuch.Info("--> Listening for HTTPS on %s... ✅", s4.Addr)
+			go func() {
+				if err := s4.ListenAndServeTLS(config.Server.TlsCertPath, config.Server.TlsKeyPath); err != nil {
+					logbuch.Fatal(err.Error())
+				}
+			}()
+		}
+		if s6 != nil {
+			logbuch.Info("--> Listening for HTTPS on %s... ✅", s6.Addr)
+			go func() {
+				if err := s6.ListenAndServeTLS(config.Server.TlsCertPath, config.Server.TlsKeyPath); err != nil {
+					logbuch.Fatal(err.Error())
+				}
+			}()
+		}
+	} else {
+		if s4 != nil {
+			logbuch.Info("--> Listening for HTTP on %s... ✅", s4.Addr)
+			go func() {
+				if err := s4.ListenAndServe(); err != nil {
+					logbuch.Fatal(err.Error())
+				}
+			}()
+		}
+		if s6 != nil {
+			logbuch.Info("--> Listening for HTTP on %s... ✅", s6.Addr)
+			go func() {
+				if err := s6.ListenAndServe(); err != nil {
+					logbuch.Fatal(err.Error())
+				}
+			}()
+		}
+	}
+
+	<-make(chan interface{}, 1)
 }

middlewares/authenticate.go

@@ -1,38 +1,39 @@
 package middlewares
 
 import (
-	"context"
-	"errors"
-	"fmt"
 	conf "github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/utils"
-	"log"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/patrickmn/go-cache"
-
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+	"strings"
 )
 
 type AuthenticateMiddleware struct {
-	config         *conf.Config
-	cache          *cache.Cache
-	userSrvc       services.IUserService
-	whitelistPaths []string
+	config           *conf.Config
+	userSrvc         services.IUserService
+	optionalForPaths []string
+	redirectTarget   string // optional
 }
 
-func NewAuthenticateMiddleware(userService services.IUserService, whitelistPaths []string) *AuthenticateMiddleware {
+func NewAuthenticateMiddleware(userService services.IUserService) *AuthenticateMiddleware {
 	return &AuthenticateMiddleware{
-		config:         conf.Get(),
-		userSrvc:       userService,
-		cache:          cache.New(1*time.Hour, 2*time.Hour),
-		whitelistPaths: whitelistPaths,
+		config:           conf.Get(),
+		userSrvc:         userService,
+		optionalForPaths: []string{},
 	}
 }
 
+func (m *AuthenticateMiddleware) WithOptionalFor(paths []string) *AuthenticateMiddleware {
+	m.optionalForPaths = paths
+	return m
+}
+
+func (m *AuthenticateMiddleware) WithRedirectTarget(path string) *AuthenticateMiddleware {
+	m.redirectTarget = path
+	return m
+}
+
 func (m *AuthenticateMiddleware) Handler(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		m.ServeHTTP(w, r, h.ServeHTTP)
@@ -40,13 +41,6 @@ func (m *AuthenticateMiddleware) Handler(h http.Handler) http.Handler {
 }
 
 func (m *AuthenticateMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
-	for _, p := range m.whitelistPaths {
-		if strings.HasPrefix(r.URL.Path, p) || r.URL.Path == p {
-			next(w, r)
-			return
-		}
-	}
-
 	var user *models.User
 	user, err := m.tryGetUserByCookie(r)
 
@@ -54,20 +48,33 @@ func (m *AuthenticateMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reques
 		user, err = m.tryGetUserByApiKey(r)
 	}
 
-	if err != nil {
-		if strings.HasPrefix(r.URL.Path, "/api") {
+	if err != nil || user == nil {
+		if m.isOptional(r.URL.Path) {
+			next(w, r)
+			return
+		}
+
+		if m.redirectTarget == "" {
 			w.WriteHeader(http.StatusUnauthorized)
+			w.Write([]byte(conf.ErrUnauthorized))
 		} else {
 			http.SetCookie(w, m.config.GetClearCookie(models.AuthCookieKey, "/"))
-			http.Redirect(w, r, fmt.Sprintf("%s/?error=unauthorized", m.config.Server.BasePath), http.StatusFound)
+			http.Redirect(w, r, m.redirectTarget, http.StatusFound)
 		}
 		return
 	}
 
-	m.cache.Set(user.ID, user, cache.DefaultExpiration)
+	SetPrincipal(r, user)
+	next(w, r)
+}
 
-	ctx := context.WithValue(r.Context(), models.UserKey, user)
-	next(w, r.WithContext(ctx))
+func (m *AuthenticateMiddleware) isOptional(requestPath string) bool {
+	for _, p := range m.optionalForPaths {
+		if strings.HasPrefix(requestPath, p) || requestPath == p {
+			return true
+		}
+	}
+	return false
 }
 
 func (m *AuthenticateMiddleware) tryGetUserByApiKey(r *http.Request) (*models.User, error) {
@@ -78,51 +85,26 @@ func (m *AuthenticateMiddleware) tryGetUserByApiKey(r *http.Request) (*models.Us
 
 	var user *models.User
 	userKey := strings.TrimSpace(key)
-	cachedUser, ok := m.cache.Get(userKey)
-	if !ok {
-		user, err = m.userSrvc.GetUserByKey(userKey)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		user = cachedUser.(*models.User)
+	user, err = m.userSrvc.GetUserByKey(userKey)
+	if err != nil {
+		return nil, err
 	}
 	return user, nil
 }
 
 func (m *AuthenticateMiddleware) tryGetUserByCookie(r *http.Request) (*models.User, error) {
-	login, err := utils.ExtractCookieAuth(r, m.config)
+	username, err := utils.ExtractCookieAuth(r, m.config)
 	if err != nil {
 		return nil, err
 	}
 
-	cachedUser, ok := m.cache.Get(login.Username)
-
-	if ok {
-		return cachedUser.(*models.User), nil
-	}
-
-	user, err := m.userSrvc.GetUserById(login.Username)
+	user, err := m.userSrvc.GetUserById(*username)
 	if err != nil {
 		return nil, err
 	}
 
-	if !CheckAndMigratePassword(user, login, m.config.Security.PasswordSalt, &m.userSrvc) {
-		return nil, errors.New("invalid password")
-	}
+	// no need to check password here, as securecookie decoding will fail anyway,
+	// if cookie is not properly signed
 
 	return user, nil
 }
-
-// migrate old md5-hashed passwords to new salted bcrypt hashes for backwards compatibility
-func CheckAndMigratePassword(user *models.User, login *models.Login, salt string, userServiceRef *services.IUserService) bool {
-	if utils.IsMd5(user.Password) {
-		if utils.CompareMd5(user.Password, login.Password, "") {
-			log.Printf("migrating old md5 password to new bcrypt format for user '%s'", user.ID)
-			(*userServiceRef).MigrateMd5Password(user, login)
-			return true
-		}
-		return false
-	}
-	return utils.CompareBcrypt(user.Password, login.Password, salt)
-}

middlewares/authenticate_test.go

@@ -6,7 +6,6 @@ import (
 	"github.com/muety/wakapi/mocks"
 	"github.com/muety/wakapi/models"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 	"net/http"
 	"testing"
 )
@@ -25,7 +24,7 @@ func TestAuthenticateMiddleware_tryGetUserByApiKey_Success(t *testing.T) {
 	userServiceMock := new(mocks.UserServiceMock)
 	userServiceMock.On("GetUserByKey", testApiKey).Return(testUser, nil)
 
-	sut := NewAuthenticateMiddleware(userServiceMock, []string{})
+	sut := NewAuthenticateMiddleware(userServiceMock)
 
 	result, err := sut.tryGetUserByApiKey(mockRequest)
 
@@ -33,30 +32,6 @@ func TestAuthenticateMiddleware_tryGetUserByApiKey_Success(t *testing.T) {
 	assert.Equal(t, testUser, result)
 }
 
-func TestAuthenticateMiddleware_tryGetUserByApiKey_GetFromCache(t *testing.T) {
-	testApiKey := "z5uig69cn9ut93n"
-	testToken := base64.StdEncoding.EncodeToString([]byte(testApiKey))
-	testUser := &models.User{ApiKey: testApiKey}
-
-	mockRequest := &http.Request{
-		Header: http.Header{
-			"Authorization": []string{fmt.Sprintf("Basic %s", testToken)},
-		},
-	}
-
-	userServiceMock := new(mocks.UserServiceMock)
-	userServiceMock.On("GetUserByKey", testApiKey).Return(testUser, nil)
-
-	sut := NewAuthenticateMiddleware(userServiceMock, []string{})
-	sut.cache.SetDefault(testApiKey, testUser)
-
-	result, err := sut.tryGetUserByApiKey(mockRequest)
-
-	assert.Nil(t, err)
-	assert.Equal(t, testUser, result)
-	userServiceMock.AssertNotCalled(t, "GetUserByKey", mock.Anything)
-}
-
 func TestAuthenticateMiddleware_tryGetUserByApiKey_InvalidHeader(t *testing.T) {
 	testApiKey := "z5uig69cn9ut93n"
 	testToken := base64.StdEncoding.EncodeToString([]byte(testApiKey))
@@ -70,7 +45,7 @@ func TestAuthenticateMiddleware_tryGetUserByApiKey_InvalidHeader(t *testing.T) {
 
 	userServiceMock := new(mocks.UserServiceMock)
 
-	sut := NewAuthenticateMiddleware(userServiceMock, []string{})
+	sut := NewAuthenticateMiddleware(userServiceMock)
 
 	result, err := sut.tryGetUserByApiKey(mockRequest)
 

middlewares/custom/wakatime.go

@@ -0,0 +1,94 @@
+package relay
+
+import (
+	"bytes"
+	"encoding/base64"
+	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"time"
+)
+
+/* Middleware to conditionally relay heartbeats to Wakatime */
+type WakatimeRelayMiddleware struct {
+	httpClient *http.Client
+}
+
+func NewWakatimeRelayMiddleware() *WakatimeRelayMiddleware {
+	return &WakatimeRelayMiddleware{
+		httpClient: &http.Client{
+			Timeout: 10 * time.Second,
+		},
+	}
+}
+
+func (m *WakatimeRelayMiddleware) Handler(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		m.ServeHTTP(w, r, h.ServeHTTP)
+	})
+}
+
+func (m *WakatimeRelayMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
+	defer next(w, r)
+
+	if r.Method != http.MethodPost {
+		return
+	}
+
+	user := middlewares.GetPrincipal(r)
+	if user == nil || user.WakatimeApiKey == "" {
+		return
+	}
+
+	body, _ := ioutil.ReadAll(r.Body)
+	r.Body.Close()
+	r.Body = ioutil.NopCloser(bytes.NewBuffer(body))
+
+	headers := http.Header{
+		"X-Machine-Name": r.Header.Values("X-Machine-Name"),
+		"Content-Type":   r.Header.Values("Content-Type"),
+		"Accept":         r.Header.Values("Accept"),
+		"User-Agent":     r.Header.Values("User-Agent"),
+		"X-Origin": []string{
+			fmt.Sprintf("wakapi v%s", config.Get().Version),
+		},
+		"Authorization": []string{
+			fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(user.WakatimeApiKey))),
+		},
+	}
+
+	go m.send(
+		http.MethodPost,
+		config.WakatimeApiUrl+config.WakatimeApiHeartbeatsBulkUrl,
+		bytes.NewReader(body),
+		headers,
+	)
+}
+
+func (m *WakatimeRelayMiddleware) send(method, url string, body io.Reader, headers http.Header) {
+	request, err := http.NewRequest(method, url, body)
+	if err != nil {
+		logbuch.Warn("error constructing relayed request – %v", err)
+		return
+	}
+
+	for k, v := range headers {
+		for _, h := range v {
+			request.Header.Set(k, h)
+		}
+	}
+
+	response, err := m.httpClient.Do(request)
+	if err != nil {
+		logbuch.Warn("error executing relayed request – %v", err)
+		return
+	}
+
+	if response.StatusCode < 200 || response.StatusCode >= 300 {
+		logbuch.Warn("failed to relay request, got status %d", response.StatusCode)
+	}
+}

middlewares/filetype.go

@@ -0,0 +1,32 @@
+package middlewares
+
+import (
+	"net/http"
+	"strings"
+)
+
+type SuffixFilterMiddleware struct {
+	handler     http.Handler
+	filterTypes []string
+}
+
+func NewFileTypeFilterMiddleware(filter []string) func(http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return &SuffixFilterMiddleware{
+			handler:     h,
+			filterTypes: filter,
+		}
+	}
+}
+
+func (f *SuffixFilterMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	path := strings.ToLower(r.URL.Path)
+	for _, t := range f.filterTypes {
+		if strings.HasSuffix(path, strings.ToLower(t)) {
+			w.WriteHeader(http.StatusForbidden)
+			w.Write([]byte("403 forbidden"))
+			return
+		}
+	}
+	f.handler.ServeHTTP(w, r)
+}

middlewares/logging.go

@@ -1,17 +1,153 @@
 package middlewares
 
+// Borrowed from https://gist.github.com/elithrar/887d162dfd0c539b700ab4049c76e22b
+
 import (
-	"github.com/gorilla/handlers"
+	"io"
 	"net/http"
-	"os"
+	"strings"
+	"time"
 )
 
-type LoggingMiddleware struct{}
+type logFunc func(string, ...interface{})
 
-func NewLoggingMiddleware() *LoggingMiddleware {
-	return &LoggingMiddleware{}
+type LoggingMiddleware struct {
+	handler         http.Handler
+	logFunc         logFunc
+	excludePrefixes []string
 }
 
-func (m *LoggingMiddleware) Handler(h http.Handler) http.Handler {
-	return handlers.LoggingHandler(os.Stdout, h)
+func NewLoggingMiddleware(logFunc logFunc, excludePrefixes []string) func(http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return &LoggingMiddleware{
+			handler:         h,
+			logFunc:         logFunc,
+			excludePrefixes: excludePrefixes,
+		}
+	}
+}
+
+func (lg *LoggingMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ww := wrapWriter(w)
+
+	start := time.Now()
+	lg.handler.ServeHTTP(ww, r)
+	end := time.Now()
+	duration := end.Sub(start)
+
+	path := strings.ToLower(r.URL.Path)
+	for _, prefix := range lg.excludePrefixes {
+		if strings.HasPrefix(path, prefix) {
+			return
+		}
+	}
+
+	lg.logFunc(
+		"[request] status=%d, method=%s, uri=%s, duration=%v, bytes=%d, addr=%s, user=%s",
+		ww.Status(),
+		r.Method,
+		r.URL.String(),
+		duration,
+		ww.BytesWritten(),
+		readUserIP(r),
+		readUserID(r),
+	)
+}
+
+func readUserIP(r *http.Request) string {
+	ip := r.Header.Get("X-Real-Ip")
+	if ip == "" {
+		ip = r.Header.Get("X-Forwarded-For")
+	}
+	if ip == "" {
+		ip = r.RemoteAddr
+	}
+	return ip
+}
+
+func readUserID(r *http.Request) string {
+	if user := GetPrincipal(r); user != nil {
+		return user.ID
+	}
+	return "-"
+}
+
+// The below writer-wrapping code has been lifted from
+// https://github.com/zenazn/goji/blob/master/web/middleware/logger.go - because
+// it does exactly what is needed, and it's unlikely to change in any
+// significant way that makes copying worse-off than importing. MIT licensed
+// and (c) Carl Jackson.
+
+// writerProxy is a proxy around an http.ResponseWriter that allows you to hook
+// into various parts of the response process.
+type writerProxy interface {
+	http.ResponseWriter
+	// Status returns the HTTP status of the request, or 0 if one has not
+	// yet been sent.
+	Status() int
+	// BytesWritten returns the total number of bytes sent to the client.
+	BytesWritten() int
+	// Tee causes the response body to be written to the given io.Writer in
+	// addition to proxying the writes through. Only one io.Writer can be
+	// tee'd to at once: setting a second one will overwrite the first.
+	// Writes will be sent to the proxy before being written to this
+	// io.Writer. It is illegal for the tee'd writer to be modified
+	// concurrently with writes.
+	Tee(io.Writer)
+	// Unwrap returns the original proxied target.
+	Unwrap() http.ResponseWriter
+}
+
+// wrapWriter wraps an http.ResponseWriter, returning a proxy that allows you to
+// hook into various parts of the response process.
+func wrapWriter(w http.ResponseWriter) writerProxy {
+	return &basicWriter{ResponseWriter: w}
+}
+
+// basicWriter wraps a http.ResponseWriter that implements the minimal
+// http.ResponseWriter interface.
+type basicWriter struct {
+	http.ResponseWriter
+	wroteHeader bool
+	code        int
+	bytes       int
+	tee         io.Writer
+}
+
+func (b *basicWriter) WriteHeader(code int) {
+	if !b.wroteHeader {
+		b.code = code
+		b.wroteHeader = true
+		b.ResponseWriter.WriteHeader(code)
+	}
+}
+func (b *basicWriter) Write(buf []byte) (int, error) {
+	b.WriteHeader(http.StatusOK)
+	n, err := b.ResponseWriter.Write(buf)
+	if b.tee != nil {
+		_, err2 := b.tee.Write(buf[:n])
+		// Prefer errors generated by the proxied writer.
+		if err == nil {
+			err = err2
+		}
+	}
+	b.bytes += n
+	return n, err
+}
+func (b *basicWriter) maybeWriteHeader() {
+	if !b.wroteHeader {
+		b.WriteHeader(http.StatusOK)
+	}
+}
+func (b *basicWriter) Status() int {
+	return b.code
+}
+func (b *basicWriter) BytesWritten() int {
+	return b.bytes
+}
+func (b *basicWriter) Tee(w io.Writer) {
+	b.tee = w
+}
+func (b *basicWriter) Unwrap() http.ResponseWriter {
+	return b.ResponseWriter
 }

middlewares/principal.go

@@ -0,0 +1,64 @@
+package middlewares
+
+import (
+	"context"
+	"github.com/muety/wakapi/models"
+	"net/http"
+)
+
+const keyPrincipal = "principal"
+
+type PrincipalContainer struct {
+	principal *models.User
+}
+
+func (c *PrincipalContainer) SetPrincipal(user *models.User) {
+	c.principal = user
+}
+
+func (c *PrincipalContainer) GetPrincipal() *models.User {
+	return c.principal
+}
+
+// This middleware is a bit of a dirty workaround to the fact that a http.Request's context
+// does not allow to pass values from an inner to an outer middleware. Calling WithContext() on a
+// request shallow-copies the whole request itself and therefore, in a chain of handler1(handler2()),
+// handler 1 will not have access to values handler 2 writes to its context. In addition, Context.WithValue
+// returns a new context with the old context as a parent.
+//
+// As a concrete example, SentryMiddleware as well as LoggingMiddleware should be quite the outer layers,
+// while AuthenticationMiddleware is on the very inside of the chain. However, we still want sentry or the
+// logger to have access to the user object populated by the auth. middleware, if present.
+//
+// This middleware shall be included as the outermost layers and it injects a stateful container that  does
+// nothing but conditionally hold a reference to an authenticated user object.
+//
+// Other reference: https://stackoverflow.com/questions/55972869/send-errors-to-sentry-with-golang-and-mux
+
+type PrincipalMiddleware struct {
+	handler http.Handler
+}
+
+func NewPrincipalMiddleware() func(handler http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return &PrincipalMiddleware{handler: h}
+	}
+}
+
+func (p *PrincipalMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ctx := context.WithValue(r.Context(), keyPrincipal, &PrincipalContainer{})
+	p.handler.ServeHTTP(w, r.WithContext(ctx))
+}
+
+func SetPrincipal(r *http.Request, user *models.User) {
+	if p := r.Context().Value(keyPrincipal); p != nil {
+		p.(*PrincipalContainer).SetPrincipal(user)
+	}
+}
+
+func GetPrincipal(r *http.Request) *models.User {
+	if p := r.Context().Value(keyPrincipal); p != nil {
+		return p.(*PrincipalContainer).GetPrincipal()
+	}
+	return nil
+}

middlewares/sentry.go

@@ -0,0 +1,30 @@
+package middlewares
+
+import (
+	"context"
+	"github.com/getsentry/sentry-go"
+	sentryhttp "github.com/getsentry/sentry-go/http"
+	"net/http"
+)
+
+type SentryMiddleware struct {
+	handler http.Handler
+}
+
+func NewSentryMiddleware() func(http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return sentryhttp.New(sentryhttp.Options{
+			Repanic: true,
+		}).Handle(&SentryMiddleware{handler: h})
+	}
+}
+
+func (h *SentryMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ctx := context.WithValue(r.Context(), "-", "-")
+	h.handler.ServeHTTP(w, r.WithContext(ctx))
+	if hub := sentry.GetHubFromContext(ctx); hub != nil {
+		if user := GetPrincipal(r); user != nil {
+			hub.Scope().SetUser(sentry.User{ID: user.ID})
+		}
+	}
+}

migrations/00000000_apply_fixtures.go

@@ -0,0 +1,17 @@
+package migrations
+
+import (
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+)
+
+func init() {
+	f := migrationFunc{
+		name: "000-apply_fixtures",
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			return cfg.GetFixturesFunc(cfg.Db.Dialect)(db)
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20201103_rename_language_mappings_table.go

@@ -0,0 +1,32 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	f := migrationFunc{
+		name: "20201103-rename_language_mappings_table",
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			migrator := db.Migrator()
+			oldTableName, newTableName := "custom_rules", "language_mappings"
+			oldIndexName, newIndexName := "idx_customrule_user", "idx_language_mapping_user"
+
+			if migrator.HasTable(oldTableName) {
+				logbuch.Info("renaming '%s' table to '%s'", oldTableName, newTableName)
+				if err := migrator.RenameTable(oldTableName, &models.LanguageMapping{}); err != nil {
+					return err
+				}
+
+				logbuch.Info("renaming '%s' index to '%s'", oldIndexName, newIndexName)
+				return migrator.RenameIndex(&models.LanguageMapping{}, oldIndexName, newIndexName)
+			}
+			return nil
+		},
+	}
+
+	registerPreMigration(f)
+}

migrations/20201106_migration_cascade_constraints.go

@@ -0,0 +1,79 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20201106-migration_cascade_constraints"
+
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			// drop all already existing foreign key constraints
+			// afterwards let them be re-created by auto migrate with the newly introduced cascade settings,
+
+			migrator := db.Migrator()
+
+			if cfg.Db.Dialect == config.SQLDialectSqlite {
+				// https://stackoverflow.com/a/1884893/3112139
+				// unfortunately, we can't migrate existing sqlite databases to the newly introduced cascade settings
+				// things like deleting all summaries won't work in those cases unless an entirely new db is created
+				logbuch.Info("not attempting to drop and regenerate constraints on sqlite")
+				return nil
+			}
+
+			if !migrator.HasTable(&models.KeyStringValue{}) {
+				logbuch.Info("key-value table not yet existing")
+				return nil
+			}
+
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
+				return nil
+			}
+
+			// SELECT * FROM INFORMATION_SCHEMA.table_constraints;
+			constraints := map[string]interface{}{
+				"fk_summaries_editors":           &models.SummaryItem{},
+				"fk_summaries_languages":         &models.SummaryItem{},
+				"fk_summaries_machines":          &models.SummaryItem{},
+				"fk_summaries_operating_systems": &models.SummaryItem{},
+				"fk_summaries_projects":          &models.SummaryItem{},
+				"fk_summary_items_summary":       &models.SummaryItem{},
+				"fk_summaries_user":              &models.Summary{},
+				"fk_language_mappings_user":      &models.LanguageMapping{},
+				"fk_heartbeats_user":             &models.Heartbeat{},
+				"fk_aliases_user":                &models.Alias{},
+			}
+
+			for name, table := range constraints {
+				if migrator.HasConstraint(table, name) {
+					logbuch.Info("dropping constraint '%s'", name)
+					if err := migrator.DropConstraint(table, name); err != nil {
+						return err
+					}
+				}
+			}
+
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	registerPreMigration(f)
+}

migrations/20210202_fix_cascade_for_alias_user_constraint.go

@@ -0,0 +1,58 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20210202-fix_cascade_for_alias_user_constraint"
+
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			migrator := db.Migrator()
+
+			if cfg.Db.Dialect == config.SQLDialectSqlite {
+				// see 20201106_migration_cascade_constraints
+				logbuch.Info("not attempting to drop and regenerate constraints on sqlite")
+				return nil
+			}
+
+			if !migrator.HasTable(&models.KeyStringValue{}) {
+				logbuch.Info("key-value table not yet existing")
+				return nil
+			}
+
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
+				return nil
+			}
+
+			if migrator.HasConstraint(&models.Alias{}, "fk_aliases_user") {
+				logbuch.Info("dropping constraint 'fk_aliases_user'")
+				if err := migrator.DropConstraint(&models.Alias{}, "fk_aliases_user"); err != nil {
+					return err
+				}
+			}
+
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	registerPreMigration(f)
+}

migrations/20210206_drop_badges_column_add_sharing_flags.go

@@ -0,0 +1,55 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	f := migrationFunc{
+		name: "20210206_drop_badges_column_add_sharing_flags",
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			migrator := db.Migrator()
+
+			if !migrator.HasColumn(&models.User{}, "badges_enabled") {
+				// empty database or already migrated, nothing to migrate
+				return nil
+			}
+
+			if err := db.Exec("UPDATE users SET share_data_max_days = 30 WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_editors = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_languages = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_projects = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_oss = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_machines = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+
+			if cfg.Db.Dialect == config.SQLDialectSqlite {
+				logbuch.Info("not attempting to drop column 'badges_enabled' on sqlite")
+				return nil
+			}
+
+			if err := migrator.DropColumn(&models.User{}, "badges_enabled"); err != nil {
+				return err
+			}
+			logbuch.Info("dropped column 'badges_enabled' after substituting it by sharing indicators")
+
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20210213_add_has_data_field.go

@@ -0,0 +1,41 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20210213-add_has_data_field"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
+				return nil
+			}
+
+			if err := db.Exec("UPDATE users SET has_data = TRUE WHERE TRUE").Error; err != nil {
+				return err
+			}
+
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20210221_add_created_date_column.go

@@ -0,0 +1,41 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20210221-add_created_date_column"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
+				return nil
+			}
+
+			if err := db.Exec("UPDATE heartbeats SET created_at = time WHERE TRUE").Error; err != nil {
+				return err
+			}
+
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/common/common.go

@@ -1,11 +0,0 @@
-package common
-
-import (
-	"github.com/muety/wakapi/config"
-	"gorm.io/gorm"
-)
-
-type migrationFunc struct {
-	f    func(db *gorm.DB, cfg *config.Config) error
-	name string
-}

migrations/common/custom_post.go

@@ -1,30 +0,0 @@
-package common
-
-import (
-	"github.com/muety/wakapi/config"
-	"gorm.io/gorm"
-	"log"
-)
-
-var customPostMigrations []migrationFunc
-
-func init() {
-	customPostMigrations = []migrationFunc{
-		{
-			f: func(db *gorm.DB, cfg *config.Config) error {
-				return cfg.GetFixturesFunc(cfg.Db.Dialect)(db)
-			},
-			name: "apply fixtures",
-		},
-		// TODO: add function to modify aggregated summaries according to configured custom language mappings
-	}
-}
-
-func RunCustomPostMigrations(db *gorm.DB, cfg *config.Config) {
-	for _, m := range customPostMigrations {
-		log.Printf("potentially running migration '%s'\n", m.name)
-		if err := m.f(db, cfg); err != nil {
-			log.Fatalf("migration '%s' failed – %v\n", m.name, err)
-		}
-	}
-}

migrations/common/custom_pre.go

@@ -1,108 +0,0 @@
-package common
-
-import (
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"gorm.io/gorm"
-	"log"
-)
-
-var customPreMigrations []migrationFunc
-
-func init() {
-	customPreMigrations = []migrationFunc{
-		{
-			f: func(db *gorm.DB, cfg *config.Config) error {
-				migrator := db.Migrator()
-				oldTableName, newTableName := "custom_rules", "language_mappings"
-				oldIndexName, newIndexName := "idx_customrule_user", "idx_language_mapping_user"
-
-				if migrator.HasTable(oldTableName) {
-					log.Printf("renaming '%s' table to '%s'\n", oldTableName, newTableName)
-					if err := migrator.RenameTable(oldTableName, &models.LanguageMapping{}); err != nil {
-						return err
-					}
-
-					log.Printf("renaming '%s' index to '%s'\n", oldIndexName, newIndexName)
-					return migrator.RenameIndex(&models.LanguageMapping{}, oldIndexName, newIndexName)
-				}
-				return nil
-			},
-			name: "rename language mappings table",
-		},
-		{
-			f: func(db *gorm.DB, cfg *config.Config) error {
-				// drop all already existing foreign key constraints
-				// afterwards let them be re-created by auto migrate with the newly introduced cascade settings,
-
-				migrator := db.Migrator()
-				const lookupKey = "20201106-migration_cascade_constraints"
-
-				if cfg.Db.Dialect == config.SQLDialectSqlite {
-					// https://stackoverflow.com/a/1884893/3112139
-					// unfortunately, we can't migrate existing sqlite databases to the newly introduced cascade settings
-					// things like deleting all summaries won't work in those cases unless an entirely new db is created
-					log.Println("not attempting to drop and regenerate constraints on sqlite")
-					return nil
-				}
-
-				if !migrator.HasTable(&models.KeyStringValue{}) {
-					log.Println("key-value table not yet existing")
-					return nil
-				}
-
-				condition := "key = ?"
-				if cfg.Db.Dialect == config.SQLDialectMysql {
-					condition = "`key` = ?"
-				}
-				lookupResult := db.Where(condition, lookupKey).First(&models.KeyStringValue{})
-				if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
-					log.Println("no need to migrate cascade constraints")
-					return nil
-				}
-
-				// SELECT * FROM INFORMATION_SCHEMA.table_constraints;
-				constraints := map[string]interface{}{
-					"fk_summaries_editors":           &models.SummaryItem{},
-					"fk_summaries_languages":         &models.SummaryItem{},
-					"fk_summaries_machines":          &models.SummaryItem{},
-					"fk_summaries_operating_systems": &models.SummaryItem{},
-					"fk_summaries_projects":          &models.SummaryItem{},
-					"fk_summary_items_summary":       &models.SummaryItem{},
-					"fk_summaries_user":              &models.Summary{},
-					"fk_language_mappings_user":      &models.LanguageMapping{},
-					"fk_heartbeats_user":             &models.Heartbeat{},
-					"fk_aliases_user":                &models.Alias{},
-				}
-
-				for name, table := range constraints {
-					if migrator.HasConstraint(table, name) {
-						log.Printf("dropping constraint '%s'", name)
-						if err := migrator.DropConstraint(table, name); err != nil {
-							return err
-						}
-					}
-				}
-
-				if err := db.Create(&models.KeyStringValue{
-					Key:   lookupKey,
-					Value: "done",
-				}).Error; err != nil {
-					return err
-				}
-
-				return nil
-			},
-			name: "add cascade constraints",
-		},
-	}
-}
-
-func RunCustomPreMigrations(db *gorm.DB, cfg *config.Config) {
-	for _, m := range customPreMigrations {
-		log.Printf("potentially running migration '%s'\n", m.name)
-		if err := m.f(db, cfg); err != nil {
-			log.Fatalf("migration '%s' failed – %v\n", m.name, err)
-		}
-	}
-}

migrations/common/languages.go

@@ -1,25 +0,0 @@
-package common
-
-import (
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"gorm.io/gorm"
-	"log"
-)
-
-func MigrateLanguages(db *gorm.DB) {
-	cfg := config.Get()
-
-	for k, v := range cfg.App.CustomLanguages {
-		result := db.Model(models.Heartbeat{}).
-			Where("language = ?", "").
-			Where("entity LIKE ?", "%."+k).
-			Updates(models.Heartbeat{Language: v})
-		if result.Error != nil {
-			log.Fatal(result.Error)
-		}
-		if result.RowsAffected > 0 {
-			log.Printf("Migrated %+v rows for custom language %+s.\n", result.RowsAffected, k)
-		}
-	}
-}

migrations/migrations.go

@@ -0,0 +1,75 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+	"sort"
+	"strings"
+)
+
+type migrationFunc struct {
+	f    func(db *gorm.DB, cfg *config.Config) error
+	name string
+}
+
+type migrationFuncs []migrationFunc
+
+var (
+	preMigrations  migrationFuncs
+	postMigrations migrationFuncs
+)
+
+func registerPreMigration(f migrationFunc) {
+	preMigrations = append(preMigrations, f)
+}
+
+func registerPostMigration(f migrationFunc) {
+	postMigrations = append(postMigrations, f)
+}
+
+func Run(db *gorm.DB, cfg *config.Config) {
+	RunPreMigrations(db, cfg)
+	RunSchemaMigrations(db, cfg)
+	RunPostMigrations(db, cfg)
+}
+
+func RunSchemaMigrations(db *gorm.DB, cfg *config.Config) {
+	if err := cfg.GetMigrationFunc(cfg.Db.Dialect)(db); err != nil {
+		logbuch.Fatal(err.Error())
+	}
+}
+
+func RunPreMigrations(db *gorm.DB, cfg *config.Config) {
+	sort.Sort(preMigrations)
+
+	for _, m := range preMigrations {
+		logbuch.Info("potentially running migration '%s'", m.name)
+		if err := m.f(db, cfg); err != nil {
+			logbuch.Fatal("migration '%s' failed – %v", m.name, err)
+		}
+	}
+}
+
+func RunPostMigrations(db *gorm.DB, cfg *config.Config) {
+	sort.Sort(postMigrations)
+
+	for _, m := range postMigrations {
+		logbuch.Info("potentially running migration '%s'", m.name)
+		if err := m.f(db, cfg); err != nil {
+			logbuch.Fatal("migration '%s' failed – %v", m.name, err)
+		}
+	}
+}
+
+func (m migrationFuncs) Len() int {
+	return len(m)
+}
+
+func (m migrationFuncs) Less(i, j int) bool {
+	return strings.Compare(m[i].name, m[j].name) < 0
+}
+
+func (m migrationFuncs) Swap(i, j int) {
+	m[i], m[j] = m[j], m[i]
+}

mocks/alias_repository.go

@@ -13,3 +13,33 @@ func (m *AliasRepositoryMock) GetByUser(s string) ([]*models.Alias, error) {
 	args := m.Called(s)
 	return args.Get(0).([]*models.Alias), args.Error(1)
 }
+
+func (m *AliasRepositoryMock) GetByUserAndKey(s string, s2 string) ([]*models.Alias, error) {
+	args := m.Called(s, s2)
+	return args.Get(0).([]*models.Alias), args.Error(1)
+}
+
+func (m *AliasRepositoryMock) GetByUserAndKeyAndType(s string, s2 string, u uint8) ([]*models.Alias, error) {
+	args := m.Called(s, s2, u)
+	return args.Get(0).([]*models.Alias), args.Error(1)
+}
+
+func (m *AliasRepositoryMock) GetByUserAndTypeAndValue(s string, u uint8, s2 string) (*models.Alias, error) {
+	args := m.Called(s, u, s2)
+	return args.Get(0).(*models.Alias), args.Error(1)
+}
+
+func (m *AliasRepositoryMock) Insert(s *models.Alias) (*models.Alias, error) {
+	args := m.Called(s)
+	return args.Get(0).(*models.Alias), args.Error(1)
+}
+
+func (m *AliasRepositoryMock) Delete(u uint) error {
+	args := m.Called(u)
+	return args.Error(0)
+}
+
+func (m *AliasRepositoryMock) DeleteBatch(u []uint) error {
+	args := m.Called(u)
+	return args.Error(0)
+}

mocks/alias_service.go

@@ -1,6 +1,7 @@
 package mocks
 
 import (
+	"github.com/muety/wakapi/models"
 	"github.com/stretchr/testify/mock"
 )
 
@@ -8,7 +9,12 @@ type AliasServiceMock struct {
 	mock.Mock
 }
 
-func (m *AliasServiceMock) LoadUserAliases(s string) error {
+func (m *AliasServiceMock) IsInitialized(s string) bool {
+	args := m.Called(s)
+	return args.Bool(0)
+}
+
+func (m *AliasServiceMock) InitializeUser(s string) error {
 	args := m.Called(s)
 	return args.Error(0)
 }
@@ -18,7 +24,27 @@ func (m *AliasServiceMock) GetAliasOrDefault(s string, u uint8, s2 string) (stri
 	return args.String(0), args.Error(1)
 }
 
-func (m *AliasServiceMock) IsInitialized(s string) bool {
+func (m *AliasServiceMock) GetByUser(s string) ([]*models.Alias, error) {
 	args := m.Called(s)
-	return args.Bool(0)
+	return args.Get(0).([]*models.Alias), args.Error(1)
+}
+
+func (m *AliasServiceMock) GetByUserAndKeyAndType(s string, s2 string, u uint8) ([]*models.Alias, error) {
+	args := m.Called(s, s2, u)
+	return args.Get(0).([]*models.Alias), args.Error(1)
+}
+
+func (m *AliasServiceMock) Create(a *models.Alias) (*models.Alias, error) {
+	args := m.Called(a)
+	return args.Get(0).(*models.Alias), args.Error(1)
+}
+
+func (m *AliasServiceMock) Delete(s *models.Alias) error {
+	args := m.Called(s)
+	return args.Error(0)
+}
+
+func (m *AliasServiceMock) DeleteMulti(a []*models.Alias) error {
+	args := m.Called(a)
+	return args.Error(0)
 }

mocks/heartbeat_service.go

@@ -10,11 +10,31 @@ type HeartbeatServiceMock struct {
 	mock.Mock
 }
 
+func (m *HeartbeatServiceMock) Insert(heartbeat *models.Heartbeat) error {
+	args := m.Called(heartbeat)
+	return args.Error(0)
+}
+
 func (m *HeartbeatServiceMock) InsertBatch(heartbeats []*models.Heartbeat) error {
 	args := m.Called(heartbeats)
 	return args.Error(0)
 }
 
+func (m *HeartbeatServiceMock) Count() (int64, error) {
+	args := m.Called()
+	return int64(args.Int(0)), args.Error(1)
+}
+
+func (m *HeartbeatServiceMock) CountByUser(user *models.User) (int64, error) {
+	args := m.Called(user)
+	return args.Get(0).(int64), args.Error(0)
+}
+
+func (m *HeartbeatServiceMock) CountByUsers(users []*models.User) ([]*models.CountByUser, error) {
+	args := m.Called(users)
+	return args.Get(0).([]*models.CountByUser), args.Error(0)
+}
+
 func (m *HeartbeatServiceMock) GetAllWithin(time time.Time, time2 time.Time, user *models.User) ([]*models.Heartbeat, error) {
 	args := m.Called(time, time2, user)
 	return args.Get(0).([]*models.Heartbeat), args.Error(1)
@@ -25,6 +45,11 @@ func (m *HeartbeatServiceMock) GetFirstByUsers() ([]*models.TimeByUser, error) {
 	return args.Get(0).([]*models.TimeByUser), args.Error(1)
 }
 
+func (m *HeartbeatServiceMock) GetLatestByOriginAndUser(s string, user *models.User) (*models.Heartbeat, error) {
+	args := m.Called(s, user)
+	return args.Get(0).(*models.Heartbeat), args.Error(1)
+}
+
 func (m *HeartbeatServiceMock) DeleteBefore(time time.Time) error {
 	args := m.Called(time)
 	return args.Error(0)

mocks/user_service.go

@@ -19,13 +19,33 @@ func (m *UserServiceMock) GetUserByKey(s string) (*models.User, error) {
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
+func (m *UserServiceMock) GetUserByEmail(s string) (*models.User, error) {
+	args := m.Called(s)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
+func (m *UserServiceMock) GetUserByResetToken(s string) (*models.User, error) {
+	args := m.Called(s)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
 func (m *UserServiceMock) GetAll() ([]*models.User, error) {
 	args := m.Called()
 	return args.Get(0).([]*models.User), args.Error(1)
 }
 
-func (m *UserServiceMock) CreateOrGet(signup *models.Signup) (*models.User, bool, error) {
-	args := m.Called(signup)
+func (m *UserServiceMock) GetActive() ([]*models.User, error) {
+	args := m.Called()
+	return args.Get(0).([]*models.User), args.Error(1)
+}
+
+func (m *UserServiceMock) Count() (int64, error) {
+	args := m.Called()
+	return int64(args.Int(0)), args.Error(1)
+}
+
+func (m *UserServiceMock) CreateOrGet(signup *models.Signup, isAdmin bool) (*models.User, bool, error) {
+	args := m.Called(signup, isAdmin)
 	return args.Get(0).(*models.User), args.Bool(1), args.Error(2)
 }
 
@@ -34,6 +54,11 @@ func (m *UserServiceMock) Update(user *models.User) (*models.User, error) {
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
+func (m *UserServiceMock) Delete(user *models.User) error {
+	args := m.Called(user)
+	return args.Error(0)
+}
+
 func (m *UserServiceMock) ResetApiKey(user *models.User) (*models.User, error) {
 	args := m.Called(user)
 	return args.Get(0).(*models.User), args.Error(1)
@@ -44,7 +69,21 @@ func (m *UserServiceMock) ToggleBadges(user *models.User) (*models.User, error)
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
+func (m *UserServiceMock) SetWakatimeApiKey(user *models.User, s string) (*models.User, error) {
+	args := m.Called(user, s)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
 func (m *UserServiceMock) MigrateMd5Password(user *models.User, login *models.Login) (*models.User, error) {
 	args := m.Called(user, login)
 	return args.Get(0).(*models.User), args.Error(1)
 }
+
+func (m *UserServiceMock) GenerateResetToken(user *models.User) (*models.User, error) {
+	args := m.Called(user)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
+func (m *UserServiceMock) FlushCache() {
+	m.Called()
+}

models/alias.go

@@ -2,9 +2,22 @@ package models
 
 type Alias struct {
 	ID     uint   `gorm:"primary_key"`
-	Type   uint8  `gorm:"not null; index:idx_alias_type_key; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
-	User   *User  `json:"-" gorm:"not null"`
+	Type   uint8  `gorm:"not null; index:idx_alias_type_key"`
+	User   *User  `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	UserID string `gorm:"not null; index:idx_alias_user"`
 	Key    string `gorm:"not null; index:idx_alias_type_key"`
 	Value  string `gorm:"not null"`
 }
+
+func (a *Alias) IsValid() bool {
+	return a.Key != "" && a.Value != "" && a.validateType()
+}
+
+func (a *Alias) validateType() bool {
+	for _, t := range SummaryTypes() {
+		if a.Type == t {
+			return true
+		}
+	}
+	return false
+}

models/compat/shields/v1/badge.go

@@ -22,7 +22,7 @@ type BadgeData struct {
 
 func NewBadgeDataFrom(summary *models.Summary, filters *models.Filters) *BadgeData {
 	var total time.Duration
-	if hasFilter, _, _ := filters.First(); hasFilter {
+	if hasFilter, _, _ := filters.One(); hasFilter {
 		total = summary.TotalTimeByFilters(filters)
 	} else {
 		total = summary.TotalTime()

models/compat/wakatime/v1/all_time.go

@@ -9,13 +9,22 @@ import (
 // https://wakatime.com/developers#all_time_since_today
 
 type AllTimeViewModel struct {
-	Data *allTimeData `json:"data"`
+	Data *AllTimeData `json:"data"`
 }
 
-type allTimeData struct {
-	TotalSeconds float32 `json:"total_seconds"` // total number of seconds logged since account created
-	Text         string  `json:"text"`          // total time logged since account created as human readable string>
-	IsUpToDate   bool    `json:"is_up_to_date"` // true if the stats are up to date; when false, a 202 response code is returned and stats will be refreshed soon>
+type AllTimeData struct {
+	TotalSeconds float32       `json:"total_seconds"` // total number of seconds logged since account created
+	Text         string        `json:"text"`          // total time logged since account created as human readable string>
+	IsUpToDate   bool          `json:"is_up_to_date"` // true if the stats are up to date; when false, a 202 response code is returned and stats will be refreshed soon>
+	Range        *AllTimeRange `json:"range"`
+}
+
+type AllTimeRange struct {
+	End       string `json:"end"`
+	EndDate   string `json:"end_date"`
+	Start     string `json:"start"`
+	StartDate string `json:"start_date"`
+	Timezone  string `json:"timezone"`
 }
 
 func NewAllTimeFrom(summary *models.Summary, filters *models.Filters) *AllTimeViewModel {
@@ -27,7 +36,7 @@ func NewAllTimeFrom(summary *models.Summary, filters *models.Filters) *AllTimeVi
 	}
 
 	return &AllTimeViewModel{
-		Data: &allTimeData{
+		Data: &AllTimeData{
 			TotalSeconds: float32(total.Seconds()),
 			Text:         utils.FmtWakatimeDuration(total),
 			IsUpToDate:   true,

models/compat/wakatime/v1/heartbeat.go

@@ -0,0 +1,25 @@
+package v1
+
+import "github.com/muety/wakapi/models"
+
+type HeartbeatsViewModel struct {
+	Data []*HeartbeatEntry `json:"data"`
+}
+
+// Incomplete, for now, only the subset of fields is implemented
+// that is actually required for the import
+
+type HeartbeatEntry struct {
+	Id            string            `json:"id"`
+	Branch        string            `json:"branch"`
+	Category      string            `json:"category"`
+	Entity        string            `json:"entity"`
+	IsWrite       bool              `json:"is_write"`
+	Language      string            `json:"language"`
+	Project       string            `json:"project"`
+	Time          models.CustomTime `json:"time"`
+	Type          string            `json:"type"`
+	UserId        string            `json:"user_id"`
+	MachineNameId string            `json:"machine_name_id"`
+	UserAgentId   string            `json:"user_agent_id"`
+}

models/compat/wakatime/v1/machine.go

@@ -0,0 +1,12 @@
+package v1
+
+// https://wakatime.com/api/v1/users/current/machine_names
+
+type MachineViewModel struct {
+	Data []*MachineEntry `json:"data"`
+}
+
+type MachineEntry struct {
+	Id    string `json:"id"`
+	Value string `json:"value"`
+}

models/compat/wakatime/v1/stats.go

@@ -0,0 +1,78 @@
+package v1
+
+import (
+	"github.com/muety/wakapi/models"
+	"time"
+)
+
+// https://wakatime.com/api/v1/users/current/stats/last_7_days
+// https://pastr.de/p/f2fxg6ragj7z5e7fhsow9rb6
+
+type StatsViewModel struct {
+	Data *StatsData `json:"data"`
+}
+
+type StatsData struct {
+	Username              string            `json:"username"`
+	UserId                string            `json:"user_id"`
+	Start                 time.Time         `json:"start"`
+	End                   time.Time         `json:"end"`
+	TotalSeconds          float64           `json:"total_seconds"`
+	DailyAverage          float64           `json:"daily_average"`
+	DaysIncludingHolidays int               `json:"days_including_holidays"`
+	Editors               []*SummariesEntry `json:"editors"`
+	Languages             []*SummariesEntry `json:"languages"`
+	Machines              []*SummariesEntry `json:"machines"`
+	Projects              []*SummariesEntry `json:"projects"`
+	OperatingSystems      []*SummariesEntry `json:"operating_systems"`
+}
+
+func NewStatsFrom(summary *models.Summary, filters *models.Filters) *StatsViewModel {
+	totalTime := summary.TotalTime()
+	numDays := int(summary.ToTime.T().Sub(summary.FromTime.T()).Hours() / 24)
+
+	data := &StatsData{
+		Username:              summary.UserID,
+		UserId:                summary.UserID,
+		Start:                 summary.FromTime.T(),
+		End:                   summary.ToTime.T(),
+		TotalSeconds:          totalTime.Seconds(),
+		DailyAverage:          totalTime.Seconds() / float64(numDays),
+		DaysIncludingHolidays: numDays,
+	}
+
+	editors := make([]*SummariesEntry, len(summary.Editors))
+	for i, e := range summary.Editors {
+		editors[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryEditor))
+	}
+
+	languages := make([]*SummariesEntry, len(summary.Languages))
+	for i, e := range summary.Languages {
+		languages[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryLanguage))
+	}
+
+	machines := make([]*SummariesEntry, len(summary.Machines))
+	for i, e := range summary.Machines {
+		machines[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryMachine))
+	}
+
+	projects := make([]*SummariesEntry, len(summary.Projects))
+	for i, e := range summary.Projects {
+		projects[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryProject))
+	}
+
+	oss := make([]*SummariesEntry, len(summary.OperatingSystems))
+	for i, e := range summary.OperatingSystems {
+		oss[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryOS))
+	}
+
+	data.Editors = editors
+	data.Languages = languages
+	data.Machines = machines
+	data.Projects = projects
+	data.OperatingSystems = oss
+
+	return &StatsViewModel{
+		Data: data,
+	}
+}

models/compat/wakatime/v1/summaries.go

@@ -13,24 +13,24 @@ import (
 // https://pastr.de/v/736450
 
 type SummariesViewModel struct {
-	Data  []*summariesData `json:"data"`
+	Data  []*SummariesData `json:"data"`
 	End   time.Time        `json:"end"`
 	Start time.Time        `json:"start"`
 }
 
-type summariesData struct {
-	Categories       []*summariesEntry    `json:"categories"`
-	Dependencies     []*summariesEntry    `json:"dependencies"`
-	Editors          []*summariesEntry    `json:"editors"`
-	Languages        []*summariesEntry    `json:"languages"`
-	Machines         []*summariesEntry    `json:"machines"`
-	OperatingSystems []*summariesEntry    `json:"operating_systems"`
-	Projects         []*summariesEntry    `json:"projects"`
-	GrandTotal       *summariesGrandTotal `json:"grand_total"`
-	Range            *summariesRange      `json:"range"`
+type SummariesData struct {
+	Categories       []*SummariesEntry    `json:"categories"`
+	Dependencies     []*SummariesEntry    `json:"dependencies"`
+	Editors          []*SummariesEntry    `json:"editors"`
+	Languages        []*SummariesEntry    `json:"languages"`
+	Machines         []*SummariesEntry    `json:"machines"`
+	OperatingSystems []*SummariesEntry    `json:"operating_systems"`
+	Projects         []*SummariesEntry    `json:"projects"`
+	GrandTotal       *SummariesGrandTotal `json:"grand_total"`
+	Range            *SummariesRange      `json:"range"`
 }
 
-type summariesEntry struct {
+type SummariesEntry struct {
 	Digital      string  `json:"digital"`
 	Hours        int     `json:"hours"`
 	Minutes      int     `json:"minutes"`
@@ -41,7 +41,7 @@ type summariesEntry struct {
 	TotalSeconds float64 `json:"total_seconds"`
 }
 
-type summariesGrandTotal struct {
+type SummariesGrandTotal struct {
 	Digital      string  `json:"digital"`
 	Hours        int     `json:"hours"`
 	Minutes      int     `json:"minutes"`
@@ -49,7 +49,7 @@ type summariesGrandTotal struct {
 	TotalSeconds float64 `json:"total_seconds"`
 }
 
-type summariesRange struct {
+type SummariesRange struct {
 	Date     string    `json:"date"`
 	End      time.Time `json:"end"`
 	Start    time.Time `json:"start"`
@@ -58,7 +58,7 @@ type summariesRange struct {
 }
 
 func NewSummariesFrom(summaries []*models.Summary, filters *models.Filters) *SummariesViewModel {
-	data := make([]*summariesData, len(summaries))
+	data := make([]*SummariesData, len(summaries))
 	minDate, maxDate := time.Now().Add(1*time.Second), time.Time{}
 
 	for i, s := range summaries {
@@ -79,27 +79,27 @@ func NewSummariesFrom(summaries []*models.Summary, filters *models.Filters) *Sum
 	}
 }
 
-func newDataFrom(s *models.Summary) *summariesData {
+func newDataFrom(s *models.Summary) *SummariesData {
 	zone, _ := time.Now().Zone()
 	total := s.TotalTime()
 	totalHrs, totalMins := int(total.Hours()), int((total - time.Duration(total.Hours())*time.Hour).Minutes())
 
-	data := &summariesData{
-		Categories:       make([]*summariesEntry, 0),
-		Dependencies:     make([]*summariesEntry, 0),
-		Editors:          make([]*summariesEntry, len(s.Editors)),
-		Languages:        make([]*summariesEntry, len(s.Languages)),
-		Machines:         make([]*summariesEntry, len(s.Machines)),
-		OperatingSystems: make([]*summariesEntry, len(s.OperatingSystems)),
-		Projects:         make([]*summariesEntry, len(s.Projects)),
-		GrandTotal: &summariesGrandTotal{
+	data := &SummariesData{
+		Categories:       make([]*SummariesEntry, 0),
+		Dependencies:     make([]*SummariesEntry, 0),
+		Editors:          make([]*SummariesEntry, len(s.Editors)),
+		Languages:        make([]*SummariesEntry, len(s.Languages)),
+		Machines:         make([]*SummariesEntry, len(s.Machines)),
+		OperatingSystems: make([]*SummariesEntry, len(s.OperatingSystems)),
+		Projects:         make([]*SummariesEntry, len(s.Projects)),
+		GrandTotal: &SummariesGrandTotal{
 			Digital:      fmt.Sprintf("%d:%d", totalHrs, totalMins),
 			Hours:        totalHrs,
 			Minutes:      totalMins,
 			Text:         utils.FmtWakatimeDuration(total),
 			TotalSeconds: total.Seconds(),
 		},
-		Range: &summariesRange{
+		Range: &SummariesRange{
 			Date:     time.Now().Format(time.RFC3339),
 			End:      s.ToTime.T(),
 			Start:    s.FromTime.T(),
@@ -111,21 +111,21 @@ func newDataFrom(s *models.Summary) *summariesData {
 	var wg sync.WaitGroup
 	wg.Add(5)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Projects {
 			data.Projects[i] = convertEntry(e, s.TotalTimeBy(models.SummaryProject))
 		}
 	}(data)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Editors {
 			data.Editors[i] = convertEntry(e, s.TotalTimeBy(models.SummaryEditor))
 		}
 	}(data)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Languages {
 			data.Languages[i] = convertEntry(e, s.TotalTimeBy(models.SummaryLanguage))
@@ -133,14 +133,14 @@ func newDataFrom(s *models.Summary) *summariesData {
 		}
 	}(data)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.OperatingSystems {
 			data.OperatingSystems[i] = convertEntry(e, s.TotalTimeBy(models.SummaryOS))
 		}
 	}(data)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Machines {
 			data.Machines[i] = convertEntry(e, s.TotalTimeBy(models.SummaryMachine))
@@ -151,7 +151,7 @@ func newDataFrom(s *models.Summary) *summariesData {
 	return data
 }
 
-func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *summariesEntry {
+func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *SummariesEntry {
 	// this is a workaround, since currently, the total time of a summary item is mistakenly represented in seconds
 	// TODO: fix some day, while migrating persisted summary items
 	total := e.Total * time.Second
@@ -163,7 +163,7 @@ func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *summariesEn
 		percentage = 0
 	}
 
-	return &summariesEntry{
+	return &SummariesEntry{
 		Digital:      fmt.Sprintf("%d:%d:%d", hrs, mins, secs),
 		Hours:        hrs,
 		Minutes:      mins,

models/compat/wakatime/v1/user_agent.go

@@ -0,0 +1,12 @@
+package v1
+
+type UserAgentsViewModel struct {
+	Data []*UserAgentEntry `json:"data"`
+}
+
+type UserAgentEntry struct {
+	Id     string `json:"id"`
+	Editor string `json:"editor"`
+	Os     string `json:"os"`
+	Value  string `json:"value"`
+}

models/filters.go

@@ -29,7 +29,7 @@ func NewFiltersWith(entity uint8, key string) *Filters {
 	return &Filters{}
 }
 
-func (f *Filters) First() (bool, uint8, string) {
+func (f *Filters) One() (bool, uint8, string) {
 	if f.Project != "" {
 		return true, SummaryProject, f.Project
 	} else if f.OS != "" {
@@ -43,25 +43,3 @@ func (f *Filters) First() (bool, uint8, string) {
 	}
 	return false, 0, ""
 }
-
-func (f *Filters) All() []*FilterElement {
-	all := make([]*FilterElement, 0)
-
-	if f.Project != "" {
-		all = append(all, &FilterElement{Type: SummaryProject, Key: f.Project})
-	}
-	if f.Editor != "" {
-		all = append(all, &FilterElement{Type: SummaryEditor, Key: f.Editor})
-	}
-	if f.Language != "" {
-		all = append(all, &FilterElement{Type: SummaryLanguage, Key: f.Language})
-	}
-	if f.Machine != "" {
-		all = append(all, &FilterElement{Type: SummaryMachine, Key: f.Machine})
-	}
-	if f.OS != "" {
-		all = append(all, &FilterElement{Type: SummaryOS, Key: f.OS})
-	}
-
-	return all
-}

models/heartbeat.go

@@ -1,13 +1,16 @@
 package models
 
 import (
-	"regexp"
+	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/mitchellh/hashstructure/v2"
+	"strings"
 	"time"
 )
 
 type Heartbeat struct {
-	ID              uint       `gorm:"primary_key"`
-	User            *User      `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
+	ID              uint       `gorm:"primary_key" hash:"ignore"`
+	User            *User      `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" hash:"ignore"`
 	UserID          string     `json:"-" gorm:"not null; index:idx_time_user"`
 	Entity          string     `json:"entity" gorm:"not null; index:idx_entity"`
 	Type            string     `json:"type"`
@@ -16,11 +19,14 @@ type Heartbeat struct {
 	Branch          string     `json:"branch"`
 	Language        string     `json:"language" gorm:"index:idx_language"`
 	IsWrite         bool       `json:"is_write"`
-	Editor          string     `json:"editor"`
-	OperatingSystem string     `json:"operating_system"`
-	Machine         string     `json:"machine"`
-	Time            CustomTime `json:"time" gorm:"type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time,idx_time_user"`
-	languageRegex   *regexp.Regexp
+	Editor          string     `json:"editor" hash:"ignore"`           // ignored because editor might be parsed differently by wakatime
+	OperatingSystem string     `json:"operating_system" hash:"ignore"` // ignored because os might be parsed differently by wakatime
+	Machine         string     `json:"machine" hash:"ignore"`          // ignored because wakatime api doesn't return machines currently
+	Time            CustomTime `json:"time" gorm:"type:timestamp; index:idx_time,idx_time_user" swaggertype:"primitive,number"`
+	Hash            string     `json:"-" gorm:"type:varchar(17); uniqueIndex"`
+	Origin          string     `json:"-" hash:"ignore"`
+	OriginId        string     `json:"-" hash:"ignore"`
+	CreatedAt       CustomTime `json:"created_at" gorm:"type:timestamp" swaggertype:"primitive,number" hash:"ignore"` // https://gorm.io/docs/conventions.html#CreatedAt
 }
 
 func (h *Heartbeat) Valid() bool {
@@ -28,18 +34,12 @@ func (h *Heartbeat) Valid() bool {
 }
 
 func (h *Heartbeat) Augment(languageMappings map[string]string) {
-	if h.languageRegex == nil {
-		h.languageRegex = regexp.MustCompile(`^.+\.(.+)$`)
+	for ending, value := range languageMappings {
+		if strings.HasSuffix(h.Entity, "."+ending) {
+			h.Language = value
+			return
+		}
 	}
-	groups := h.languageRegex.FindAllStringSubmatch(h.Entity, -1)
-	if len(groups) == 0 || len(groups[0]) != 2 {
-		return
-	}
-	ending := groups[0][1]
-	if _, ok := languageMappings[ending]; !ok {
-		return
-	}
-	h.Language, _ = languageMappings[ending]
 }
 
 func (h *Heartbeat) GetKey(t uint8) (key string) {
@@ -62,3 +62,36 @@ func (h *Heartbeat) GetKey(t uint8) (key string) {
 
 	return key
 }
+
+func (h *Heartbeat) String() string {
+	return fmt.Sprintf(
+		"Heartbeat {user=%s, entity=%s, type=%s, category=%s, project=%s, branch=%s, language=%s, iswrite=%v, editor=%s, os=%s, machine=%s, time=%d}",
+		h.UserID,
+		h.Entity,
+		h.Type,
+		h.Category,
+		h.Project,
+		h.Branch,
+		h.Language,
+		h.IsWrite,
+		h.Editor,
+		h.OperatingSystem,
+		h.Machine,
+		(time.Time(h.Time)).UnixNano(),
+	)
+}
+
+// Hash is used to prevent duplicate heartbeats
+// Using a UNIQUE INDEX over all relevant columns would be more straightforward,
+// whereas manually computing this kind of hash is quite cumbersome. However,
+// such a unique index would, according to https://stackoverflow.com/q/65980064/3112139,
+// essentially double the space required for heartbeats, so we decided to go this way.
+
+func (h *Heartbeat) Hashed() *Heartbeat {
+	hash, err := hashstructure.Hash(h, hashstructure.FormatV2, nil)
+	if err != nil {
+		logbuch.Error("CRITICAL ERROR: failed to hash struct – %v", err)
+	}
+	h.Hash = fmt.Sprintf("%x", hash) // "uint64 values with high bit set are not supported"
+	return h
+}

models/heartbeat_test.go

@@ -26,17 +26,24 @@ func TestHeartbeat_Valid_MissingUser(t *testing.T) {
 
 func TestHeartbeat_Augment(t *testing.T) {
 	testMappings := map[string]string{
-		"py": "Python3",
+		"py":        "Python3",
+		"foo":       "Foo Script",
+		"blade.php": "Blade",
 	}
 
-	sut := &Heartbeat{
+	sut1, sut2 := &Heartbeat{
 		Entity:   "~/dev/file.py",
 		Language: "Python",
+	}, &Heartbeat{
+		Entity:   "~/dev/file.blade.php",
+		Language: "unknown",
 	}
 
-	sut.Augment(testMappings)
+	sut1.Augment(testMappings)
+	sut2.Augment(testMappings)
 
-	assert.Equal(t, "Python3", sut.Language)
+	assert.Equal(t, "Python3", sut1.Language)
+	assert.Equal(t, "Blade", sut2.Language)
 }
 
 func TestHeartbeat_GetKey(t *testing.T) {

models/interval.go

@@ -0,0 +1,46 @@
+package models
+
+// Support Wakapi and WakaTime range / interval identifiers
+// See https://wakatime.com/developers/#summaries
+var (
+	IntervalToday              = &IntervalKey{"today", "Today"}
+	IntervalYesterday          = &IntervalKey{"day", "yesterday", "Yesterday"}
+	IntervalThisWeek           = &IntervalKey{"week", "This Week"}
+	IntervalLastWeek           = &IntervalKey{"Last Week"}
+	IntervalThisMonth          = &IntervalKey{"month", "This Month"}
+	IntervalLastMonth          = &IntervalKey{"Last Month"}
+	IntervalThisYear           = &IntervalKey{"year"}
+	IntervalPast7Days          = &IntervalKey{"7_days", "last_7_days", "Last 7 Days"}
+	IntervalPast7DaysYesterday = &IntervalKey{"Last 7 Days from Yesterday"}
+	IntervalPast14Days         = &IntervalKey{"Last 14 Days"}
+	IntervalPast30Days         = &IntervalKey{"30_days", "last_30_days", "Last 30 Days"}
+	IntervalPast12Months       = &IntervalKey{"12_months", "last_12_months"}
+	IntervalAny                = &IntervalKey{"any"}
+)
+
+var AllIntervals = []*IntervalKey{
+	IntervalToday,
+	IntervalYesterday,
+	IntervalThisWeek,
+	IntervalLastWeek,
+	IntervalThisMonth,
+	IntervalLastMonth,
+	IntervalThisYear,
+	IntervalPast7Days,
+	IntervalPast7DaysYesterday,
+	IntervalPast14Days,
+	IntervalPast30Days,
+	IntervalPast12Months,
+	IntervalAny,
+}
+
+type IntervalKey []string
+
+func (k *IntervalKey) HasAlias(s string) bool {
+	for _, e := range *k {
+		if e == s {
+			return true
+		}
+	}
+	return false
+}

models/mail.go

@@ -0,0 +1,45 @@
+package models
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Mail struct {
+	From    MailAddress
+	To      MailAddresses
+	Subject string
+	Body    string
+	Type    string
+}
+
+func (m *Mail) WithText(text string) *Mail {
+	m.Body = text
+	m.Type = "text/plain; charset=UTF-8"
+	return m
+}
+
+func (m *Mail) WithHTML(html string) *Mail {
+	m.Body = html
+	m.Type = "text/html; charset=UTF-8"
+	return m
+}
+
+func (m *Mail) String() string {
+	return fmt.Sprintf("To: %s\r\n"+
+		"From: %s\r\n"+
+		"Subject: %s\r\n"+
+		"Content-Type: %s\r\n"+
+		"\r\n"+
+		"%s\r\n",
+		strings.Join(m.To.RawStrings(), ", "),
+		m.From.String(),
+		m.Subject,
+		m.Type,
+		m.Body,
+	)
+}
+
+func (m *Mail) Reader() *strings.Reader {
+	return strings.NewReader(m.String())
+}

models/mail_address.go

@@ -0,0 +1,66 @@
+package models
+
+import "regexp"
+
+const (
+	MailPattern      = "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+"
+	EmailAddrPattern = ".*\\s<(" + MailPattern + ")>|(" + MailPattern + ")"
+)
+
+var (
+	mailRegex      *regexp.Regexp
+	emailAddrRegex *regexp.Regexp
+)
+
+func init() {
+	mailRegex = regexp.MustCompile(MailPattern)
+	emailAddrRegex = regexp.MustCompile(EmailAddrPattern)
+}
+
+type MailAddress string
+
+type MailAddresses []MailAddress
+
+func (m MailAddress) String() string {
+	return string(m)
+}
+
+func (m MailAddress) Raw() string {
+	match := emailAddrRegex.FindStringSubmatch(string(m))
+	if len(match) == 3 {
+		if match[2] != "" {
+			return match[2]
+		}
+		return match[1]
+	}
+	return ""
+}
+
+func (m MailAddress) Valid() bool {
+	return emailAddrRegex.Match([]byte(m))
+}
+
+func (m MailAddresses) Strings() []string {
+	out := make([]string, len(m))
+	for i, s := range m {
+		out[i] = s.String()
+	}
+	return out
+}
+
+func (m MailAddresses) RawStrings() []string {
+	out := make([]string, len(m))
+	for i, s := range m {
+		out[i] = s.Raw()
+	}
+	return out
+}
+
+func (m MailAddresses) AllValid() bool {
+	for _, a := range m {
+		if !a.Valid() {
+			return false
+		}
+	}
+	return true
+}

models/metrics/counter_metric.go

@@ -0,0 +1,22 @@
+package metrics
+
+import "fmt"
+
+type CounterMetric struct {
+	Name   string
+	Value  int
+	Desc   string
+	Labels Labels
+}
+
+func (c CounterMetric) Key() string {
+	return c.Name
+}
+
+func (c CounterMetric) Print() string {
+	return fmt.Sprintf("%s%s %d", c.Name, c.Labels.Print(), c.Value)
+}
+
+func (c CounterMetric) Header() string {
+	return fmt.Sprintf("# HELP %s %s\n# TYPE %s counter", c.Name, c.Desc, c.Name)
+}

models/metrics/label.go

@@ -0,0 +1,28 @@
+package metrics
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Labels []Label
+
+type Label struct {
+	Key   string
+	Value string
+}
+
+func (l Labels) Print() string {
+	printedLabels := make([]string, len(l))
+	for i, e := range l {
+		printedLabels[i] = e.Print()
+	}
+	if len(l) == 0 {
+		return ""
+	}
+	return fmt.Sprintf("{%s}", strings.Join(printedLabels, ","))
+}
+
+func (l Label) Print() string {
+	return fmt.Sprintf("%s=\"%s\"", l.Key, l.Value)
+}

models/metrics/metric.go

@@ -0,0 +1,43 @@
+package metrics
+
+import (
+	"fmt"
+	"strings"
+)
+
+// Hand-crafted Prometheus metrics
+// Since we're only using very simple counters in this application,
+// we don't actually need the official client SDK as a dependency
+
+type Metrics []Metric
+
+func (m Metrics) Print() (output string) {
+	printedMetrics := make(map[string]bool)
+	for _, m := range m {
+		if _, ok := printedMetrics[m.Key()]; !ok {
+			output += fmt.Sprintf("%s\n", m.Header())
+			printedMetrics[m.Key()] = true
+		}
+		output += fmt.Sprintf("%s\n", m.Print())
+	}
+
+	return output
+}
+
+func (m Metrics) Len() int {
+	return len(m)
+}
+
+func (m Metrics) Less(i, j int) bool {
+	return strings.Compare(m[i].Key(), m[j].Key()) < 0
+}
+
+func (m Metrics) Swap(i, j int) {
+	m[i], m[j] = m[j], m[i]
+}
+
+type Metric interface {
+	Key() string
+	Header() string
+	Print() string
+}

models/shared.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"database/sql/driver"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"gorm.io/gorm"
@@ -31,6 +32,10 @@ type Interval struct {
 
 type CustomTime time.Time
 
+func (j *CustomTime) MarshalJSON() ([]byte, error) {
+	return json.Marshal(j.String())
+}
+
 func (j *CustomTime) UnmarshalJSON(b []byte) error {
 	s := strings.Replace(strings.Trim(string(b), "\""), ".", "", 1)
 	i, err := strconv.ParseInt(s, 10, 64)
@@ -71,6 +76,10 @@ func (j *CustomTime) Scan(value interface{}) error {
 	return nil
 }
 
+func (j *CustomTime) Hash() (uint64, error) {
+	return uint64((j.T().UnixNano() / 1000) / 1000), nil
+}
+
 func (j CustomTime) Value() (driver.Value, error) {
 	t := time.Unix(0, j.T().UnixNano()/int64(time.Millisecond)*int64(time.Millisecond)) // round to millisecond precision
 	return t, nil

models/summary.go

@@ -14,32 +14,14 @@ const (
 	SummaryMachine  uint8 = 4
 )
 
-const (
-	IntervalToday        string = "today"
-	IntervalYesterday    string = "day"
-	IntervalThisWeek     string = "week"
-	IntervalThisMonth    string = "month"
-	IntervalThisYear     string = "year"
-	IntervalPast7Days    string = "7_days"
-	IntervalPast30Days   string = "30_days"
-	IntervalPast12Months string = "12_months"
-	IntervalAny          string = "any"
-)
-
-func Intervals() []string {
-	return []string{
-		IntervalToday, IntervalYesterday, IntervalThisWeek, IntervalThisMonth, IntervalThisYear, IntervalPast7Days, IntervalPast30Days, IntervalPast12Months, IntervalAny,
-	}
-}
-
 const UnknownSummaryKey = "unknown"
 
 type Summary struct {
 	ID               uint         `json:"-" gorm:"primary_key"`
 	User             *User        `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	UserID           string       `json:"user_id" gorm:"not null; index:idx_time_summary_user"`
-	FromTime         CustomTime   `json:"from" gorm:"not null; type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time_summary_user"`
-	ToTime           CustomTime   `json:"to" gorm:"not null; type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time_summary_user"`
+	FromTime         CustomTime   `json:"from" gorm:"not null; type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time_summary_user" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	ToTime           CustomTime   `json:"to" gorm:"not null; type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time_summary_user" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
 	Projects         SummaryItems `json:"projects" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	Languages        SummaryItems `json:"languages" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	Editors          SummaryItems `json:"editors" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
@@ -53,9 +35,9 @@ type SummaryItem struct {
 	ID        uint          `json:"-" gorm:"primary_key"`
 	Summary   *Summary      `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	SummaryID uint          `json:"-"`
-	Type      uint8         `json:"-"`
+	Type      uint8         `json:"-" gorm:"index:idx_type"`
 	Key       string        `json:"key"`
-	Total     time.Duration `json:"total"`
+	Total     time.Duration `json:"total" swaggertype:"primitive,integer"`
 }
 
 type SummaryItemContainer struct {
@@ -65,10 +47,14 @@ type SummaryItemContainer struct {
 
 type SummaryViewModel struct {
 	*Summary
+	User           *User
 	LanguageColors map[string]string
+	EditorColors   map[string]string
+	OSColors       map[string]string
 	Error          string
 	Success        string
 	ApiKey         string
+	RawQuery       string
 }
 
 type SummaryParams struct {
@@ -107,6 +93,10 @@ func (s *Summary) MappedItems() map[uint8]*SummaryItems {
 	}
 }
 
+func (s *Summary) ItemsByType(summaryType uint8) *SummaryItems {
+	return s.MappedItems()[summaryType]
+}
+
 /* Augments the summary in a way that at least one item is present for every type.
 If a summary has zero items for a given type, but one or more for any of the other types,
 the total summary duration can be derived from those and inserted as a dummy-item with key "unknown"
@@ -186,11 +176,12 @@ func (s *Summary) TotalTimeByKey(entityType uint8, key string) (timeSum time.Dur
 	return timeSum
 }
 
-func (s *Summary) TotalTimeByFilters(filter *Filters) (timeSum time.Duration) {
-	for _, f := range filter.All() {
-		timeSum += s.TotalTimeByKey(f.Type, f.Key)
+func (s *Summary) TotalTimeByFilters(filters *Filters) time.Duration {
+	do, typeId, key := filters.One()
+	if do {
+		return s.TotalTimeByKey(typeId, key)
 	}
-	return timeSum
+	return 0
 }
 
 func (s *Summary) WithResolvedAliases(resolve AliasResolver) *Summary {

models/summary_test.go

@@ -94,12 +94,19 @@ func TestSummary_TotalTimeByFilters(t *testing.T) {
 		},
 	}
 
+	// Specifying filters about multiple entites is not supported at the moment
+	// as the current, very rudimentary, time calculation logic wouldn't make sense then.
+	// Evaluating a filter like (project="wakapi", language="go") can only be realized
+	// before computing the summary in the first place, because afterwards we can't know
+	// what time coded in "Go" was in the "Wakapi" project
+	// See https://github.com/muety/wakapi/issues/108
+
 	filters1 := &Filters{Project: "wakapi"}
-	filters2 := &Filters{Project: "wakapi", Language: "Go"} // filters have OR logic
+	filters2 := &Filters{Language: "Go"}
 	filters3 := &Filters{}
 
 	assert.Equal(t, testDuration1, sut.TotalTimeByFilters(filters1))
-	assert.Equal(t, testDuration1+testDuration3, sut.TotalTimeByFilters(filters2))
+	assert.Equal(t, testDuration3, sut.TotalTimeByFilters(filters2))
 	assert.Zero(t, sut.TotalTimeByFilters(filters3))
 }
 

models/user.go

@@ -1,12 +1,28 @@
 package models
 
+import "regexp"
+
+func init() {
+	mailRegex = regexp.MustCompile(MailPattern)
+}
+
 type User struct {
-	ID             string     `json:"id" gorm:"primary_key"`
-	ApiKey         string     `json:"api_key" gorm:"unique"`
-	Password       string     `json:"-"`
-	CreatedAt      CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP"`
-	LastLoggedInAt CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP"`
-	BadgesEnabled  bool       `json:"-" gorm:"default:false; type:bool"`
+	ID               string     `json:"id" gorm:"primary_key"`
+	ApiKey           string     `json:"api_key" gorm:"unique"`
+	Email            string     `json:"email" gorm:"uniqueIndex:idx_user_email"`
+	Password         string     `json:"-"`
+	CreatedAt        CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	LastLoggedInAt   CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	ShareDataMaxDays int        `json:"-" gorm:"default:0"`
+	ShareEditors     bool       `json:"-" gorm:"default:false; type:bool"`
+	ShareLanguages   bool       `json:"-" gorm:"default:false; type:bool"`
+	ShareProjects    bool       `json:"-" gorm:"default:false; type:bool"`
+	ShareOSs         bool       `json:"-" gorm:"default:false; type:bool; column:share_oss"`
+	ShareMachines    bool       `json:"-" gorm:"default:false; type:bool"`
+	IsAdmin          bool       `json:"-" gorm:"default:false; type:bool"`
+	HasData          bool       `json:"-" gorm:"default:false; type:bool"`
+	WakatimeApiKey   string     `json:"-"`
+	ResetToken       string     `json:"-"`
 }
 
 type Login struct {
@@ -16,36 +32,70 @@ type Login struct {
 
 type Signup struct {
 	Username       string `schema:"username"`
+	Email          string `schema:"email"`
 	Password       string `schema:"password"`
 	PasswordRepeat string `schema:"password_repeat"`
 }
 
+type SetPasswordRequest struct {
+	Password       string `schema:"password"`
+	PasswordRepeat string `schema:"password_repeat"`
+	Token          string `schema:"token"`
+}
+
+type ResetPasswordRequest struct {
+	Email string `schema:"email"`
+}
+
 type CredentialsReset struct {
 	PasswordOld    string `schema:"password_old"`
 	PasswordNew    string `schema:"password_new"`
 	PasswordRepeat string `schema:"password_repeat"`
 }
 
+type UserDataUpdate struct {
+	Email string `schema:"email"`
+}
+
 type TimeByUser struct {
 	User string
 	Time CustomTime
 }
 
+type CountByUser struct {
+	User  string
+	Count int64
+}
+
 func (c *CredentialsReset) IsValid() bool {
-	return validatePassword(c.PasswordNew) &&
+	return ValidatePassword(c.PasswordNew) &&
 		c.PasswordNew == c.PasswordRepeat
 }
 
+func (c *SetPasswordRequest) IsValid() bool {
+	return ValidatePassword(c.Password) &&
+		c.Password == c.PasswordRepeat
+}
+
 func (s *Signup) IsValid() bool {
-	return validateUsername(s.Username) &&
-		validatePassword(s.Password) &&
+	return ValidateUsername(s.Username) &&
+		ValidateEmail(s.Email) &&
+		ValidatePassword(s.Password) &&
 		s.Password == s.PasswordRepeat
 }
 
-func validateUsername(username string) bool {
-	return len(username) >= 3 && username != "current"
+func (r *UserDataUpdate) IsValid() bool {
+	return ValidateEmail(r.Email)
 }
 
-func validatePassword(password string) bool {
+func ValidateUsername(username string) bool {
+	return len(username) >= 1 && username != "current"
+}
+
+func ValidatePassword(password string) bool {
 	return len(password) >= 6
 }
+
+func ValidateEmail(email string) bool {
+	return email == "" || mailRegex.Match([]byte(email))
+}

models/view/home.go

@@ -1,8 +1,10 @@
 package view
 
 type HomeViewModel struct {
-	Success string
-	Error   string
+	Success    string
+	Error      string
+	TotalHours int
+	TotalUsers int
 }
 
 func (s *HomeViewModel) WithSuccess(m string) *HomeViewModel {

models/view/login.go

@@ -1,8 +1,14 @@
 package view
 
 type LoginViewModel struct {
-	Success string
-	Error   string
+	Success    string
+	Error      string
+	TotalUsers int
+}
+
+type SetPasswordViewModel struct {
+	LoginViewModel
+	Token string
 }
 
 func (s *LoginViewModel) WithSuccess(m string) *LoginViewModel {

models/view/settings.go

@@ -5,10 +5,17 @@ import "github.com/muety/wakapi/models"
 type SettingsViewModel struct {
 	User             *models.User
 	LanguageMappings []*models.LanguageMapping
+	Aliases          []*SettingsVMCombinedAlias
 	Success          string
 	Error            string
 }
 
+type SettingsVMCombinedAlias struct {
+	Key    string
+	Type   uint8
+	Values []string
+}
+
 func (s *SettingsViewModel) WithSuccess(m string) *SettingsViewModel {
 	s.Success = m
 	return s

postman/Wakapi.postman_collection.json

@@ -0,0 +1,346 @@
+{
+	"info": {
+		"_postman_id": "3dcc346d-a9a8-4699-8a52-459eb978b382",
+		"name": "Wakapi",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Misc",
+			"item": [
+				{
+					"name": "Get health",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{BASE_URL}}/api/health",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"health"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get metrics",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/metrics",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"metrics"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Heartbeats",
+			"item": [
+				{
+					"name": "Create heartbeat",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							},
+							{
+								"key": "X-Machine-Name",
+								"value": "devmachine",
+								"type": "text"
+							},
+							{
+								"key": "User-Agent",
+								"value": "wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0",
+								"type": "text"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "[{\n    \"entity\": \"/home/user1/dev/proejct1/main.go\",\n    \"project\": \"Project 1\",\n    \"language\": \"Go\",\n    \"is_write\": true,\n    \"type\": \"file\",\n    \"category\": null,\n    \"branch\": null,\n    \"time\": 1616680499.113417\n}]",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{BASE_URL}}/api/heartbeat",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"heartbeat"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Summary",
+			"item": [
+				{
+					"name": "Get summary",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/summary?interval=last_7_days",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"summary"
+							],
+							"query": [
+								{
+									"key": "interval",
+									"value": "last_7_days"
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Shields",
+			"item": [
+				{
+					"name": "Get Shields data",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/shields/v1/n1try/interval:today/language:Go",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"shields",
+								"v1",
+								"n1try",
+								"interval:today",
+								"language:Go"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "WakaTime",
+			"item": [
+				{
+					"name": "Get all time",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/all_time_since_today",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"all_time_since_today"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get stats",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/stats",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"stats"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get stats with range",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/stats/last_7_days",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"stats",
+								"last_7_days"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get summaries",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/summaries?start=2020-03-01T15:04:05Z&end=2020-03-31T15:04:05Z",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"summaries"
+							],
+							"query": [
+								{
+									"key": "start",
+									"value": "2020-03-01T15:04:05Z"
+								},
+								{
+									"key": "end",
+									"value": "2020-03-31T15:04:05Z"
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		}
+	],
+	"event": [
+		{
+			"listen": "prerequest",
+			"script": {
+				"type": "text/javascript",
+				"exec": [
+					"const apiKey = pm.variables.get('API_KEY')",
+					"",
+					"if (!apiKey) {",
+					"    throw new Error('no api key given')",
+					"}",
+					"",
+					"const token = base64encode(apiKey)",
+					"pm.variables.set('TOKEN', token)",
+					"",
+					"function base64encode(str) {",
+					"    return Buffer.from(str, 'utf-8').toString('base64')",
+					"}"
+				]
+			}
+		},
+		{
+			"listen": "test",
+			"script": {
+				"type": "text/javascript",
+				"exec": [
+					""
+				]
+			}
+		}
+	],
+	"variable": [
+		{
+			"key": "BASE_URL",
+			"value": "http://localhost:3000"
+		},
+		{
+			"key": "API_KEY",
+			"value": ""
+		}
+	]
+}

repositories/alias.go

@@ -1,6 +1,7 @@
 package repositories
 
 import (
+	"errors"
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
 )
@@ -22,3 +23,67 @@ func (r *AliasRepository) GetByUser(userId string) ([]*models.Alias, error) {
 	}
 	return aliases, nil
 }
+
+func (r *AliasRepository) GetByUserAndKey(userId, key string) ([]*models.Alias, error) {
+	var aliases []*models.Alias
+	if err := r.db.
+		Where(&models.Alias{
+			UserID: userId,
+			Key:    key,
+		}).
+		Find(&aliases).Error; err != nil {
+		return nil, err
+	}
+	return aliases, nil
+}
+
+func (r *AliasRepository) GetByUserAndKeyAndType(userId, key string, summaryType uint8) ([]*models.Alias, error) {
+	var aliases []*models.Alias
+	if err := r.db.
+		Where(&models.Alias{
+			UserID: userId,
+			Key:    key,
+			Type:   summaryType,
+		}).
+		Find(&aliases).Error; err != nil {
+		return nil, err
+	}
+	return aliases, nil
+}
+
+func (r *AliasRepository) GetByUserAndTypeAndValue(userId string, summaryType uint8, value string) (*models.Alias, error) {
+	alias := &models.Alias{}
+	if err := r.db.
+		Where(&models.Alias{
+			UserID: userId,
+			Type:   summaryType,
+			Value:  value,
+		}).
+		First(alias).Error; err != nil {
+		return nil, err
+	}
+	return alias, nil
+}
+
+func (r *AliasRepository) Insert(alias *models.Alias) (*models.Alias, error) {
+	if !alias.IsValid() {
+		return nil, errors.New("invalid alias")
+	}
+	result := r.db.Create(alias)
+	if err := result.Error; err != nil {
+		return nil, err
+	}
+	return alias, nil
+}
+
+func (r *AliasRepository) Delete(id uint) error {
+	return r.db.
+		Where("id = ?", id).
+		Delete(models.Alias{}).Error
+}
+
+func (r *AliasRepository) DeleteBatch(ids []uint) error {
+	return r.db.
+		Where("id IN ?", ids).
+		Delete(models.Alias{}).Error
+}

repositories/heartbeart.go

@@ -3,6 +3,7 @@ package repositories
 import (
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 	"time"
 )
 
@@ -15,12 +16,31 @@ func NewHeartbeatRepository(db *gorm.DB) *HeartbeatRepository {
 }
 
 func (r *HeartbeatRepository) InsertBatch(heartbeats []*models.Heartbeat) error {
-	if err := r.db.Create(&heartbeats).Error; err != nil {
+	if err := r.db.
+		Clauses(clause.OnConflict{
+			DoNothing: true,
+		}).
+		Create(&heartbeats).Error; err != nil {
 		return err
 	}
 	return nil
 }
 
+func (r *HeartbeatRepository) GetLatestByOriginAndUser(origin string, user *models.User) (*models.Heartbeat, error) {
+	var heartbeat models.Heartbeat
+	if err := r.db.
+		Model(&models.Heartbeat{}).
+		Where(&models.Heartbeat{
+			UserID: user.ID,
+			Origin: origin,
+		}).
+		Order("time desc").
+		First(&heartbeat).Error; err != nil {
+		return nil, err
+	}
+	return &heartbeat, nil
+}
+
 func (r *HeartbeatRepository) GetAllWithin(from, to time.Time, user *models.User) ([]*models.Heartbeat, error) {
 	var heartbeats []*models.Heartbeat
 	if err := r.db.
@@ -44,6 +64,57 @@ func (r *HeartbeatRepository) GetFirstByUsers() ([]*models.TimeByUser, error) {
 	return result, nil
 }
 
+func (r *HeartbeatRepository) GetLastByUsers() ([]*models.TimeByUser, error) {
+	var result []*models.TimeByUser
+	r.db.Model(&models.User{}).
+		Select("users.id as user, max(time) as time").
+		Joins("left join heartbeats on users.id = heartbeats.user_id").
+		Group("user").
+		Scan(&result)
+	return result, nil
+}
+
+func (r *HeartbeatRepository) Count() (int64, error) {
+	var count int64
+	if err := r.db.
+		Model(&models.Heartbeat{}).
+		Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func (r *HeartbeatRepository) CountByUser(user *models.User) (int64, error) {
+	var count int64
+	if err := r.db.
+		Model(&models.Heartbeat{}).
+		Where(&models.Heartbeat{UserID: user.ID}).
+		Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func (r *HeartbeatRepository) CountByUsers(users []*models.User) ([]*models.CountByUser, error) {
+	var counts []*models.CountByUser
+
+	userIds := make([]string, len(users))
+	for i, u := range users {
+		userIds[i] = u.ID
+	}
+
+	if err := r.db.
+		Model(&models.User{}).
+		Select("users.id as user, count(heartbeats.id) as count").
+		Joins("left join heartbeats on users.id = heartbeats.user_id").
+		Where("user_id in ?", userIds).
+		Group("user").
+		Find(&counts).Error; err != nil {
+		return counts, err
+	}
+	return counts, nil
+}
+
 func (r *HeartbeatRepository) DeleteBefore(t time.Time) error {
 	if err := r.db.
 		Where("time <= ?", t).

repositories/key_value.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 type KeyValueRepository struct {
@@ -27,18 +28,17 @@ func (r *KeyValueRepository) GetString(key string) (*models.KeyStringValue, erro
 
 func (r *KeyValueRepository) PutString(kv *models.KeyStringValue) error {
 	result := r.db.
+		Clauses(clause.OnConflict{
+			UpdateAll: true,
+		}).
 		Where(&models.KeyStringValue{Key: kv.Key}).
 		Assign(kv).
-		FirstOrCreate(kv)
+		Create(kv)
 
 	if err := result.Error; err != nil {
 		return err
 	}
 
-	if result.RowsAffected != 1 {
-		return errors.New("nothing updated")
-	}
-
 	return nil
 }
 

repositories/repositories.go

@@ -6,13 +6,24 @@ import (
 )
 
 type IAliasRepository interface {
+	Insert(*models.Alias) (*models.Alias, error)
+	Delete(uint) error
+	DeleteBatch([]uint) error
 	GetByUser(string) ([]*models.Alias, error)
+	GetByUserAndKey(string, string) ([]*models.Alias, error)
+	GetByUserAndKeyAndType(string, string, uint8) ([]*models.Alias, error)
+	GetByUserAndTypeAndValue(string, uint8, string) (*models.Alias, error)
 }
 
 type IHeartbeatRepository interface {
 	InsertBatch([]*models.Heartbeat) error
 	GetAllWithin(time.Time, time.Time, *models.User) ([]*models.Heartbeat, error)
 	GetFirstByUsers() ([]*models.TimeByUser, error)
+	GetLastByUsers() ([]*models.TimeByUser, error)
+	GetLatestByOriginAndUser(string, *models.User) (*models.Heartbeat, error)
+	Count() (int64, error)
+	CountByUser(*models.User) (int64, error)
+	CountByUsers([]*models.User) ([]*models.CountByUser, error)
 	DeleteBefore(time.Time) error
 }
 
@@ -38,9 +49,16 @@ type ISummaryRepository interface {
 
 type IUserRepository interface {
 	GetById(string) (*models.User, error)
+	GetByIds([]string) ([]*models.User, error)
 	GetByApiKey(string) (*models.User, error)
+	GetByEmail(string) (*models.User, error)
+	GetByResetToken(string) (*models.User, error)
 	GetAll() ([]*models.User, error)
+	GetByLoggedInAfter(time.Time) ([]*models.User, error)
+	GetByLastActiveAfter(time.Time) ([]*models.User, error)
+	Count() (int64, error)
 	InsertOrGet(*models.User) (*models.User, bool, error)
 	Update(*models.User) (*models.User, error)
 	UpdateField(*models.User, string, interface{}) (*models.User, error)
+	Delete(*models.User) error
 }

repositories/user.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
+	"time"
 )
 
 type UserRepository struct {
@@ -22,6 +23,17 @@ func (r *UserRepository) GetById(userId string) (*models.User, error) {
 	return u, nil
 }
 
+func (r *UserRepository) GetByIds(userIds []string) ([]*models.User, error) {
+	var users []*models.User
+	if err := r.db.
+		Model(&models.User{}).
+		Where("id in ?", userIds).
+		Find(&users).Error; err != nil {
+		return nil, err
+	}
+	return users, nil
+}
+
 func (r *UserRepository) GetByApiKey(key string) (*models.User, error) {
 	u := &models.User{}
 	if err := r.db.Where(&models.User{ApiKey: key}).First(u).Error; err != nil {
@@ -30,16 +42,78 @@ func (r *UserRepository) GetByApiKey(key string) (*models.User, error) {
 	return u, nil
 }
 
+func (r *UserRepository) GetByResetToken(resetToken string) (*models.User, error) {
+	if resetToken == "" {
+		return nil, errors.New("invalid input")
+	}
+	u := &models.User{}
+	if err := r.db.Where(&models.User{ResetToken: resetToken}).First(u).Error; err != nil {
+		return u, err
+	}
+	return u, nil
+}
+
+func (r *UserRepository) GetByEmail(email string) (*models.User, error) {
+	if email == "" {
+		return nil, errors.New("invalid input")
+	}
+	u := &models.User{}
+	if err := r.db.Where(&models.User{Email: email}).First(u).Error; err != nil {
+		return u, err
+	}
+	return u, nil
+}
+
 func (r *UserRepository) GetAll() ([]*models.User, error) {
 	var users []*models.User
 	if err := r.db.
-		Table("users").
+		Where(&models.User{}).
 		Find(&users).Error; err != nil {
 		return nil, err
 	}
 	return users, nil
 }
 
+func (r *UserRepository) GetByLoggedInAfter(t time.Time) ([]*models.User, error) {
+	var users []*models.User
+	if err := r.db.
+		Where("last_logged_in_at >= ?", t).
+		Find(&users).Error; err != nil {
+		return nil, err
+	}
+	return users, nil
+}
+
+// Returns a list of user ids, whose last heartbeat is not older than t
+// NOTE: Only ID field will be populated
+func (r *UserRepository) GetByLastActiveAfter(t time.Time) ([]*models.User, error) {
+	subQuery1 := r.db.Model(&models.User{}).
+		Select("users.id as user, max(time) as time").
+		Joins("left join heartbeats on users.id = heartbeats.user_id").
+		Group("user")
+
+	var userIds []string
+	if err := r.db.
+		Select("user as id").
+		Table("(?) as q", subQuery1).
+		Where("time >= ?", t).
+		Scan(&userIds).Error; err != nil {
+		return nil, err
+	}
+
+	return r.GetByIds(userIds)
+}
+
+func (r *UserRepository) Count() (int64, error) {
+	var count int64
+	if err := r.db.
+		Model(&models.User{}).
+		Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
 func (r *UserRepository) InsertOrGet(user *models.User) (*models.User, bool, error) {
 	result := r.db.FirstOrCreate(user, &models.User{ID: user.ID})
 	if err := result.Error; err != nil {
@@ -54,7 +128,23 @@ func (r *UserRepository) InsertOrGet(user *models.User) (*models.User, bool, err
 }
 
 func (r *UserRepository) Update(user *models.User) (*models.User, error) {
-	result := r.db.Model(user).Updates(user)
+	updateMap := map[string]interface{}{
+		"api_key":             user.ApiKey,
+		"password":            user.Password,
+		"email":               user.Email,
+		"last_logged_in_at":   user.LastLoggedInAt,
+		"share_data_max_days": user.ShareDataMaxDays,
+		"share_editors":       user.ShareEditors,
+		"share_languages":     user.ShareLanguages,
+		"share_oss":           user.ShareOSs,
+		"share_projects":      user.ShareProjects,
+		"share_machines":      user.ShareMachines,
+		"wakatime_api_key":    user.WakatimeApiKey,
+		"has_data":            user.HasData,
+		"reset_token":         user.ResetToken,
+	}
+
+	result := r.db.Model(user).Updates(updateMap)
 	if err := result.Error; err != nil {
 		return nil, err
 	}
@@ -78,3 +168,7 @@ func (r *UserRepository) UpdateField(user *models.User, key string, value interf
 
 	return user, nil
 }
+
+func (r *UserRepository) Delete(user *models.User) error {
+	return r.db.Delete(user).Error
+}

routes/api/health.go

@@ -0,0 +1,39 @@
+package api
+
+import (
+	"fmt"
+	"github.com/gorilla/mux"
+	"gorm.io/gorm"
+	"net/http"
+)
+
+type HealthApiHandler struct {
+	db *gorm.DB
+}
+
+func NewHealthApiHandler(db *gorm.DB) *HealthApiHandler {
+	return &HealthApiHandler{db: db}
+}
+
+func (h *HealthApiHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("/health").Subrouter()
+	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+}
+
+// @Summary Check the application's health status
+// @ID get-health
+// @Tags misc
+// @Produce plain
+// @Success 200 {string} string
+// @Router /health [get]
+func (h *HealthApiHandler) Get(w http.ResponseWriter, r *http.Request) {
+	var dbStatus int
+	if sqlDb, err := h.db.DB(); err == nil {
+		if err := sqlDb.Ping(); err == nil {
+			dbStatus = 1
+		}
+	}
+
+	w.Header().Set("Content-Type", "text/plain")
+	w.Write([]byte(fmt.Sprintf("app=1\ndb=%d", dbStatus)))
+}

routes/api/heartbeat.go

@@ -1,26 +1,30 @@
-package routes
+package api
 
 import (
 	"encoding/json"
+	"github.com/emvi/logbuch"
+	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
-	"net/http"
-	"os"
-
+	"github.com/muety/wakapi/middlewares"
+	customMiddleware "github.com/muety/wakapi/middlewares/custom"
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
+	"net/http"
 
 	"github.com/muety/wakapi/models"
 )
 
-type HeartbeatHandler struct {
+type HeartbeatApiHandler struct {
 	config              *conf.Config
+	userSrvc            services.IUserService
 	heartbeatSrvc       services.IHeartbeatService
 	languageMappingSrvc services.ILanguageMappingService
 }
 
-func NewHeartbeatHandler(heartbeatService services.IHeartbeatService, languageMappingService services.ILanguageMappingService) *HeartbeatHandler {
-	return &HeartbeatHandler{
+func NewHeartbeatApiHandler(userService services.IUserService, heartbeatService services.IHeartbeatService, languageMappingService services.ILanguageMappingService) *HeartbeatApiHandler {
+	return &HeartbeatApiHandler{
 		config:              conf.Get(),
+		userSrvc:            userService,
 		heartbeatSrvc:       heartbeatService,
 		languageMappingSrvc: languageMappingService,
 	}
@@ -30,9 +34,26 @@ type heartbeatResponseVm struct {
 	Responses [][]interface{} `json:"responses"`
 }
 
-func (h *HeartbeatHandler) ApiPost(w http.ResponseWriter, r *http.Request) {
+func (h *HeartbeatApiHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("/heartbeat").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+		customMiddleware.NewWakatimeRelayMiddleware().Handler,
+	)
+	r.Methods(http.MethodPost).HandlerFunc(h.Post)
+}
+
+// @Summary Push a new heartbeat
+// @ID post-heartbeat
+// @Tags heartbeat
+// @Accept json
+// @Param heartbeat body models.Heartbeat true "A heartbeat"
+// @Security ApiKeyAuth
+// @Success 201
+// @Router /heartbeat [post]
+func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) {
 	var heartbeats []*models.Heartbeat
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	opSys, editor, _ := utils.ParseUserAgent(r.Header.Get("User-Agent"))
 	machineName := r.Header.Get("X-Machine-Name")
 
@@ -52,17 +73,30 @@ func (h *HeartbeatHandler) ApiPost(w http.ResponseWriter, r *http.Request) {
 
 		if !hb.Valid() {
 			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte("Invalid heartbeat object."))
+			w.Write([]byte("invalid heartbeat object"))
 			return
 		}
+
+		hb.Hashed()
 	}
 
 	if err := h.heartbeatSrvc.InsertBatch(heartbeats); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		os.Stderr.WriteString(err.Error())
+		w.Write([]byte(conf.ErrInternalServerError))
+		logbuch.Error("failed to batch-insert heartbeats – %v", err)
 		return
 	}
 
+	if !user.HasData {
+		user.HasData = true
+		if _, err := h.userSrvc.Update(user); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(conf.ErrInternalServerError))
+			logbuch.Error("failed to update user – %v", err)
+			return
+		}
+	}
+
 	utils.RespondJSON(w, http.StatusCreated, constructSuccessResponse(len(heartbeats)))
 }
 

routes/api/metrics.go

@@ -0,0 +1,271 @@
+package api
+
+import (
+	"errors"
+	"github.com/emvi/logbuch"
+	"github.com/gorilla/mux"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
+	"github.com/muety/wakapi/models"
+	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
+	mm "github.com/muety/wakapi/models/metrics"
+	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+	"sort"
+	"time"
+)
+
+const (
+	MetricsPrefix = "wakatime"
+
+	DescHeartbeats       = "Total number of tracked heartbeats."
+	DescAllTime          = "Total seconds (all time)."
+	DescTotal            = "Total seconds."
+	DescEditors          = "Total seconds for each editor."
+	DescProjects         = "Total seconds for each project."
+	DescLanguages        = "Total seconds for each language."
+	DescOperatingSystems = "Total seconds for each operating system."
+	DescMachines         = "Total seconds for each machine."
+
+	DescAdminTotalTime       = "Total seconds (all users, all time)."
+	DescAdminTotalHeartbeats = "Total number of tracked heartbeats (all users, all time)"
+	DescAdminUserHeartbeats  = "Total number of tracked heartbeats by user (all time)."
+	DescAdminTotalUsers      = "Total number of registered users."
+	DescAdminActiveUsers     = "Number of active users."
+)
+
+type MetricsHandler struct {
+	config        *conf.Config
+	userSrvc      services.IUserService
+	summarySrvc   services.ISummaryService
+	heartbeatSrvc services.IHeartbeatService
+	keyValueSrvc  services.IKeyValueService
+}
+
+func NewMetricsHandler(userService services.IUserService, summaryService services.ISummaryService, heartbeatService services.IHeartbeatService, keyValueService services.IKeyValueService) *MetricsHandler {
+	return &MetricsHandler{
+		userSrvc:      userService,
+		summarySrvc:   summaryService,
+		heartbeatSrvc: heartbeatService,
+		keyValueSrvc:  keyValueService,
+		config:        conf.Get(),
+	}
+}
+
+func (h *MetricsHandler) RegisterRoutes(router *mux.Router) {
+	if !h.config.Security.ExposeMetrics {
+		return
+	}
+
+	logbuch.Info("exposing prometheus metrics under /api/metrics")
+
+	r := router.PathPrefix("/metrics").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+	)
+	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+}
+
+func (h *MetricsHandler) Get(w http.ResponseWriter, r *http.Request) {
+	reqUser := middlewares.GetPrincipal(r)
+	if reqUser == nil {
+		w.WriteHeader(http.StatusUnauthorized)
+		w.Write([]byte(conf.ErrUnauthorized))
+		return
+	}
+
+	var metrics mm.Metrics
+
+	if userMetrics, err := h.getUserMetrics(reqUser); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		w.Write([]byte(conf.ErrInternalServerError))
+		return
+	} else {
+		for _, m := range *userMetrics {
+			metrics = append(metrics, m)
+		}
+	}
+
+	if reqUser.IsAdmin {
+		if adminMetrics, err := h.getAdminMetrics(reqUser); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(conf.ErrInternalServerError))
+			return
+		} else {
+			for _, m := range *adminMetrics {
+				metrics = append(metrics, m)
+			}
+		}
+	}
+
+	sort.Sort(metrics)
+
+	w.Header().Set("content-type", "text/plain; charset=utf-8")
+	w.Write([]byte(metrics.Print()))
+}
+
+func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error) {
+	var metrics mm.Metrics
+
+	summaryAllTime, err := h.summarySrvc.Aliased(time.Time{}, time.Now(), user, h.summarySrvc.Retrieve, false)
+	if err != nil {
+		logbuch.Error("failed to retrieve all time summary for user '%s' for metric", user.ID)
+		return nil, err
+	}
+
+	from, to := utils.MustResolveIntervalRaw("today")
+
+	summaryToday, err := h.summarySrvc.Aliased(from, to, user, h.summarySrvc.Retrieve, false)
+	if err != nil {
+		logbuch.Error("failed to retrieve today's summary for user '%s' for metric", user.ID)
+		return nil, err
+	}
+
+	heartbeatCount, err := h.heartbeatSrvc.CountByUser(user)
+	if err != nil {
+		logbuch.Error("failed to count heartbeats for user '%s' for metric", user.ID)
+		return nil, err
+	}
+
+	// User Metrics
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_cumulative_seconds_total",
+		Desc:   DescAllTime,
+		Value:  int(v1.NewAllTimeFrom(summaryAllTime, &models.Filters{}).Data.TotalSeconds),
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_seconds_total",
+		Desc:   DescTotal,
+		Value:  int(summaryToday.TotalTime().Seconds()),
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_heartbeats_total",
+		Desc:   DescHeartbeats,
+		Value:  int(heartbeatCount),
+		Labels: []mm.Label{},
+	})
+
+	for _, p := range summaryToday.Projects {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_project_seconds_total",
+			Desc:   DescProjects,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryProject, p.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: p.Key}},
+		})
+	}
+
+	for _, l := range summaryToday.Languages {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_language_seconds_total",
+			Desc:   DescLanguages,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryLanguage, l.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: l.Key}},
+		})
+	}
+
+	for _, e := range summaryToday.Editors {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_editor_seconds_total",
+			Desc:   DescEditors,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryEditor, e.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: e.Key}},
+		})
+	}
+
+	for _, o := range summaryToday.OperatingSystems {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_operating_system_seconds_total",
+			Desc:   DescOperatingSystems,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryOS, o.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: o.Key}},
+		})
+	}
+
+	for _, m := range summaryToday.Machines {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_machine_seconds_total",
+			Desc:   DescMachines,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryMachine, m.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: m.Key}},
+		})
+	}
+
+	return &metrics, nil
+}
+
+func (h *MetricsHandler) getAdminMetrics(user *models.User) (*mm.Metrics, error) {
+	var metrics mm.Metrics
+
+	if !user.IsAdmin {
+		return nil, errors.New("unauthorized")
+	}
+
+	var totalSeconds int
+	if t, err := h.keyValueSrvc.GetString(conf.KeyLatestTotalTime); err == nil && t != nil && t.Value != "" {
+		if d, err := time.ParseDuration(t.Value); err == nil {
+			totalSeconds = int(d.Seconds())
+		}
+	}
+
+	totalUsers, _ := h.userSrvc.Count()
+	totalHeartbeats, _ := h.heartbeatSrvc.Count()
+
+	activeUsers, err := h.userSrvc.GetActive()
+	if err != nil {
+		logbuch.Error("failed to retrieve active users for metric – %v", err)
+		return nil, err
+	}
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_admin_seconds_total",
+		Desc:   DescAdminTotalTime,
+		Value:  totalSeconds,
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_admin_heartbeats_total",
+		Desc:   DescAdminTotalHeartbeats,
+		Value:  int(totalHeartbeats),
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_admin_users_total",
+		Desc:   DescAdminTotalUsers,
+		Value:  int(totalUsers),
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_admin_users_active_total",
+		Desc:   DescAdminActiveUsers,
+		Value:  len(activeUsers),
+		Labels: []mm.Label{},
+	})
+
+	// Count per-user heartbeats
+
+	userCounts, err := h.heartbeatSrvc.CountByUsers(activeUsers)
+	if err != nil {
+		logbuch.Error("failed to count heartbeats for active users", err.Error())
+		return nil, err
+	}
+
+	for _, uc := range userCounts {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_admin_user_heartbeats_total",
+			Desc:   DescAdminUserHeartbeats,
+			Value:  int(uc.Count),
+			Labels: []mm.Label{{Key: "user", Value: uc.User}},
+		})
+	}
+
+	return &metrics, nil
+}

routes/api/summary.go

@@ -0,0 +1,55 @@
+package api
+
+import (
+	"github.com/gorilla/mux"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
+	su "github.com/muety/wakapi/routes/utils"
+	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+)
+
+type SummaryApiHandler struct {
+	config      *conf.Config
+	userSrvc    services.IUserService
+	summarySrvc services.ISummaryService
+}
+
+func NewSummaryApiHandler(userService services.IUserService, summaryService services.ISummaryService) *SummaryApiHandler {
+	return &SummaryApiHandler{
+		summarySrvc: summaryService,
+		userSrvc:    userService,
+		config:      conf.Get(),
+	}
+}
+
+func (h *SummaryApiHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("/summary").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+	)
+	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+}
+
+// @Summary Retrieve a summary
+// @ID get-summary
+// @Tags summary
+// @Produce json
+// @Param interval query string false "Interval identifier" Enums(today, yesterday, week, month, year, 7_days, last_7_days, 30_days, last_30_days, 12_months, last_12_months, any)
+// @Param from query string false "Start date (e.g. '2021-02-07')"
+// @Param to query string false "End date (e.g. '2021-02-08')"
+// @Param recompute query bool false "Whether to recompute the summary from raw heartbeat or use cache"
+// @Security ApiKeyAuth
+// @Success 200 {object} models.Summary
+// @Router /summary [get]
+func (h *SummaryApiHandler) Get(w http.ResponseWriter, r *http.Request) {
+	summary, err, status := su.LoadUserSummary(h.summarySrvc, r)
+	if err != nil {
+		w.WriteHeader(status)
+		w.Write([]byte(err.Error()))
+		return
+	}
+
+	utils.RespondJSON(w, http.StatusOK, summary)
+}

routes/compat/shields/v1/badge.go

@@ -1,15 +1,17 @@
 package v1
 
 import (
+	"fmt"
 	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/shields/v1"
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
+	"github.com/patrickmn/go-cache"
 	"net/http"
 	"regexp"
-	"strings"
+	"time"
 )
 
 const (
@@ -21,32 +23,38 @@ type BadgeHandler struct {
 	config      *conf.Config
 	userSrvc    services.IUserService
 	summarySrvc services.ISummaryService
+	cache       *cache.Cache
 }
 
 func NewBadgeHandler(summaryService services.ISummaryService, userService services.IUserService) *BadgeHandler {
 	return &BadgeHandler{
 		summarySrvc: summaryService,
 		userSrvc:    userService,
+		cache:       cache.New(time.Hour, time.Hour),
 		config:      conf.Get(),
 	}
 }
 
-func (h *BadgeHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
+func (h *BadgeHandler) RegisterRoutes(router *mux.Router) {
+	// no auth middleware here, handler itself resolves the user
+	r := router.PathPrefix("/compat/shields/v1/{user}").Subrouter()
+	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+}
+
+// @Summary Get badge data
+// @Description Retrieve total time for a given entity (e.g. a project) within a given range (e.g. one week) in a format compatible with [Shields.io](https://shields.io/endpoint). Requires public data access to be allowed.
+// @ID get-badge
+// @Tags badges
+// @Produce json
+// @Param user path string true "User ID to fetch data for"
+// @Param interval path string true "Interval to aggregate data for" Enums(today, yesterday, week, month, year, 7_days, last_7_days, 30_days, last_30_days, 12_months, last_12_months, any)
+// @Param filter path string true "Filter to apply (e.g. 'project:wakapi' or 'language:Go')"
+// @Success 200 {object} v1.BadgeData
+// @Router /compat/shields/v1/{user}/{interval}/{filter} [get]
+func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	intervalReg := regexp.MustCompile(intervalPattern)
 	entityFilterReg := regexp.MustCompile(entityFilterPattern)
 
-	if userAgent := r.Header.Get("user-agent"); !strings.HasPrefix(userAgent, "Shields.io/") && !h.config.IsDev() {
-		w.WriteHeader(http.StatusForbidden)
-		return
-	}
-
-	requestedUserId := mux.Vars(r)["user"]
-	user, err := h.userSrvc.GetUserById(requestedUserId)
-	if err != nil || !user.BadgesEnabled {
-		w.WriteHeader(http.StatusUnauthorized)
-		return
-	}
-
 	var filterEntity, filterKey string
 	if groups := entityFilterReg.FindStringSubmatch(r.URL.Path); len(groups) > 2 {
 		filterEntity, filterKey = groups[1], groups[2]
@@ -54,7 +62,25 @@ func (h *BadgeHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
 
 	var interval = models.IntervalPast30Days
 	if groups := intervalReg.FindStringSubmatch(r.URL.Path); len(groups) > 1 {
-		interval = groups[1]
+		if i, err := utils.ParseInterval(groups[1]); err == nil {
+			interval = i
+		}
+	}
+
+	requestedUserId := mux.Vars(r)["user"]
+	user, err := h.userSrvc.GetUserById(requestedUserId)
+	if err != nil {
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+
+	_, rangeFrom, rangeTo := utils.ResolveInterval(interval)
+	minStart := utils.StartOfDay(rangeTo.Add(-24 * time.Hour * time.Duration(user.ShareDataMaxDays)))
+	// negative value means no limit
+	if rangeFrom.Before(minStart) && user.ShareDataMaxDays >= 0 {
+		w.WriteHeader(http.StatusForbidden)
+		w.Write([]byte("requested time range too broad"))
+		return
 	}
 
 	var filters *models.Filters
@@ -73,6 +99,12 @@ func (h *BadgeHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
 		filters = &models.Filters{}
 	}
 
+	cacheKey := fmt.Sprintf("%s_%v_%s_%s", user.ID, *interval, filterEntity, filterKey)
+	if cacheResult, ok := h.cache.Get(cacheKey); ok {
+		utils.RespondJSON(w, http.StatusOK, cacheResult.(*v1.BadgeData))
+		return
+	}
+
 	summary, err, status := h.loadUserSummary(user, interval)
 	if err != nil {
 		w.WriteHeader(status)
@@ -81,10 +113,11 @@ func (h *BadgeHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vm := v1.NewBadgeDataFrom(summary, filters)
+	h.cache.SetDefault(cacheKey, vm)
 	utils.RespondJSON(w, http.StatusOK, vm)
 }
 
-func (h *BadgeHandler) loadUserSummary(user *models.User, interval string) (*models.Summary, error, int) {
+func (h *BadgeHandler) loadUserSummary(user *models.User, interval *models.IntervalKey) (*models.Summary, error, int) {
 	err, from, to := utils.ResolveInterval(interval)
 	if err != nil {
 		return nil, err, http.StatusBadRequest
@@ -101,7 +134,7 @@ func (h *BadgeHandler) loadUserSummary(user *models.User, interval string) (*mod
 		retrieveSummary = h.summarySrvc.Summarize
 	}
 
-	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
+	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}

routes/compat/wakatime/v1/all_time.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
 	"github.com/muety/wakapi/services"
@@ -14,22 +15,41 @@ import (
 
 type AllTimeHandler struct {
 	config      *conf.Config
+	userSrvc    services.IUserService
 	summarySrvc services.ISummaryService
 }
 
-func NewAllTimeHandler(summaryService services.ISummaryService) *AllTimeHandler {
+func NewAllTimeHandler(userService services.IUserService, summaryService services.ISummaryService) *AllTimeHandler {
 	return &AllTimeHandler{
+		userSrvc:    userService,
 		summarySrvc: summaryService,
 		config:      conf.Get(),
 	}
 }
 
-func (h *AllTimeHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
+func (h *AllTimeHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("/compat/wakatime/v1/users/{user}/all_time_since_today").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+	)
+	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+}
+
+// @Summary Retrieve summary for all time
+// @Description Mimics https://wakatime.com/developers#all_time_since_today
+// @ID get-all-time
+// @Tags wakatime
+// @Produce json
+// @Param user path string true "User ID to fetch data for (or 'current')"
+// @Security ApiKeyAuth
+// @Success 200 {object} v1.AllTimeViewModel
+// @Router /compat/wakatime/v1/users/{user}/all_time_since_today [get]
+func (h *AllTimeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	values, _ := url.ParseQuery(r.URL.RawQuery)
 
 	requestedUser := vars["user"]
-	authorizedUser := r.Context().Value(models.UserKey).(*models.User)
+	authorizedUser := middlewares.GetPrincipal(r)
 
 	if requestedUser != authorizedUser.ID && requestedUser != "current" {
 		w.WriteHeader(http.StatusForbidden)
@@ -60,7 +80,7 @@ func (h *AllTimeHandler) loadUserSummary(user *models.User) (*models.Summary, er
 		retrieveSummary = h.summarySrvc.Summarize
 	}
 
-	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
+	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}

routes/compat/wakatime/v1/stats.go

@@ -0,0 +1,123 @@
+package v1
+
+import (
+	"github.com/gorilla/mux"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
+	"github.com/muety/wakapi/models"
+	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
+	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+	"time"
+)
+
+type StatsHandler struct {
+	config      *conf.Config
+	userSrvc    services.IUserService
+	summarySrvc services.ISummaryService
+}
+
+func NewStatsHandler(userService services.IUserService, summaryService services.ISummaryService) *StatsHandler {
+	return &StatsHandler{
+		userSrvc:    userService,
+		summarySrvc: summaryService,
+		config:      conf.Get(),
+	}
+}
+
+func (h *StatsHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).WithOptionalFor([]string{"/"}).Handler,
+	)
+	r.Path("/v1/users/{user}/stats/{range}").Methods(http.MethodGet).HandlerFunc(h.Get)
+	r.Path("/compat/wakatime/v1/users/{user}/stats/{range}").Methods(http.MethodGet).HandlerFunc(h.Get)
+
+	// Also works without range, see https://github.com/anuraghazra/github-readme-stats/issues/865#issuecomment-776186592
+	r.Path("/v1/users/{user}/stats").Methods(http.MethodGet).HandlerFunc(h.Get)
+	r.Path("/compat/wakatime/v1/users/{user}/stats").Methods(http.MethodGet).HandlerFunc(h.Get)
+}
+
+// TODO: support filtering (requires https://github.com/muety/wakapi/issues/108)
+
+func (h *StatsHandler) Get(w http.ResponseWriter, r *http.Request) {
+	var vars = mux.Vars(r)
+	var authorizedUser, requestedUser *models.User
+
+	authorizedUser = middlewares.GetPrincipal(r)
+	if authorizedUser != nil && vars["user"] == "current" {
+		vars["user"] = authorizedUser.ID
+	}
+
+	requestedUser, err := h.userSrvc.GetUserById(vars["user"])
+	if err != nil {
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte("user not found"))
+		return
+	}
+
+	rangeParam := vars["range"]
+	if rangeParam == "" {
+		rangeParam = (*models.IntervalPast7Days)[0]
+	}
+
+	err, rangeFrom, rangeTo := utils.ResolveIntervalRaw(rangeParam)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte("invalid range"))
+		return
+	}
+
+	minStart := utils.StartOfDay(rangeTo.Add(-24 * time.Hour * time.Duration(requestedUser.ShareDataMaxDays)))
+	if (authorizedUser == nil || requestedUser.ID != authorizedUser.ID) &&
+		rangeFrom.Before(minStart) && requestedUser.ShareDataMaxDays >= 0 {
+		w.WriteHeader(http.StatusForbidden)
+		w.Write([]byte("requested time range too broad"))
+		return
+	}
+
+	summary, err, status := h.loadUserSummary(requestedUser, rangeFrom, rangeTo)
+	if err != nil {
+		w.WriteHeader(status)
+		w.Write([]byte(err.Error()))
+		return
+	}
+
+	stats := v1.NewStatsFrom(summary, &models.Filters{})
+
+	// post filter stats according to user's given sharing permissions
+	if !requestedUser.ShareEditors {
+		stats.Data.Editors = nil
+	}
+	if !requestedUser.ShareLanguages {
+		stats.Data.Languages = nil
+	}
+	if !requestedUser.ShareProjects {
+		stats.Data.Projects = nil
+	}
+	if !requestedUser.ShareOSs {
+		stats.Data.OperatingSystems = nil
+	}
+	if !requestedUser.ShareMachines {
+		stats.Data.Machines = nil
+	}
+
+	utils.RespondJSON(w, http.StatusOK, stats)
+}
+
+func (h *StatsHandler) loadUserSummary(user *models.User, start, end time.Time) (*models.Summary, error, int) {
+	overallParams := &models.SummaryParams{
+		From:      start,
+		To:        end,
+		User:      user,
+		Recompute: false,
+	}
+
+	summary, err := h.summarySrvc.Aliased(overallParams.From, overallParams.To, user, h.summarySrvc.Retrieve, false)
+	if err != nil {
+		return nil, err, http.StatusInternalServerError
+	}
+
+	return summary, nil, http.StatusOK
+}

routes/compat/wakatime/v1/summaries.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
 	"github.com/muety/wakapi/services"
@@ -15,26 +16,47 @@ import (
 
 type SummariesHandler struct {
 	config      *conf.Config
+	userSrvc    services.IUserService
 	summarySrvc services.ISummaryService
 }
 
-func NewSummariesHandler(summaryService services.ISummaryService) *SummariesHandler {
+func NewSummariesHandler(userService services.IUserService, summaryService services.ISummaryService) *SummariesHandler {
 	return &SummariesHandler{
+		userSrvc:    userService,
 		summarySrvc: summaryService,
 		config:      conf.Get(),
 	}
 }
 
-/*
-TODO: support parameters: project, branches, timeout, writes_only, timezone
-https://wakatime.com/developers#summaries
-timezone can be specified via an offset suffix (e.g. +02:00) in date strings
-*/
+func (h *SummariesHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("/compat/wakatime/v1/users/{user}/summaries").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+	)
+	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+}
 
-func (h *SummariesHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
+// TODO: Support parameters: project, branches, timeout, writes_only, timezone
+// See https://wakatime.com/developers#summaries.
+// Timezone can be specified via an offset suffix (e.g. +02:00) in date strings.
+// Requires https://github.com/muety/wakapi/issues/108.
+
+// @Summary Retrieve WakaTime-compatible summaries
+// @Description Mimics https://wakatime.com/developers#summaries.
+// @ID get-wakatime-summaries
+// @Tags wakatime
+// @Produce json
+// @Param user path string true "User ID to fetch data for (or 'current')"
+// @Param range query string false "Range interval identifier" Enums(today, yesterday, week, month, year, 7_days, last_7_days, 30_days, last_30_days, 12_months, last_12_months, any)
+// @Param start query string false "Start date (e.g. '2021-02-07')"
+// @Param end query string false "End date (e.g. '2021-02-08')"
+// @Security ApiKeyAuth
+// @Success 200 {object} v1.SummariesViewModel
+// @Router /compat/wakatime/v1/users/{user}/summaries [get]
+func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	requestedUser := vars["user"]
-	authorizedUser := r.Context().Value(models.UserKey).(*models.User)
+	authorizedUser := middlewares.GetPrincipal(r)
 
 	if requestedUser != authorizedUser.ID && requestedUser != "current" {
 		w.WriteHeader(http.StatusForbidden)
@@ -48,28 +70,41 @@ func (h *SummariesHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	vm := v1.NewSummariesFrom(summaries, &models.Filters{})
+	filters := &models.Filters{}
+	if projectQuery := r.URL.Query().Get("project"); projectQuery != "" {
+		filters.Project = projectQuery
+	}
+
+	vm := v1.NewSummariesFrom(summaries, filters)
 	utils.RespondJSON(w, http.StatusOK, vm)
 }
 
 func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary, error, int) {
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	params := r.URL.Query()
+	rangeParam, startParam, endParam := params.Get("range"), params.Get("start"), params.Get("end")
 
 	var start, end time.Time
-	// TODO: find out what other special dates are supported by wakatime (e.g. tomorrow, yesterday, ...?)
-	if startKey, endKey := params.Get("start"), params.Get("end"); startKey == "today" && startKey == endKey {
-		start = utils.StartOfToday()
-		end = time.Now()
+	if rangeParam != "" {
+		// range param takes precedence
+		if err, parsedFrom, parsedTo := utils.ResolveIntervalRaw(rangeParam); err == nil {
+			start, end = parsedFrom, parsedTo
+		} else {
+			return nil, errors.New("invalid 'range' parameter"), http.StatusBadRequest
+		}
+	} else if err, parsedFrom, parsedTo := utils.ResolveIntervalRaw(startParam); err == nil && startParam == endParam {
+		// also accept start param to be a range param
+		start, end = parsedFrom, parsedTo
 	} else {
+		// eventually, consider start and end params a date
 		var err error
 
-		start, err = time.Parse(time.RFC3339, strings.Replace(startKey, " ", "+", 1))
+		start, err = time.Parse(time.RFC3339, strings.Replace(startParam, " ", "+", 1))
 		if err != nil {
 			return nil, errors.New("missing required 'start' parameter"), http.StatusBadRequest
 		}
 
-		end, err = time.Parse(time.RFC3339, strings.Replace(endKey, " ", "+", 1))
+		end, err = time.Parse(time.RFC3339, strings.Replace(endParam, " ", "+", 1))
 		if err != nil {
 			return nil, errors.New("missing required 'end' parameter"), http.StatusBadRequest
 		}
@@ -86,7 +121,7 @@ func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary
 	summaries := make([]*models.Summary, len(intervals))
 
 	for i, interval := range intervals {
-		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve)
+		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve, false)
 		if err != nil {
 			return nil, err, http.StatusInternalServerError
 		}

routes/handler.go

@@ -0,0 +1,7 @@
+package routes
+
+import "github.com/gorilla/mux"
+
+type Handler interface {
+	RegisterRoutes(router *mux.Router)
+}

routes/health.go

@@ -1,27 +0,0 @@
-package routes
-
-import (
-	"fmt"
-	"gorm.io/gorm"
-	"net/http"
-)
-
-type HealthHandler struct {
-	db *gorm.DB
-}
-
-func NewHealthHandler(db *gorm.DB) *HealthHandler {
-	return &HealthHandler{db: db}
-}
-
-func (h *HealthHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
-	var dbStatus int
-	if sqlDb, err := h.db.DB(); err == nil {
-		if err := sqlDb.Ping(); err == nil {
-			dbStatus = 1
-		}
-	}
-
-	w.Header().Set("Content-Type", "text/plain")
-	w.Write([]byte(fmt.Sprintf("app=1\ndb=%d", dbStatus)))
-}

routes/home.go

@@ -2,26 +2,37 @@ package routes
 
 import (
 	"fmt"
+	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
+	"github.com/muety/wakapi/services"
 	"net/http"
+	"strconv"
+	"time"
 )
 
 type HomeHandler struct {
-	config *conf.Config
+	config       *conf.Config
+	keyValueSrvc services.IKeyValueService
 }
 
 var loginDecoder = schema.NewDecoder()
 var signupDecoder = schema.NewDecoder()
+var resetPasswordDecoder = schema.NewDecoder()
 
-func NewHomeHandler() *HomeHandler {
+func NewHomeHandler(keyValueService services.IKeyValueService) *HomeHandler {
 	return &HomeHandler{
-		config: conf.Get(),
+		config:       conf.Get(),
+		keyValueSrvc: keyValueService,
 	}
 }
 
+func (h *HomeHandler) RegisterRoutes(router *mux.Router) {
+	router.Path("/").Methods(http.MethodGet).HandlerFunc(h.GetIndex)
+}
+
 func (h *HomeHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 	if h.config.IsDev() {
 		loadTemplates()
@@ -36,8 +47,25 @@ func (h *HomeHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *HomeHandler) buildViewModel(r *http.Request) *view.HomeViewModel {
+	var totalHours int
+	var totalUsers int
+
+	if t, err := h.keyValueSrvc.GetString(conf.KeyLatestTotalTime); err == nil && t != nil && t.Value != "" {
+		if d, err := time.ParseDuration(t.Value); err == nil {
+			totalHours = int(d.Hours())
+		}
+	}
+
+	if t, err := h.keyValueSrvc.GetString(conf.KeyLatestTotalUsers); err == nil && t != nil && t.Value != "" {
+		if d, err := strconv.Atoi(t.Value); err == nil {
+			totalUsers = d
+		}
+	}
+
 	return &view.HomeViewModel{
-		Success: r.URL.Query().Get("success"),
-		Error:   r.URL.Query().Get("error"),
+		Success:    r.URL.Query().Get("success"),
+		Error:      r.URL.Query().Get("error"),
+		TotalHours: totalHours,
+		TotalUsers: totalUsers,
 	}
 }

routes/imprint.go

@@ -1,6 +1,7 @@
 package routes
 
 import (
+	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
@@ -20,6 +21,10 @@ func NewImprintHandler(keyValueService services.IKeyValueService) *ImprintHandle
 	}
 }
 
+func (h *ImprintHandler) RegisterRoutes(router *mux.Router) {
+	router.Path("/imprint").Methods(http.MethodGet).HandlerFunc(h.GetImprint)
+}
+
 func (h *ImprintHandler) GetImprint(w http.ResponseWriter, r *http.Request) {
 	if h.config.IsDev() {
 		loadTemplates()

routes/login.go

@@ -2,27 +2,44 @@ package routes
 
 import (
 	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
 	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
 	"net/http"
+	"net/url"
 	"time"
 )
 
 type LoginHandler struct {
 	config   *conf.Config
 	userSrvc services.IUserService
+	mailSrvc services.IMailService
 }
 
-func NewLoginHandler(userService services.IUserService) *LoginHandler {
+func NewLoginHandler(userService services.IUserService, mailService services.IMailService) *LoginHandler {
 	return &LoginHandler{
 		config:   conf.Get(),
 		userSrvc: userService,
+		mailSrvc: mailService,
 	}
 }
 
+func (h *LoginHandler) RegisterRoutes(router *mux.Router) {
+	router.Path("/login").Methods(http.MethodGet).HandlerFunc(h.GetIndex)
+	router.Path("/login").Methods(http.MethodPost).HandlerFunc(h.PostLogin)
+	router.Path("/logout").Methods(http.MethodPost).HandlerFunc(h.PostLogout)
+	router.Path("/signup").Methods(http.MethodGet).HandlerFunc(h.GetSignup)
+	router.Path("/signup").Methods(http.MethodPost).HandlerFunc(h.PostSignup)
+	router.Path("/set-password").Methods(http.MethodGet).HandlerFunc(h.GetSetPassword)
+	router.Path("/set-password").Methods(http.MethodPost).HandlerFunc(h.PostSetPassword)
+	router.Path("/reset-password").Methods(http.MethodGet).HandlerFunc(h.GetResetPassword)
+	router.Path("/reset-password").Methods(http.MethodPost).HandlerFunc(h.PostResetPassword)
+}
+
 func (h *LoginHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 	if h.config.IsDev() {
 		loadTemplates()
@@ -65,14 +82,13 @@ func (h *LoginHandler) PostLogin(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// TODO: depending on middleware package here is a hack
-	if !middlewares.CheckAndMigratePassword(user, &login, h.config.Security.PasswordSalt, &h.userSrvc) {
+	if !utils.CompareBcrypt(user.Password, login.Password, h.config.Security.PasswordSalt) {
 		w.WriteHeader(http.StatusUnauthorized)
 		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r).WithError("invalid credentials"))
 		return
 	}
 
-	encoded, err := h.config.Security.SecureCookie.Encode(models.AuthCookieKey, login)
+	encoded, err := h.config.Security.SecureCookie.Encode(models.AuthCookieKey, login.Username)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r).WithError("internal server error"))
@@ -113,6 +129,12 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 		loadTemplates()
 	}
 
+	if !h.config.IsDev() && !h.config.Security.AllowSignup {
+		w.WriteHeader(http.StatusForbidden)
+		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("registration is disabled on this server"))
+		return
+	}
+
 	if cookie, err := r.Cookie(models.AuthCookieKey); err == nil && cookie.Value != "" {
 		http.Redirect(w, r, fmt.Sprintf("%s/summary", h.config.Server.BasePath), http.StatusFound)
 		return
@@ -136,7 +158,9 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, created, err := h.userSrvc.CreateOrGet(&signup)
+	numUsers, _ := h.userSrvc.Count()
+
+	_, created, err := h.userSrvc.CreateOrGet(&signup, numUsers == 0)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("failed to create new user"))
@@ -151,9 +175,134 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "account created successfully"), http.StatusFound)
 }
 
+func (h *LoginHandler) GetResetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+	templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r))
+}
+
+func (h *LoginHandler) GetSetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	values, _ := url.ParseQuery(r.URL.RawQuery)
+	token := values.Get("token")
+	if token == "" {
+		w.WriteHeader(http.StatusUnauthorized)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid or missing token"))
+		return
+	}
+
+	vm := &view.SetPasswordViewModel{
+		LoginViewModel: *h.buildViewModel(r),
+		Token:          token,
+	}
+
+	templates[conf.SetPasswordTemplate].Execute(w, vm)
+}
+
+func (h *LoginHandler) PostSetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	var setRequest models.SetPasswordRequest
+	if err := r.ParseForm(); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+	if err := signupDecoder.Decode(&setRequest, r.PostForm); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+
+	user, err := h.userSrvc.GetUserByResetToken(setRequest.Token)
+	if err != nil {
+		w.WriteHeader(http.StatusUnauthorized)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid token"))
+		return
+	}
+
+	if !setRequest.IsValid() {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid parameters"))
+		return
+	}
+
+	user.Password = setRequest.Password
+	user.ResetToken = ""
+	if hash, err := utils.HashBcrypt(user.Password, h.config.Security.PasswordSalt); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to set new password"))
+		return
+	} else {
+		user.Password = hash
+	}
+
+	if _, err := h.userSrvc.Update(user); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to save new password"))
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("%s/login?success=%s", h.config.Server.BasePath, "password updated successfully"), http.StatusFound)
+}
+
+func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	if !h.config.Mail.Enabled {
+		w.WriteHeader(http.StatusNotImplemented)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("mailing is disabled on this server"))
+		return
+	}
+
+	var resetRequest models.ResetPasswordRequest
+	if err := r.ParseForm(); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+	if err := resetPasswordDecoder.Decode(&resetRequest, r.PostForm); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+
+	if user, err := h.userSrvc.GetUserByEmail(resetRequest.Email); user != nil && err == nil {
+		if u, err := h.userSrvc.GenerateResetToken(user); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to generate password reset token"))
+			return
+		} else {
+			go func(user *models.User) {
+				link := fmt.Sprintf("%s/set-password?token=%s", h.config.Server.GetPublicUrl(), user.ResetToken)
+				if err := h.mailSrvc.SendPasswordReset(user, link); err != nil {
+					logbuch.Error("failed to send password reset mail to %s – %v", user.ID, err)
+				} else {
+					logbuch.Info("sent password reset mail to %s", user.ID)
+				}
+			}(u)
+		}
+	} else {
+		logbuch.Warn("password reset requested for unregistered address '%s'", resetRequest.Email)
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "an e-mail was sent to you in case your e-mail address was registered"), http.StatusFound)
+}
+
 func (h *LoginHandler) buildViewModel(r *http.Request) *view.LoginViewModel {
+	numUsers, _ := h.userSrvc.Count()
+
 	return &view.LoginViewModel{
-		Success: r.URL.Query().Get("success"),
-		Error:   r.URL.Query().Get("error"),
+		Success:    r.URL.Query().Get("success"),
+		Error:      r.URL.Query().Get("error"),
+		TotalUsers: int(numUsers),
 	}
 }

routes/routes.go

@@ -2,10 +2,13 @@ package routes
 
 import (
 	"fmt"
+	"github.com/markbates/pkger"
 	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/utils"
 	"html/template"
 	"io/ioutil"
+	"net/http"
 	"path"
 	"strings"
 )
@@ -14,15 +17,27 @@ func Init() {
 	loadTemplates()
 }
 
+type action func(w http.ResponseWriter, r *http.Request) (int, string, string)
+
 var templates map[string]*template.Template
 
 func loadTemplates() {
-	tplPath := "views"
+	const tplPath = "/views"
 	tpls := template.New("").Funcs(template.FuncMap{
-		"json":       utils.Json,
-		"date":       utils.FormatDateHuman,
-		"title":      strings.Title,
-		"capitalize": utils.Capitalize,
+		"json":           utils.Json,
+		"date":           utils.FormatDateHuman,
+		"simpledate":     utils.FormatDate,
+		"simpledatetime": utils.FormatDateTime,
+		"title":          strings.Title,
+		"join":           strings.Join,
+		"add":            utils.Add,
+		"capitalize":     utils.Capitalize,
+		"toRunes":        utils.ToRunes,
+		"entityTypes":    models.SummaryTypes,
+		"typeName":       typeName,
+		"isDev": func() bool {
+			return config.Get().IsDev()
+		},
 		"getBasePath": func() string {
 			return config.Get().Server.BasePath
 		},
@@ -30,7 +45,7 @@ func loadTemplates() {
 			return config.Get().Version
 		},
 		"getDbType": func() string {
-			return strings.ToLower(config.Get().Db.Dialect)
+			return strings.ToLower(config.Get().Db.Type)
 		},
 		"htmlSafe": func(html string) template.HTML {
 			return template.HTML(html)
@@ -38,7 +53,12 @@ func loadTemplates() {
 	})
 	templates = make(map[string]*template.Template)
 
-	files, err := ioutil.ReadDir(tplPath)
+	dir, err := pkger.Open(tplPath)
+	if err != nil {
+		panic(err)
+	}
+	defer dir.Close()
+	files, err := dir.Readdir(0)
 	if err != nil {
 		panic(err)
 	}
@@ -49,7 +69,18 @@ func loadTemplates() {
 			continue
 		}
 
-		tpl, err := tpls.New(tplName).ParseFiles(fmt.Sprintf("%s/%s", tplPath, tplName))
+		templateFile, err := pkger.Open(fmt.Sprintf("%s/%s", tplPath, tplName))
+		if err != nil {
+			panic(err)
+		}
+		templateData, err := ioutil.ReadAll(templateFile)
+		if err != nil {
+			panic(err)
+		}
+
+		templateFile.Close()
+
+		tpl, err := tpls.New(tplName).Parse(string(templateData))
 		if err != nil {
 			panic(err)
 		}
@@ -57,3 +88,26 @@ func loadTemplates() {
 		templates[tplName] = tpl
 	}
 }
+
+func typeName(t uint8) string {
+	if t == models.SummaryProject {
+		return "project"
+	}
+	if t == models.SummaryLanguage {
+		return "language"
+	}
+	if t == models.SummaryEditor {
+		return "editor"
+	}
+	if t == models.SummaryOS {
+		return "operating system"
+	}
+	if t == models.SummaryMachine {
+		return "machine"
+	}
+	return "unknown"
+}
+
+func defaultErrorRedirectTarget() string {
+	return fmt.Sprintf("%s/?error=unauthorized", config.Get().Server.BasePath)
+}

routes/settings.go

@@ -1,38 +1,71 @@
 package routes
 
 import (
+	"encoding/base64"
 	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
 	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/services/imports"
 	"github.com/muety/wakapi/utils"
-	"log"
 	"net/http"
 	"strconv"
+	"time"
 )
 
 type SettingsHandler struct {
 	config              *conf.Config
 	userSrvc            services.IUserService
 	summarySrvc         services.ISummaryService
+	heartbeatSrvc       services.IHeartbeatService
+	aliasSrvc           services.IAliasService
 	aggregationSrvc     services.IAggregationService
 	languageMappingSrvc services.ILanguageMappingService
+	keyValueSrvc        services.IKeyValueService
+	mailSrvc            services.IMailService
+	httpClient          *http.Client
 }
 
 var credentialsDecoder = schema.NewDecoder()
 
-func NewSettingsHandler(userService services.IUserService, summaryService services.ISummaryService, aggregationService services.IAggregationService, languageMappingService services.ILanguageMappingService) *SettingsHandler {
+func NewSettingsHandler(
+	userService services.IUserService,
+	heartbeatService services.IHeartbeatService,
+	summaryService services.ISummaryService,
+	aliasService services.IAliasService,
+	aggregationService services.IAggregationService,
+	languageMappingService services.ILanguageMappingService,
+	keyValueService services.IKeyValueService,
+	mailService services.IMailService,
+) *SettingsHandler {
 	return &SettingsHandler{
 		config:              conf.Get(),
 		summarySrvc:         summaryService,
+		aliasSrvc:           aliasService,
 		aggregationSrvc:     aggregationService,
 		languageMappingSrvc: languageMappingService,
 		userSrvc:            userService,
+		heartbeatSrvc:       heartbeatService,
+		keyValueSrvc:        keyValueService,
+		mailSrvc:            mailService,
+		httpClient:          &http.Client{Timeout: 10 * time.Second},
 	}
 }
 
+func (h *SettingsHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("/settings").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).WithRedirectTarget(defaultErrorRedirectTarget()).Handler,
+	)
+	r.Methods(http.MethodGet).HandlerFunc(h.GetIndex)
+	r.Methods(http.MethodPost).HandlerFunc(h.PostIndex)
+}
+
 func (h *SettingsHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 	if h.config.IsDev() {
 		loadTemplates()
@@ -41,100 +74,273 @@ func (h *SettingsHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 	templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r))
 }
 
-func (h *SettingsHandler) PostCredentials(w http.ResponseWriter, r *http.Request) {
+func (h *SettingsHandler) PostIndex(w http.ResponseWriter, r *http.Request) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}
 
-	user := r.Context().Value(models.UserKey).(*models.User)
+	if err := r.ParseForm(); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("missing form values"))
+		return
+	}
+
+	action := r.PostForm.Get("action")
+	r.PostForm.Del("action")
+
+	actionFunc := h.dispatchAction(action)
+	if actionFunc == nil {
+		logbuch.Warn("failed to dispatch action '%s'", action)
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("unknown action requests"))
+		return
+	}
+
+	status, successMsg, errorMsg := actionFunc(w, r)
+
+	// action responded itself
+	if status == -1 {
+		return
+	}
+
+	if errorMsg != "" {
+		w.WriteHeader(status)
+		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError(errorMsg))
+		return
+	}
+	if successMsg != "" {
+		w.WriteHeader(status)
+		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithSuccess(successMsg))
+		return
+	}
+	templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r))
+}
+
+func (h *SettingsHandler) dispatchAction(action string) action {
+	switch action {
+	case "change_password":
+		return h.actionChangePassword
+	case "update_user":
+		return h.actionUpdateUser
+	case "reset_apikey":
+		return h.actionResetApiKey
+	case "delete_alias":
+		return h.actionDeleteAlias
+	case "add_alias":
+		return h.actionAddAlias
+	case "delete_mapping":
+		return h.actionDeleteLanguageMapping
+	case "add_mapping":
+		return h.actionAddLanguageMapping
+	case "update_sharing":
+		return h.actionUpdateSharing
+	case "toggle_wakatime":
+		return h.actionSetWakatimeApiKey
+	case "import_wakatime":
+		return h.actionImportWaktime
+	case "regenerate_summaries":
+		return h.actionRegenerateSummaries
+	case "delete_account":
+		return h.actionDeleteUser
+	}
+	return nil
+}
+
+func (h *SettingsHandler) actionUpdateUser(w http.ResponseWriter, r *http.Request) (int, string, string) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	user := middlewares.GetPrincipal(r)
+
+	var payload models.UserDataUpdate
+	if err := r.ParseForm(); err != nil {
+		return http.StatusBadRequest, "", "missing parameters"
+	}
+	if err := credentialsDecoder.Decode(&payload, r.PostForm); err != nil {
+		return http.StatusBadRequest, "", "missing parameters"
+	}
+
+	if !payload.IsValid() {
+		return http.StatusBadRequest, "", "invalid parameters"
+	}
+
+	user.Email = payload.Email
+
+	if _, err := h.userSrvc.Update(user); err != nil {
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
+	}
+
+	return http.StatusOK, "user updated successfully", ""
+}
+
+func (h *SettingsHandler) actionChangePassword(w http.ResponseWriter, r *http.Request) (int, string, string) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	user := middlewares.GetPrincipal(r)
 
 	var credentials models.CredentialsReset
 	if err := r.ParseForm(); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
-		return
+		return http.StatusBadRequest, "", "missing parameters"
 	}
 	if err := credentialsDecoder.Decode(&credentials, r.PostForm); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
-		return
+		return http.StatusBadRequest, "", "missing parameters"
 	}
 
 	if !utils.CompareBcrypt(user.Password, credentials.PasswordOld, h.config.Security.PasswordSalt) {
-		w.WriteHeader(http.StatusUnauthorized)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("invalid credentials"))
-		return
+		return http.StatusUnauthorized, "", "invalid credentials"
 	}
 
 	if !credentials.IsValid() {
-		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("invalid parameters"))
-		return
+		return http.StatusBadRequest, "", "invalid parameters"
 	}
 
 	user.Password = credentials.PasswordNew
 	if hash, err := utils.HashBcrypt(user.Password, h.config.Security.PasswordSalt); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("internal server error"))
-		return
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	} else {
 		user.Password = hash
 	}
 
 	if _, err := h.userSrvc.Update(user); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("internal server error"))
-		return
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	}
 
 	login := &models.Login{
 		Username: user.ID,
 		Password: user.Password,
 	}
-	encoded, err := h.config.Security.SecureCookie.Encode(models.AuthCookieKey, login)
+	encoded, err := h.config.Security.SecureCookie.Encode(models.AuthCookieKey, login.Username)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("internal server error"))
-		return
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	}
 
 	http.SetCookie(w, h.config.CreateCookie(models.AuthCookieKey, encoded, "/"))
-	templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithSuccess("password was updated successfully"))
+	return http.StatusOK, "password was updated successfully", ""
 }
 
-func (h *SettingsHandler) DeleteLanguageMapping(w http.ResponseWriter, r *http.Request) {
+func (h *SettingsHandler) actionResetApiKey(w http.ResponseWriter, r *http.Request) (int, string, string) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}
 
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
+	if _, err := h.userSrvc.ResetApiKey(user); err != nil {
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
+	}
+
+	msg := fmt.Sprintf("your new api key is: %s", user.ApiKey)
+	return http.StatusOK, msg, ""
+}
+
+func (h *SettingsHandler) actionUpdateSharing(w http.ResponseWriter, r *http.Request) (int, string, string) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	var err error
+	user := middlewares.GetPrincipal(r)
+
+	defer h.userSrvc.FlushCache()
+
+	user.ShareProjects, err = strconv.ParseBool(r.PostFormValue("share_projects"))
+	user.ShareLanguages, err = strconv.ParseBool(r.PostFormValue("share_languages"))
+	user.ShareEditors, err = strconv.ParseBool(r.PostFormValue("share_editors"))
+	user.ShareOSs, err = strconv.ParseBool(r.PostFormValue("share_oss"))
+	user.ShareMachines, err = strconv.ParseBool(r.PostFormValue("share_machines"))
+	user.ShareDataMaxDays, err = strconv.Atoi(r.PostFormValue("max_days"))
+
+	if err != nil {
+		return http.StatusBadRequest, "", "invalid input"
+	}
+
+	if _, err := h.userSrvc.Update(user); err != nil {
+		return http.StatusInternalServerError, "", "internal sever error"
+	}
+
+	return http.StatusOK, "settings updated", ""
+}
+
+func (h *SettingsHandler) actionDeleteAlias(w http.ResponseWriter, r *http.Request) (int, string, string) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	user := middlewares.GetPrincipal(r)
+	aliasKey := r.PostFormValue("key")
+	aliasType, err := strconv.Atoi(r.PostFormValue("type"))
+	if err != nil {
+		aliasType = 99 // nothing will be found later on
+	}
+
+	if aliases, err := h.aliasSrvc.GetByUserAndKeyAndType(user.ID, aliasKey, uint8(aliasType)); err != nil {
+		return http.StatusNotFound, "", "aliases not found"
+	} else if err := h.aliasSrvc.DeleteMulti(aliases); err != nil {
+		return http.StatusInternalServerError, "", "could not delete aliases"
+	}
+
+	return http.StatusOK, "aliases deleted successfully", ""
+}
+
+func (h *SettingsHandler) actionAddAlias(w http.ResponseWriter, r *http.Request) (int, string, string) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+	user := middlewares.GetPrincipal(r)
+	aliasKey := r.PostFormValue("key")
+	aliasValue := r.PostFormValue("value")
+	aliasType, err := strconv.Atoi(r.PostFormValue("type"))
+	if err != nil {
+		aliasType = 99 // Alias.IsValid() will return false later on
+	}
+
+	alias := &models.Alias{
+		UserID: user.ID,
+		Key:    aliasKey,
+		Value:  aliasValue,
+		Type:   uint8(aliasType),
+	}
+
+	if _, err := h.aliasSrvc.Create(alias); err != nil {
+		// TODO: distinguish between bad request, conflict and server error
+		return http.StatusBadRequest, "", "invalid input"
+	}
+
+	return http.StatusOK, "alias added successfully", ""
+}
+
+func (h *SettingsHandler) actionDeleteLanguageMapping(w http.ResponseWriter, r *http.Request) (int, string, string) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	user := middlewares.GetPrincipal(r)
 	id, err := strconv.Atoi(r.PostFormValue("mapping_id"))
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("could not delete mapping"))
-		return
+		return http.StatusInternalServerError, "", "could not delete mapping"
 	}
 
-	mapping := &models.LanguageMapping{
-		ID:     uint(id),
-		UserID: user.ID,
+	mapping, err := h.languageMappingSrvc.GetById(uint(id))
+	if err != nil || mapping == nil {
+		return http.StatusNotFound, "", "mapping not found"
+	} else if mapping.UserID != user.ID {
+		return http.StatusForbidden, "", "not allowed to delete mapping"
 	}
 
-	err = h.languageMappingSrvc.Delete(mapping)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("could not delete mapping"))
-		return
+	if err := h.languageMappingSrvc.Delete(mapping); err != nil {
+		return http.StatusInternalServerError, "", "could not delete mapping"
 	}
 
-	templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithSuccess("mapping deleted successfully"))
+	return http.StatusOK, "mapping deleted successfully", ""
 }
 
-func (h *SettingsHandler) PostLanguageMapping(w http.ResponseWriter, r *http.Request) {
+func (h *SettingsHandler) actionAddLanguageMapping(w http.ResponseWriter, r *http.Request) (int, string, string) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	extension := r.PostFormValue("extension")
 	language := r.PostFormValue("language")
 
@@ -149,76 +355,224 @@ func (h *SettingsHandler) PostLanguageMapping(w http.ResponseWriter, r *http.Req
 	}
 
 	if _, err := h.languageMappingSrvc.Create(mapping); err != nil {
-		w.WriteHeader(http.StatusConflict)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("mapping already exists"))
-		return
+		return http.StatusConflict, "", "mapping already exists"
 	}
 
-	templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithSuccess("mapping added successfully"))
+	return http.StatusOK, "mapping added successfully", ""
 }
 
-func (h *SettingsHandler) PostResetApiKey(w http.ResponseWriter, r *http.Request) {
+func (h *SettingsHandler) actionSetWakatimeApiKey(w http.ResponseWriter, r *http.Request) (int, string, string) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}
 
-	user := r.Context().Value(models.UserKey).(*models.User)
-	if _, err := h.userSrvc.ResetApiKey(user); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("internal server error"))
-		return
+	user := middlewares.GetPrincipal(r)
+	apiKey := r.PostFormValue("api_key")
+
+	// Healthcheck, if a new API key is set, i.e. the feature is activated
+	if (user.WakatimeApiKey == "" && apiKey != "") && !h.validateWakatimeKey(apiKey) {
+		return http.StatusBadRequest, "", "failed to connect to WakaTime, API key invalid?"
 	}
 
-	msg := fmt.Sprintf("your new api key is: %s", user.ApiKey)
-	templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithSuccess(msg))
+	if _, err := h.userSrvc.SetWakatimeApiKey(user, apiKey); err != nil {
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
+	}
+
+	return http.StatusOK, "Wakatime API Key updated successfully", ""
 }
 
-func (h *SettingsHandler) PostToggleBadges(w http.ResponseWriter, r *http.Request) {
+func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Request) (int, string, string) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}
 
-	user := r.Context().Value(models.UserKey).(*models.User)
-	if _, err := h.userSrvc.ToggleBadges(user); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("internal server error"))
-		return
+	user := middlewares.GetPrincipal(r)
+	if user.WakatimeApiKey == "" {
+		return http.StatusForbidden, "", "not connected to wakatime"
 	}
 
-	templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r))
+	kvKey := fmt.Sprintf("%s_%s", conf.KeyLastImportImport, user.ID)
+
+	if !h.config.IsDev() {
+		lastImportKv := h.keyValueSrvc.MustGetString(kvKey)
+		lastImport, _ := time.Parse(time.RFC822, lastImportKv.Value)
+		if time.Now().Sub(lastImport) < time.Duration(h.config.App.ImportBackoffMin)*time.Minute {
+			return http.StatusTooManyRequests,
+				"",
+				fmt.Sprintf("Too many data imports. You are only allowed to request an import every %d minutes.", h.config.App.ImportBackoffMin)
+		}
+	}
+
+	go func(user *models.User) {
+		start := time.Now()
+		importer := imports.NewWakatimeHeartbeatImporter(user.WakatimeApiKey)
+
+		countBefore, err := h.heartbeatSrvc.CountByUser(user)
+		if err != nil {
+			println(err)
+		}
+
+		var stream <-chan *models.Heartbeat
+		if latest, err := h.heartbeatSrvc.GetLatestByOriginAndUser(imports.OriginWakatime, user); latest == nil || err != nil {
+			stream = importer.ImportAll(user)
+		} else {
+			// if an import has happened before, only import heartbeats newer than the latest of the last import
+			stream = importer.Import(user, latest.Time.T(), time.Now())
+		}
+
+		count := 0
+		batch := make([]*models.Heartbeat, 0)
+
+		insert := func(batch []*models.Heartbeat) {
+			if err := h.heartbeatSrvc.InsertBatch(batch); err != nil {
+				logbuch.Warn("failed to insert imported heartbeat, already existing? – %v", err)
+			}
+		}
+
+		for hb := range stream {
+			count++
+			batch = append(batch, hb)
+
+			if len(batch) == h.config.App.ImportBatchSize {
+				insert(batch)
+				batch = make([]*models.Heartbeat, 0)
+			}
+		}
+
+		if len(batch) > 0 {
+			insert(batch)
+		}
+
+		countAfter, _ := h.heartbeatSrvc.CountByUser(user)
+		logbuch.Info("downloaded %d heartbeats for user '%s' (%d actually imported)", count, user.ID, countAfter-countBefore)
+
+		h.regenerateSummaries(user)
+
+		if user.Email != "" {
+			if err := h.mailSrvc.SendImportNotification(user, time.Now().Sub(start), int(countAfter-countBefore)); err != nil {
+				logbuch.Error("failed to send import notification mail to %s – %v", user.ID, err)
+			} else {
+				logbuch.Info("sent import notification mail to %s", user.ID)
+			}
+		}
+	}(user)
+
+	h.keyValueSrvc.PutString(&models.KeyStringValue{
+		Key:   kvKey,
+		Value: time.Now().Format(time.RFC822),
+	})
+
+	return http.StatusAccepted, "Import started. This will take several minutes. Please check back later.", ""
 }
 
-func (h *SettingsHandler) PostRegenerateSummaries(w http.ResponseWriter, r *http.Request) {
+func (h *SettingsHandler) actionRegenerateSummaries(w http.ResponseWriter, r *http.Request) (int, string, string) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}
 
-	user := r.Context().Value(models.UserKey).(*models.User)
+	go func(user *models.User) {
+		if err := h.regenerateSummaries(user); err != nil {
+			logbuch.Error("failed to regenerate summaries for user '%s' – %v", user.ID, err)
+		}
+	}(middlewares.GetPrincipal(r))
 
-	log.Printf("clearing summaries for user '%s'\n", user.ID)
+	return http.StatusAccepted, "summaries are being regenerated – this may take a up to a couple of minutes, please come back later", ""
+}
+
+func (h *SettingsHandler) actionDeleteUser(w http.ResponseWriter, r *http.Request) (int, string, string) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	user := middlewares.GetPrincipal(r)
+	go func(user *models.User) {
+		logbuch.Info("deleting user '%s' shortly", user.ID)
+		time.Sleep(5 * time.Minute)
+		if err := h.userSrvc.Delete(user); err != nil {
+			logbuch.Error("failed to delete user '%s' – %v", user.ID, err)
+		} else {
+			logbuch.Info("successfully deleted user '%s'", user.ID)
+		}
+	}(user)
+
+	http.SetCookie(w, h.config.GetClearCookie(models.AuthCookieKey, "/"))
+	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "Your account will be deleted in a few minutes. Sorry to you go."), http.StatusFound)
+	return -1, "", ""
+}
+
+func (h *SettingsHandler) validateWakatimeKey(apiKey string) bool {
+	headers := http.Header{
+		"Accept": []string{"application/json"},
+		"Authorization": []string{
+			fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(apiKey))),
+		},
+	}
+
+	request, err := http.NewRequest(
+		http.MethodGet,
+		conf.WakatimeApiUrl+conf.WakatimeApiUserUrl,
+		nil,
+	)
+	if err != nil {
+		return false
+	}
+
+	request.Header = headers
+
+	response, err := h.httpClient.Do(request)
+	if err != nil || response.StatusCode < 200 || response.StatusCode >= 300 {
+		return false
+	}
+
+	return true
+}
+
+func (h *SettingsHandler) regenerateSummaries(user *models.User) error {
+	logbuch.Info("clearing summaries for user '%s'", user.ID)
 	if err := h.summarySrvc.DeleteByUser(user.ID); err != nil {
-		log.Printf("failed to clear summaries: %v\n", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("failed to delete old summaries"))
-		return
+		logbuch.Error("failed to clear summaries: %v", err)
+		return err
 	}
 
 	if err := h.aggregationSrvc.Run(map[string]bool{user.ID: true}); err != nil {
-		log.Printf("failed to regenerate summaries: %v\n", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithError("failed to generate aggregations"))
-		return
+		logbuch.Error("failed to regenerate summaries: %v", err)
+		return err
 	}
 
-	templates[conf.SettingsTemplate].Execute(w, h.buildViewModel(r).WithSuccess("summaries are being regenerated – this may take a few seconds"))
+	return nil
 }
 
 func (h *SettingsHandler) buildViewModel(r *http.Request) *view.SettingsViewModel {
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	mappings, _ := h.languageMappingSrvc.GetByUser(user.ID)
+	aliases, _ := h.aliasSrvc.GetByUser(user.ID)
+	aliasMap := make(map[string][]*models.Alias)
+	for _, a := range aliases {
+		k := fmt.Sprintf("%s_%d", a.Key, a.Type)
+		if _, ok := aliasMap[k]; !ok {
+			aliasMap[k] = []*models.Alias{a}
+		} else {
+			aliasMap[k] = append(aliasMap[k], a)
+		}
+	}
+
+	combinedAliases := make([]*view.SettingsVMCombinedAlias, 0)
+	for _, l := range aliasMap {
+		ca := &view.SettingsVMCombinedAlias{
+			Key:    l[0].Key,
+			Type:   l[0].Type,
+			Values: make([]string, len(l)),
+		}
+		for i, a := range l {
+			ca.Values[i] = a.Value
+		}
+		combinedAliases = append(combinedAliases, ca)
+	}
+
 	return &view.SettingsViewModel{
 		User:             user,
 		LanguageMappings: mappings,
+		Aliases:          combinedAliases,
 		Success:          r.URL.Query().Get("success"),
 		Error:            r.URL.Query().Get("error"),
 	}

routes/summary.go

@@ -1,9 +1,12 @@
 package routes
 
 import (
+	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
+	su "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
 	"net/http"
@@ -11,25 +14,24 @@ import (
 
 type SummaryHandler struct {
 	config      *conf.Config
+	userSrvc    services.IUserService
 	summarySrvc services.ISummaryService
 }
 
-func NewSummaryHandler(summaryService services.ISummaryService) *SummaryHandler {
+func NewSummaryHandler(summaryService services.ISummaryService, userService services.IUserService) *SummaryHandler {
 	return &SummaryHandler{
 		summarySrvc: summaryService,
+		userSrvc:    userService,
 		config:      conf.Get(),
 	}
 }
 
-func (h *SummaryHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
-	summary, err, status := h.loadUserSummary(r)
-	if err != nil {
-		w.WriteHeader(status)
-		w.Write([]byte(err.Error()))
-		return
-	}
-
-	utils.RespondJSON(w, http.StatusOK, summary)
+func (h *SummaryHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("/summary").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).WithRedirectTarget(defaultErrorRedirectTarget()).Handler,
+	)
+	r.Methods(http.MethodGet).HandlerFunc(h.GetIndex)
 }
 
 func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
@@ -37,20 +39,21 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		loadTemplates()
 	}
 
+	rawQuery := r.URL.RawQuery
 	q := r.URL.Query()
 	if q.Get("interval") == "" && q.Get("from") == "" {
 		q.Set("interval", "today")
 		r.URL.RawQuery = q.Encode()
 	}
 
-	summary, err, status := h.loadUserSummary(r)
+	summary, err, status := su.LoadUserSummary(h.summarySrvc, r)
 	if err != nil {
 		w.WriteHeader(status)
 		templates[conf.SummaryTemplate].Execute(w, h.buildViewModel(r).WithError(err.Error()))
 		return
 	}
 
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if user == nil {
 		w.WriteHeader(http.StatusUnauthorized)
 		templates[conf.SummaryTemplate].Execute(w, h.buildViewModel(r).WithError("unauthorized"))
@@ -59,32 +62,17 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 
 	vm := models.SummaryViewModel{
 		Summary:        summary,
-		LanguageColors: utils.FilterLanguageColors(h.config.App.LanguageColors, summary),
+		User:           user,
+		LanguageColors: utils.FilterColors(h.config.App.GetLanguageColors(), summary.Languages),
+		EditorColors:   utils.FilterColors(h.config.App.GetEditorColors(), summary.Editors),
+		OSColors:       utils.FilterColors(h.config.App.GetOSColors(), summary.OperatingSystems),
 		ApiKey:         user.ApiKey,
+		RawQuery:       rawQuery,
 	}
 
 	templates[conf.SummaryTemplate].Execute(w, vm)
 }
 
-func (h *SummaryHandler) loadUserSummary(r *http.Request) (*models.Summary, error, int) {
-	summaryParams, err := utils.ParseSummaryParams(r)
-	if err != nil {
-		return nil, err, http.StatusBadRequest
-	}
-
-	var retrieveSummary services.SummaryRetriever = h.summarySrvc.Retrieve
-	if summaryParams.Recompute {
-		retrieveSummary = h.summarySrvc.Summarize
-	}
-
-	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
-	if err != nil {
-		return nil, err, http.StatusInternalServerError
-	}
-
-	return summary, nil, http.StatusOK
-}
-
 func (h *SummaryHandler) buildViewModel(r *http.Request) *view.SummaryViewModel {
 	return &view.SummaryViewModel{
 		Success: r.URL.Query().Get("success"),

routes/utils/summary_utils.go

@@ -0,0 +1,27 @@
+package utils
+
+import (
+	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+)
+
+func LoadUserSummary(ss services.ISummaryService, r *http.Request) (*models.Summary, error, int) {
+	summaryParams, err := utils.ParseSummaryParams(r)
+	if err != nil {
+		return nil, err, http.StatusBadRequest
+	}
+
+	var retrieveSummary services.SummaryRetriever = ss.Retrieve
+	if summaryParams.Recompute {
+		retrieveSummary = ss.Summarize
+	}
+
+	summary, err := ss.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
+	if err != nil {
+		return nil, err, http.StatusInternalServerError
+	}
+
+	return summary, nil, http.StatusOK
+}

scripts/push_sample_data.py

@@ -1,111 +0,0 @@
-#!/usr/bin/python3
-
-import argparse
-import base64
-import random
-import string
-import sys
-from datetime import datetime, timedelta
-from typing import List, Union
-
-import requests
-from tqdm import tqdm
-
-UA = 'wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0'
-LANGUAGES = {
-    'Go': 'go',
-    'Java': 'java',
-    'JavaScript': 'js',
-    'Python': 'py'
-}
-
-
-class Heartbeat:
-    def __init__(
-            self,
-            entity: str,
-            project: str,
-            language: str,
-            time: float,
-            is_write: bool = True,
-            branch: str = 'master',
-            type: str = 'file'
-    ):
-        self.entity: str = entity
-        self.project: str = project
-        self.language: str = language
-        self.time: float = time
-        self.is_write: bool = is_write
-        self.branch: str = branch
-        self.type: str = type
-        self.category: Union[str, None] = None
-
-
-def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[Heartbeat]:
-    data: List[Heartbeat] = []
-    now: datetime = datetime.today()
-    projects: List[str] = [randomword(random.randint(5, 10)) for _ in range(n_projects)]
-    languages: List[str] = list(LANGUAGES.keys())
-
-    for _ in range(n):
-        p: str = random.choice(projects)
-        l: str = random.choice(languages)
-        f: str = randomword(random.randint(2, 8))
-        delta: timedelta = timedelta(
-            hours=random.randint(0, n_past_hours - 1),
-            minutes=random.randint(0, 59),
-            seconds=random.randint(0, 59),
-            milliseconds=random.randint(0, 999),
-            microseconds=random.randint(0, 999)
-        )
-
-        data.append(Heartbeat(
-            entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}',
-            project=p,
-            language=l,
-            time=(now - delta).timestamp()
-        ))
-
-    return data
-
-
-def post_data_sync(data: List[Heartbeat], url: str, api_key: str):
-    encoded_key: str = str(base64.b64encode(api_key.encode('utf-8')), 'utf-8')
-
-    for h in tqdm(data):
-        r = requests.post(url, json=[h.__dict__], headers={
-            'User-Agent': UA,
-            'Authorization': f'Basic {encoded_key}'
-        })
-        if r.status_code != 201:
-            print(r.text)
-            sys.exit(1)
-
-
-def randomword(length: int) -> str:
-    letters = string.ascii_lowercase
-    return ''.join(random.choice(letters) for _ in range(length))
-
-
-def parse_arguments():
-    parser = argparse.ArgumentParser(description='Wakapi test data insertion script.')
-    parser.add_argument('-n', type=int, default=20, help='total number of random heartbeats to generate and insert')
-    parser.add_argument('-u', '--url', type=str, default='http://localhost:3000/api/heartbeat',
-                        help='url of your api\'s heartbeats endpoint')
-    parser.add_argument('-k', '--apikey', type=str, required=True,
-                        help='your api key (to get one, go to the web interface, create a new user, log in and copy the key)')
-    parser.add_argument('-p', '--projects', type=int, default=5, help='number of different fake projects to generate')
-    parser.add_argument('-o', '--offset', type=int, default=24,
-                        help='negative time offset in hours from now for to be used as an interval within which to generate heartbeats for')
-    parser.add_argument('-s', '--seed', type=int, default=2020,
-                        help='a seed for initializing the pseudo-random number generator')
-    return parser.parse_args()
-
-
-if __name__ == '__main__':
-    args = parse_arguments()
-
-    random.seed(args.seed)
-
-    data: List[Heartbeat] = generate_data(args.n, args.projects, args.offset)
-    post_data_sync(data, args.url, args.apikey)

scripts/sample_data.py

@@ -0,0 +1,271 @@
+#!/usr/bin/python3
+
+import argparse
+import base64
+import random
+import string
+import sys
+from datetime import datetime, timedelta
+from typing import List, Union, Callable
+
+import requests
+from tqdm import tqdm
+
+MACHINE = "devmachine"
+UA = 'wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0'
+LANGUAGES = {
+    'Go': 'go',
+    'Java': 'java',
+    'JavaScript': 'js',
+    'Python': 'py'
+}
+
+
+class Heartbeat:
+    def __init__(
+            self,
+            entity: str,
+            project: str,
+            language: str,
+            time: float,
+            is_write: bool = True,
+            branch: str = 'master',
+            type: str = 'file'
+    ):
+        self.entity: str = entity
+        self.project: str = project
+        self.language: str = language
+        self.time: float = time
+        self.is_write: bool = is_write
+        self.branch: str = branch
+        self.type: str = type
+        self.category: Union[str, None] = None
+
+
+class ConfigParams:
+    def __init__(self):
+        self.api_url = ''
+        self.api_key = ''
+        self.n = 0
+        self.n_projects = 0
+        self.offset = 0
+        self.seed = 0
+
+
+def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[Heartbeat]:
+    data: List[Heartbeat] = []
+    now: datetime = datetime.today()
+    projects: List[str] = [randomword(random.randint(5, 10)) for _ in range(n_projects)]
+    languages: List[str] = list(LANGUAGES.keys())
+
+    for _ in range(n):
+        p: str = random.choice(projects)
+        l: str = random.choice(languages)
+        f: str = randomword(random.randint(2, 8))
+        delta: timedelta = timedelta(
+            hours=random.randint(0, n_past_hours - 1),
+            minutes=random.randint(0, 59),
+            seconds=random.randint(0, 59),
+            milliseconds=random.randint(0, 999),
+            microseconds=random.randint(0, 999)
+        )
+
+        data.append(Heartbeat(
+            entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}',
+            project=p,
+            language=l,
+            time=(now - delta).timestamp()
+        ))
+
+    return data
+
+
+def post_data_sync(data: List[Heartbeat], url: str, api_key: str):
+    encoded_key: str = str(base64.b64encode(api_key.encode('utf-8')), 'utf-8')
+
+    for h in data:
+        r = requests.post(url, json=[h.__dict__], headers={
+            'User-Agent': UA,
+            'Authorization': f'Basic {encoded_key}',
+            'X-Machine-Name': MACHINE,
+        })
+        if r.status_code != 201:
+            print(r.text)
+            sys.exit(1)
+
+
+def make_gui(callback: Callable[[ConfigParams, Callable[[int], None]], None]) -> ('QApplication', 'QWidget'):
+    from PyQt5.QtCore import Qt
+    from PyQt5.QtWidgets import QApplication, QWidget, QFormLayout, QHBoxLayout, QVBoxLayout, QGroupBox, QLabel, \
+        QLineEdit, QSpinBox, QProgressBar, QPushButton
+
+    # Main app
+    app = QApplication([])
+
+    window = QWidget()
+    window.setWindowTitle('Wakapi Sample Data Generator')
+    window.setFixedSize(window.sizeHint())
+    window.setMinimumWidth(350)
+
+    container_layout = QVBoxLayout()
+
+    # Top Controls
+    form_layout_1 = QFormLayout()
+
+    url_input_label = QLabel('URL:')
+    url_input = QLineEdit()
+    url_input.setPlaceholderText('Wakatime API Url')
+    url_input.setText('http://localhost:3000/api')
+
+    api_key_input_label = QLabel('API Key:')
+    api_key_input = QLineEdit()
+    api_key_input.setPlaceholderText(f'{"x"*8}-{"x"*4}-{"x"*4}-{"x"*4}-{"x"*12}')
+
+    form_layout_1.addRow(url_input_label, url_input)
+    form_layout_1.addRow(api_key_input_label, api_key_input)
+
+    # Middle controls
+    form_layout_2 = QFormLayout()
+    params_container = QGroupBox('Parameters')
+    params_container.setLayout(form_layout_2)
+
+    heartbeats_input_label = QLabel('# Heartbeats')
+    heartbeats_input = QSpinBox()
+    heartbeats_input.setMaximum(2147483647)
+    heartbeats_input.setValue(100)
+
+    projects_input_label = QLabel('# Projects:')
+    projects_input = QSpinBox()
+    projects_input.setMinimum(1)
+    projects_input.setValue(5)
+
+    offset_input_label = QLabel('Time Offset (hrs):')
+    offset_input = QSpinBox()
+    offset_input.setMinimum(-2147483647)
+    offset_input.setMaximum(0)
+    offset_input.setValue(-12)
+
+    seed_input_label = QLabel('Random Seed:')
+    seed_input = QSpinBox()
+    seed_input.setMaximum(2147483647)
+    seed_input.setValue(1337)
+
+    form_layout_2.addRow(heartbeats_input_label, heartbeats_input)
+    form_layout_2.addRow(projects_input_label, projects_input)
+    form_layout_2.addRow(offset_input_label, offset_input)
+    form_layout_2.addRow(seed_input_label, seed_input)
+
+    # Bottom controls
+    bottom_layout = QHBoxLayout()
+
+    start_button = QPushButton('Generate')
+    progress_bar = QProgressBar()
+
+    bottom_layout.addWidget(progress_bar)
+    bottom_layout.addWidget(start_button)
+
+    # Wiring up
+    container_layout.addLayout(form_layout_1)
+    container_layout.addWidget(params_container)
+    container_layout.addLayout(bottom_layout)
+    container_layout.setStretch(1, 1)
+
+    window.setLayout(container_layout)
+
+    # Done dialog
+    done_dialog = QWidget()
+    done_dialog.setWindowTitle('Done')
+    done_ok_button = QPushButton('Ok')
+    done_layout = QVBoxLayout()
+    done_layout.addWidget(QLabel('Done!'), alignment=Qt.AlignCenter)
+    done_layout.addWidget(done_ok_button, alignment=Qt.AlignCenter)
+    done_dialog.setFixedSize(done_dialog.sizeHint())
+    done_ok_button.clicked.connect(done_dialog.close)
+    done_dialog.setLayout(done_layout)
+
+    # Logic
+    def parse_params() -> ConfigParams:
+        params = ConfigParams()
+        params.api_url = url_input.text()
+        params.api_key = api_key_input.text()
+        params.n = heartbeats_input.value()
+        params.n_projects = projects_input.value()
+        params.offset = offset_input.value()
+        params.seed = seed_input.value()
+        return params
+
+    def update_progress(inc=1):
+        current = progress_bar.value()
+        updated = current + inc
+        if updated == progress_bar.maximum() - 1:
+            progress_bar.setValue(0)
+            start_button.setEnabled(True)
+            done_dialog.show()
+            return
+        progress_bar.setValue(updated)
+
+    def call_back():
+        params = parse_params()
+        progress_bar.setMaximum(params.n)
+        start_button.setEnabled(False)
+        callback(params, update_progress)
+
+    start_button.clicked.connect(call_back)
+
+    return app, window
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(description='Wakapi test data insertion script.')
+    parser.add_argument('--headless', default=False, help='do not show a gui', action='store_true')
+    parser.add_argument('-n', type=int, default=20, help='total number of random heartbeats to generate and insert')
+    parser.add_argument('-u', '--url', type=str, default='http://localhost:3000/api',
+                        help='url of your api\'s heartbeats endpoint')
+    parser.add_argument('-k', '--apikey', type=str,
+                        help='your api key (to get one, go to the web interface, create a new user, log in and copy the key)')
+    parser.add_argument('-p', '--projects', type=int, default=5, help='number of different fake projects to generate')
+    parser.add_argument('-o', '--offset', type=int, default=24,
+                        help='negative time offset in hours from now for to be used as an interval within which to generate heartbeats for')
+    parser.add_argument('-s', '--seed', type=int, default=2020,
+                        help='a seed for initializing the pseudo-random number generator')
+    return parser.parse_args()
+
+
+def args_to_params(parsed_args: argparse.Namespace) -> (ConfigParams, bool):
+    params = ConfigParams()
+    params.n = parsed_args.n
+    params.n_projects = parsed_args.projects
+    params.offset = parsed_args.offset
+    params.seed = parsed_args.seed
+    params.api_url = parsed_args.url
+    params.api_key = parsed_args.apikey
+    return params, not parsed_args.headless
+
+
+def randomword(length: int) -> str:
+    letters = string.ascii_lowercase + 'äöü💩'  # test utf8 and utf8mb4 characters as well
+    return ''.join(random.choice(letters) for _ in range(length))
+
+
+def run(params: ConfigParams, update_progress: Callable[[int], None]):
+    random.seed(params.seed)
+    data: List[Heartbeat] = generate_data(
+        params.n,
+        params.n_projects,
+        params.offset * -1 if params.offset < 0 else params.offset
+    )
+
+    for d in data:
+        post_data_sync([d], f'{params.api_url}/heartbeats', params.api_key)
+        update_progress(1)
+
+
+if __name__ == '__main__':
+    params, show_gui = args_to_params(parse_arguments())
+    if show_gui:
+        app, window = make_gui(callback=run)
+        window.show()
+        app.exec()
+    else:
+        pbar = tqdm(total=params.n)
+        run(params, pbar.update)

services/aggregation.go

@@ -1,8 +1,8 @@
 package services
 
 import (
+	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
-	"log"
 	"runtime"
 	"time"
 
@@ -40,7 +40,7 @@ type AggregationJob struct {
 func (srv *AggregationService) Schedule() {
 	// Run once initially
 	if err := srv.Run(nil); err != nil {
-		log.Fatalf("failed to run aggregation jobs: %v\n", err)
+		logbuch.Fatal("failed to run AggregationJob: %v", err)
 	}
 
 	s := gocron.NewScheduler(time.Local)
@@ -73,9 +73,9 @@ func (srv *AggregationService) Run(userIds map[string]bool) error {
 func (srv *AggregationService) summaryWorker(jobs <-chan *AggregationJob, summaries chan<- *models.Summary) {
 	for job := range jobs {
 		if summary, err := srv.summaryService.Summarize(job.From, job.To, &models.User{ID: job.UserID}); err != nil {
-			log.Printf("Failed to generate summary (%v, %v, %s) – %v.\n", job.From, job.To, job.UserID, err)
+			logbuch.Error("failed to generate summary (%v, %v, %s) – %v", job.From, job.To, job.UserID, err)
 		} else {
-			log.Printf("Successfully generated summary (%v, %v, %s).\n", job.From, job.To, job.UserID)
+			logbuch.Info("successfully generated summary (%v, %v, %s)", job.From, job.To, job.UserID)
 			summaries <- summary
 		}
 	}
@@ -84,23 +84,23 @@ func (srv *AggregationService) summaryWorker(jobs <-chan *AggregationJob, summar
 func (srv *AggregationService) persistWorker(summaries <-chan *models.Summary) {
 	for summary := range summaries {
 		if err := srv.summaryService.Insert(summary); err != nil {
-			log.Printf("Failed to save summary (%v, %v, %s) – %v.\n", summary.UserID, summary.FromTime, summary.ToTime, err)
+			logbuch.Error("failed to save summary (%v, %v, %s) – %v", summary.UserID, summary.FromTime, summary.ToTime, err)
 		}
 	}
 }
 
 func (srv *AggregationService) trigger(jobs chan<- *AggregationJob, userIds map[string]bool) error {
-	log.Println("Generating summaries.")
+	logbuch.Info("generating summaries")
 
 	var users []*models.User
 	if allUsers, err := srv.userService.GetAll(); err != nil {
-		log.Println(err)
+		logbuch.Error(err.Error())
 		return err
 	} else if userIds != nil && len(userIds) > 0 {
-		users = make([]*models.User, len(userIds))
-		for i, u := range allUsers {
+		users = make([]*models.User, 0)
+		for _, u := range allUsers {
 			if yes, ok := userIds[u.ID]; yes && ok {
-				users[i] = u
+				users = append(users, u)
 			}
 		}
 	} else {
@@ -110,14 +110,14 @@ func (srv *AggregationService) trigger(jobs chan<- *AggregationJob, userIds map[
 	// Get a map from user ids to the time of their latest summary or nil if none exists yet
 	lastUserSummaryTimes, err := srv.summaryService.GetLatestByUser()
 	if err != nil {
-		log.Println(err)
+		logbuch.Error(err.Error())
 		return err
 	}
 
 	// Get a map from user ids to the time of their earliest heartbeats or nil if none exists yet
 	firstUserHeartbeatTimes, err := srv.heartbeatService.GetFirstByUsers()
 	if err != nil {
-		log.Println(err)
+		logbuch.Error(err.Error())
 		return err
 	}
 

services/alias.go

@@ -1,11 +1,12 @@
 package services
 
 import (
+	"errors"
+	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/repositories"
 	"sync"
-
-	"github.com/muety/wakapi/models"
 )
 
 type AliasService struct {
@@ -22,7 +23,14 @@ func NewAliasService(aliasRepo repositories.IAliasRepository) *AliasService {
 
 var userAliases sync.Map
 
-func (srv *AliasService) LoadUserAliases(userId string) error {
+func (srv *AliasService) IsInitialized(userId string) bool {
+	if _, ok := userAliases.Load(userId); ok {
+		return true
+	}
+	return false
+}
+
+func (srv *AliasService) InitializeUser(userId string) error {
 	aliases, err := srv.repository.GetByUser(userId)
 	if err == nil {
 		userAliases.Store(userId, aliases)
@@ -30,9 +38,25 @@ func (srv *AliasService) LoadUserAliases(userId string) error {
 	return err
 }
 
+func (srv *AliasService) GetByUser(userId string) ([]*models.Alias, error) {
+	aliases, err := srv.repository.GetByUser(userId)
+	if err != nil {
+		return nil, err
+	}
+	return aliases, nil
+}
+
+func (srv *AliasService) GetByUserAndKeyAndType(userId, key string, summaryType uint8) ([]*models.Alias, error) {
+	aliases, err := srv.repository.GetByUserAndKeyAndType(userId, key, summaryType)
+	if err != nil {
+		return nil, err
+	}
+	return aliases, nil
+}
+
 func (srv *AliasService) GetAliasOrDefault(userId string, summaryType uint8, value string) (string, error) {
 	if !srv.IsInitialized(userId) {
-		if err := srv.LoadUserAliases(userId); err != nil {
+		if err := srv.InitializeUser(userId); err != nil {
 			return "", err
 		}
 	}
@@ -46,9 +70,46 @@ func (srv *AliasService) GetAliasOrDefault(userId string, summaryType uint8, val
 	return value, nil
 }
 
-func (srv *AliasService) IsInitialized(userId string) bool {
-	if _, ok := userAliases.Load(userId); ok {
-		return true
+func (srv *AliasService) Create(alias *models.Alias) (*models.Alias, error) {
+	result, err := srv.repository.Insert(alias)
+	if err != nil {
+		return nil, err
+	}
+	go srv.reinitUser(alias.UserID)
+	return result, nil
+}
+
+func (srv *AliasService) Delete(alias *models.Alias) error {
+	if alias.UserID == "" {
+		return errors.New("no user id specified")
+	}
+	err := srv.repository.Delete(alias.ID)
+	go srv.reinitUser(alias.UserID)
+	return err
+}
+
+func (srv *AliasService) DeleteMulti(aliases []*models.Alias) error {
+	ids := make([]uint, len(aliases))
+	affectedUsers := make(map[string]bool)
+	for i, a := range aliases {
+		if a.UserID == "" {
+			return errors.New("no user id specified")
+		}
+		affectedUsers[a.UserID] = true
+		ids[i] = a.ID
+	}
+
+	err := srv.repository.DeleteBatch(ids)
+
+	for k := range affectedUsers {
+		go srv.reinitUser(k)
+	}
+
+	return err
+}
+
+func (srv *AliasService) reinitUser(userId string) {
+	if err := srv.InitializeUser(userId); err != nil {
+		logbuch.Error("error initializing user aliases – %v", err)
 	}
-	return false
 }

services/heartbeat.go

@@ -22,8 +22,35 @@ func NewHeartbeatService(heartbeatRepo repositories.IHeartbeatRepository, langua
 	}
 }
 
+func (srv *HeartbeatService) Insert(heartbeat *models.Heartbeat) error {
+	return srv.repository.InsertBatch([]*models.Heartbeat{heartbeat})
+}
+
 func (srv *HeartbeatService) InsertBatch(heartbeats []*models.Heartbeat) error {
-	return srv.repository.InsertBatch(heartbeats)
+	hashes := make(map[string]bool)
+
+	// https://github.com/muety/wakapi/issues/139
+	filteredHeartbeats := make([]*models.Heartbeat, 0, len(heartbeats))
+	for _, hb := range heartbeats {
+		if _, ok := hashes[hb.Hash]; !ok {
+			filteredHeartbeats = append(filteredHeartbeats, hb)
+			hashes[hb.Hash] = true
+		}
+	}
+
+	return srv.repository.InsertBatch(filteredHeartbeats)
+}
+
+func (srv *HeartbeatService) Count() (int64, error) {
+	return srv.repository.Count()
+}
+
+func (srv *HeartbeatService) CountByUser(user *models.User) (int64, error) {
+	return srv.repository.CountByUser(user)
+}
+
+func (srv *HeartbeatService) CountByUsers(users []*models.User) ([]*models.CountByUser, error) {
+	return srv.repository.CountByUsers(users)
 }
 
 func (srv *HeartbeatService) GetAllWithin(from, to time.Time, user *models.User) ([]*models.Heartbeat, error) {
@@ -34,6 +61,10 @@ func (srv *HeartbeatService) GetAllWithin(from, to time.Time, user *models.User)
 	return srv.augmented(heartbeats, user.ID)
 }
 
+func (srv *HeartbeatService) GetLatestByOriginAndUser(origin string, user *models.User) (*models.Heartbeat, error) {
+	return srv.repository.GetLatestByOriginAndUser(origin, user)
+}
+
 func (srv *HeartbeatService) GetFirstByUsers() ([]*models.TimeByUser, error) {
 	return srv.repository.GetFirstByUsers()
 }

services/imports/importers.go

@@ -0,0 +1,11 @@
+package imports
+
+import (
+	"github.com/muety/wakapi/models"
+	"time"
+)
+
+type HeartbeatImporter interface {
+	Import(*models.User, time.Time, time.Time) <-chan *models.Heartbeat
+	ImportAll(*models.User) <-chan *models.Heartbeat
+}

services/imports/wakatime.go

@@ -0,0 +1,281 @@
+package imports
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	wakatime "github.com/muety/wakapi/models/compat/wakatime/v1"
+	"github.com/muety/wakapi/utils"
+	"go.uber.org/atomic"
+	"golang.org/x/sync/semaphore"
+	"net/http"
+	"time"
+)
+
+const OriginWakatime = "wakatime"
+const (
+	// wakatime api permits a max. rate of 10 req / sec
+	// https://github.com/wakatime/wakatime/issues/261
+	// with 5 workers, each sleeping slightly over 1/2 sec after every req., we should stay well below that limit
+	maxWorkers    = 5
+	throttleDelay = 550 * time.Millisecond
+)
+
+type WakatimeHeartbeatImporter struct {
+	ApiKey string
+}
+
+func NewWakatimeHeartbeatImporter(apiKey string) *WakatimeHeartbeatImporter {
+	return &WakatimeHeartbeatImporter{
+		ApiKey: apiKey,
+	}
+}
+
+func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time, maxTo time.Time) <-chan *models.Heartbeat {
+	out := make(chan *models.Heartbeat)
+
+	go func(user *models.User, out chan *models.Heartbeat) {
+		startDate, endDate, err := w.fetchRange()
+		if err != nil {
+			logbuch.Error("failed to fetch date range while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
+			return
+		}
+
+		if startDate.Before(minFrom) {
+			startDate = minFrom
+		}
+		if endDate.After(maxTo) {
+			endDate = maxTo
+		}
+
+		userAgents, err := w.fetchUserAgents()
+		if err != nil {
+			logbuch.Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
+			return
+		}
+
+		machinesNames, err := w.fetchMachineNames()
+		if err != nil {
+			logbuch.Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
+			return
+		}
+
+		days := generateDays(startDate, endDate)
+
+		c := atomic.NewUint32(uint32(len(days)))
+		ctx := context.TODO()
+		sem := semaphore.NewWeighted(maxWorkers)
+
+		for _, d := range days {
+			if err := sem.Acquire(ctx, 1); err != nil {
+				logbuch.Error("failed to acquire semaphore – %v", err)
+				break
+			}
+
+			go func(day time.Time) {
+				defer sem.Release(1)
+				defer time.Sleep(throttleDelay)
+
+				d := day.Format(config.SimpleDateFormat)
+				heartbeats, err := w.fetchHeartbeats(d)
+				if err != nil {
+					logbuch.Error("failed to fetch heartbeats for day '%s' and user '%s' – &v", d, user.ID, err)
+				}
+
+				for _, h := range heartbeats {
+					out <- mapHeartbeat(h, userAgents, machinesNames, user)
+				}
+
+				if c.Dec() == 0 {
+					close(out)
+				}
+			}(d)
+		}
+	}(user, out)
+
+	return out
+}
+
+func (w *WakatimeHeartbeatImporter) ImportAll(user *models.User) <-chan *models.Heartbeat {
+	return w.Import(user, time.Time{}, time.Now())
+}
+
+// https://wakatime.com/api/v1/users/current/heartbeats?date=2021-02-05
+func (w *WakatimeHeartbeatImporter) fetchHeartbeats(day string) ([]*wakatime.HeartbeatEntry, error) {
+	httpClient := &http.Client{Timeout: 10 * time.Second}
+
+	req, err := http.NewRequest(http.MethodGet, config.WakatimeApiUrl+config.WakatimeApiHeartbeatsUrl, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	q := req.URL.Query()
+	q.Add("date", day)
+	req.URL.RawQuery = q.Encode()
+
+	res, err := httpClient.Do(w.withHeaders(req))
+	if err != nil {
+		return nil, err
+	} else if res.StatusCode >= 400 {
+		return nil, errors.New(fmt.Sprintf("got status %d from wakatime api", res.StatusCode))
+	}
+
+	var heartbeatsData wakatime.HeartbeatsViewModel
+	if err := json.NewDecoder(res.Body).Decode(&heartbeatsData); err != nil {
+		return nil, err
+	}
+
+	return heartbeatsData.Data, nil
+}
+
+// https://wakatime.com/api/v1/users/current/all_time_since_today
+func (w *WakatimeHeartbeatImporter) fetchRange() (time.Time, time.Time, error) {
+	httpClient := &http.Client{Timeout: 10 * time.Second}
+
+	notime := time.Time{}
+
+	req, err := http.NewRequest(http.MethodGet, config.WakatimeApiUrl+config.WakatimeApiAllTimeUrl, nil)
+	if err != nil {
+		return notime, notime, err
+	}
+
+	res, err := httpClient.Do(w.withHeaders(req))
+	if err != nil {
+		return notime, notime, err
+	}
+
+	var allTimeData wakatime.AllTimeViewModel
+	if err := json.NewDecoder(res.Body).Decode(&allTimeData); err != nil {
+		return notime, notime, err
+	}
+
+	startDate, err := time.Parse(config.SimpleDateFormat, allTimeData.Data.Range.StartDate)
+	if err != nil {
+		return notime, notime, err
+	}
+
+	endDate, err := time.Parse(config.SimpleDateFormat, allTimeData.Data.Range.EndDate)
+	if err != nil {
+		return notime, notime, err
+	}
+
+	return startDate, endDate, nil
+}
+
+// https://wakatime.com/api/v1/users/current/user_agents
+func (w *WakatimeHeartbeatImporter) fetchUserAgents() (map[string]*wakatime.UserAgentEntry, error) {
+	httpClient := &http.Client{Timeout: 10 * time.Second}
+
+	req, err := http.NewRequest(http.MethodGet, config.WakatimeApiUrl+config.WakatimeApiUserAgentsUrl, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := httpClient.Do(w.withHeaders(req))
+	if err != nil {
+		return nil, err
+	}
+
+	var userAgentsData wakatime.UserAgentsViewModel
+	if err := json.NewDecoder(res.Body).Decode(&userAgentsData); err != nil {
+		return nil, err
+	}
+
+	userAgents := make(map[string]*wakatime.UserAgentEntry)
+	for _, ua := range userAgentsData.Data {
+		userAgents[ua.Id] = ua
+	}
+
+	return userAgents, nil
+}
+
+// https://wakatime.com/api/v1/users/current/machine_names
+func (w *WakatimeHeartbeatImporter) fetchMachineNames() (map[string]*wakatime.MachineEntry, error) {
+	httpClient := &http.Client{Timeout: 10 * time.Second}
+
+	req, err := http.NewRequest(http.MethodGet, config.WakatimeApiUrl+config.WakatimeApiMachineNamesUrl, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := httpClient.Do(w.withHeaders(req))
+	if err != nil {
+		return nil, err
+	}
+
+	var machineData wakatime.MachineViewModel
+	if err := json.NewDecoder(res.Body).Decode(&machineData); err != nil {
+		return nil, err
+	}
+
+	machines := make(map[string]*wakatime.MachineEntry)
+	for _, ma := range machineData.Data {
+		machines[ma.Id] = ma
+	}
+
+	return machines, nil
+}
+
+func (w *WakatimeHeartbeatImporter) withHeaders(req *http.Request) *http.Request {
+	req.Header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(w.ApiKey))))
+	return req
+}
+
+func mapHeartbeat(
+	entry *wakatime.HeartbeatEntry,
+	userAgents map[string]*wakatime.UserAgentEntry,
+	machineNames map[string]*wakatime.MachineEntry,
+	user *models.User,
+) *models.Heartbeat {
+	ua := userAgents[entry.UserAgentId]
+	if ua == nil {
+		ua = &wakatime.UserAgentEntry{
+			Editor: "unknown",
+			Os:     "unknown",
+		}
+	}
+
+	ma := machineNames[entry.MachineNameId]
+	if ma == nil {
+		ma = &wakatime.MachineEntry{
+			Id:    entry.MachineNameId,
+			Value: entry.MachineNameId,
+		}
+	}
+
+	return (&models.Heartbeat{
+		User:            user,
+		UserID:          user.ID,
+		Entity:          entry.Entity,
+		Type:            entry.Type,
+		Category:        entry.Category,
+		Project:         entry.Project,
+		Branch:          entry.Branch,
+		Language:        entry.Language,
+		IsWrite:         entry.IsWrite,
+		Editor:          ua.Editor,
+		OperatingSystem: ua.Os,
+		Machine:         ma.Value,
+		Time:            entry.Time,
+		Origin:          OriginWakatime,
+		OriginId:        entry.Id,
+	}).Hashed()
+}
+
+func generateDays(from, to time.Time) []time.Time {
+	days := make([]time.Time, 0)
+
+	from = utils.StartOfDay(from)
+	to = utils.StartOfDay(to.Add(24 * time.Hour))
+
+	for d := from; d.Before(to); d = d.Add(24 * time.Hour) {
+		days = append(days, d)
+	}
+
+	return days
+}

services/key_value.go

@@ -22,6 +22,17 @@ func (srv *KeyValueService) GetString(key string) (*models.KeyStringValue, error
 	return srv.repository.GetString(key)
 }
 
+func (srv *KeyValueService) MustGetString(key string) *models.KeyStringValue {
+	kv, err := srv.repository.GetString(key)
+	if err != nil {
+		return &models.KeyStringValue{
+			Key:   key,
+			Value: "",
+		}
+	}
+	return kv
+}
+
 func (srv *KeyValueService) PutString(kv *models.KeyStringValue) error {
 	return srv.repository.PutString(kv)
 }

services/language_mapping.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"errors"
 	"github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/repositories"
@@ -18,7 +19,7 @@ func NewLanguageMappingService(languageMappingsRepo repositories.ILanguageMappin
 	return &LanguageMappingService{
 		config:     config.Get(),
 		repository: languageMappingsRepo,
-		cache:      cache.New(1*time.Hour, 2*time.Hour),
+		cache:      cache.New(24*time.Hour, 24*time.Hour),
 	}
 }
 
@@ -63,11 +64,15 @@ func (srv *LanguageMappingService) Create(mapping *models.LanguageMapping) (*mod
 }
 
 func (srv *LanguageMappingService) Delete(mapping *models.LanguageMapping) error {
+	if mapping.UserID == "" {
+		return errors.New("no user id specified")
+	}
 	err := srv.repository.Delete(mapping.ID)
 	srv.cache.Delete(mapping.UserID)
 	return err
 }
 
-func (srv LanguageMappingService) getServerMappings() map[string]string {
-	return srv.config.App.CustomLanguages
+func (srv *LanguageMappingService) getServerMappings() map[string]string {
+	// https://dave.cheney.net/2017/04/30/if-a-map-isnt-a-reference-variable-what-is-it
+	return srv.config.App.GetCustomLanguages()
 }

services/mail/mail.go

@@ -0,0 +1,81 @@
+package mail
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/markbates/pkger"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/services"
+	"io/ioutil"
+	"text/template"
+)
+
+const (
+	tplPath                   = "/views/mail"
+	tplNamePasswordReset      = "reset_password"
+	tplNameImportNotification = "import_finished"
+	subjectPasswordReset      = "Wakapi – Password Reset"
+	subjectImportNotification = "Wakapi – Data Import Finished"
+)
+
+type PasswordResetTplData struct {
+	ResetLink string
+}
+
+type ImportNotificationTplData struct {
+	PublicUrl     string
+	Duration      string
+	NumHeartbeats int
+}
+
+// Factory
+func NewMailService() services.IMailService {
+	config := conf.Get()
+	if config.Mail.Enabled {
+		if config.Mail.Provider == conf.MailProviderMailWhale {
+			return NewMailWhaleService(config.Mail.MailWhale, config.Server.PublicUrl)
+		} else if config.Mail.Provider == conf.MailProviderSmtp {
+			return NewSMTPMailService(config.Mail.Smtp, config.Server.PublicUrl)
+		}
+	}
+	return &NoopMailService{}
+}
+
+func getPasswordResetTemplate(data PasswordResetTplData) (*bytes.Buffer, error) {
+	tpl, err := loadTemplate(tplNamePasswordReset)
+	if err != nil {
+		return nil, err
+	}
+	var rendered bytes.Buffer
+	if err := tpl.Execute(&rendered, data); err != nil {
+		return nil, err
+	}
+	return &rendered, nil
+}
+
+func getImportNotificationTemplate(data ImportNotificationTplData) (*bytes.Buffer, error) {
+	tpl, err := loadTemplate(tplNameImportNotification)
+	if err != nil {
+		return nil, err
+	}
+	var rendered bytes.Buffer
+	if err := tpl.Execute(&rendered, data); err != nil {
+		return nil, err
+	}
+	return &rendered, nil
+}
+
+func loadTemplate(tplName string) (*template.Template, error) {
+	tplFile, err := pkger.Open(fmt.Sprintf("%s/%s.tpl.html", tplPath, tplName))
+	if err != nil {
+		return nil, err
+	}
+	defer tplFile.Close()
+
+	tplData, err := ioutil.ReadAll(tplFile)
+	if err != nil {
+		return nil, err
+	}
+
+	return template.New(tplName).Parse(string(tplData))
+}