From e21788b8b510445384056f98161c19a9abc5aad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferdinand=20M=C3=BCtsch?= Date: Sun, 13 Feb 2022 10:59:14 +0100 Subject: [PATCH] chore: minor fixes --- coverage/coverage.out | 1076 ++++++++++++------------ models/compat/wakatime/v1/heartbeat.go | 36 +- routes/compat/wakatime/v1/heartbeat.go | 12 +- services/imports/wakatime.go | 1 + static/docs/docs.go | 41 +- static/docs/swagger.json | 25 +- static/docs/swagger.yaml | 17 +- version.txt | 2 +- 8 files changed, 633 insertions(+), 577 deletions(-) diff --git a/coverage/coverage.out b/coverage/coverage.out index 8deceb4..6597a19 100644 --- a/coverage/coverage.out +++ b/coverage/coverage.out @@ -1,184 +1,4 @@ mode: set -github.com/muety/wakapi/models/user.go:11.13,13.2 1 1 -github.com/muety/wakapi/models/user.go:83.36,84.22 1 1 -github.com/muety/wakapi/models/user.go:87.2,88.16 2 1 -github.com/muety/wakapi/models/user.go:91.2,91.11 1 1 -github.com/muety/wakapi/models/user.go:84.22,86.3 1 1 -github.com/muety/wakapi/models/user.go:88.16,90.3 1 0 -github.com/muety/wakapi/models/user.go:96.41,99.2 2 1 -github.com/muety/wakapi/models/user.go:101.53,104.54 3 0 -github.com/muety/wakapi/models/user.go:107.2,107.51 1 0 -github.com/muety/wakapi/models/user.go:110.2,110.20 1 0 -github.com/muety/wakapi/models/user.go:104.54,106.3 1 0 -github.com/muety/wakapi/models/user.go:107.51,109.3 1 0 -github.com/muety/wakapi/models/user.go:114.52,115.28 1 0 -github.com/muety/wakapi/models/user.go:118.2,118.17 1 0 -github.com/muety/wakapi/models/user.go:115.28,117.3 1 0 -github.com/muety/wakapi/models/user.go:121.43,124.2 1 0 -github.com/muety/wakapi/models/user.go:126.45,129.2 1 0 -github.com/muety/wakapi/models/user.go:131.33,136.2 1 0 -github.com/muety/wakapi/models/user.go:138.41,140.2 1 0 -github.com/muety/wakapi/models/user.go:142.45,144.2 1 0 -github.com/muety/wakapi/models/user.go:146.45,148.2 1 0 -github.com/muety/wakapi/models/user.go:150.39,152.2 1 0 -github.com/muety/wakapi/models/user.go:154.39,157.2 2 0 -github.com/muety/wakapi/models/alias.go:18.32,20.2 1 0 -github.com/muety/wakapi/models/alias.go:22.37,23.35 1 0 -github.com/muety/wakapi/models/alias.go:28.2,28.14 1 0 -github.com/muety/wakapi/models/alias.go:23.35,24.18 1 0 -github.com/muety/wakapi/models/alias.go:24.18,26.4 1 0 -github.com/muety/wakapi/models/heartbeat.go:33.34,35.2 1 1 -github.com/muety/wakapi/models/heartbeat.go:37.65,39.46 2 1 -github.com/muety/wakapi/models/heartbeat.go:39.46,40.108 1 1 -github.com/muety/wakapi/models/heartbeat.go:40.108,43.4 2 1 -github.com/muety/wakapi/models/heartbeat.go:47.50,48.11 1 1 -github.com/muety/wakapi/models/heartbeat.go:63.2,63.15 1 1 -github.com/muety/wakapi/models/heartbeat.go:67.2,67.12 1 1 -github.com/muety/wakapi/models/heartbeat.go:49.22,50.18 1 1 -github.com/muety/wakapi/models/heartbeat.go:51.21,52.17 1 1 -github.com/muety/wakapi/models/heartbeat.go:53.23,54.19 1 1 -github.com/muety/wakapi/models/heartbeat.go:55.17,56.26 1 1 -github.com/muety/wakapi/models/heartbeat.go:57.22,58.18 1 1 -github.com/muety/wakapi/models/heartbeat.go:59.21,60.17 1 0 -github.com/muety/wakapi/models/heartbeat.go:63.15,65.3 1 1 -github.com/muety/wakapi/models/heartbeat.go:70.37,86.2 1 0 -github.com/muety/wakapi/models/heartbeat.go:94.41,96.16 2 0 -github.com/muety/wakapi/models/heartbeat.go:99.2,100.10 2 0 -github.com/muety/wakapi/models/heartbeat.go:96.16,98.3 1 0 -github.com/muety/wakapi/models/mail.go:19.44,23.2 3 0 -github.com/muety/wakapi/models/mail.go:25.44,29.2 3 0 -github.com/muety/wakapi/models/mail.go:31.32,44.2 1 0 -github.com/muety/wakapi/models/mail.go:46.41,48.2 1 0 -github.com/muety/wakapi/models/models.go:3.14,5.2 0 1 -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:50.52,56.22 2 0 -github.com/muety/wakapi/models/shared.go:71.2,74.12 3 0 -github.com/muety/wakapi/models/shared.go:57.14,61.17 2 0 -github.com/muety/wakapi/models/shared.go:64.17,66.8 2 0 -github.com/muety/wakapi/models/shared.go:67.10,68.64 1 0 -github.com/muety/wakapi/models/shared.go:61.17,63.4 1 0 -github.com/muety/wakapi/models/shared.go:77.51,80.2 2 0 -github.com/muety/wakapi/models/shared.go:82.45,84.2 1 0 -github.com/muety/wakapi/models/shared.go:86.37,88.2 1 0 -github.com/muety/wakapi/models/shared.go:90.35,92.2 1 0 -github.com/muety/wakapi/models/shared.go:94.34,96.2 1 0 -github.com/muety/wakapi/models/duration.go:24.55,38.2 2 0 -github.com/muety/wakapi/models/duration.go:40.39,42.16 2 0 -github.com/muety/wakapi/models/duration.go:45.2,46.10 2 0 -github.com/muety/wakapi/models/duration.go:42.16,44.3 1 0 -github.com/muety/wakapi/models/duration.go:49.49,50.11 1 0 -github.com/muety/wakapi/models/duration.go:65.2,65.15 1 0 -github.com/muety/wakapi/models/duration.go:69.2,69.12 1 0 -github.com/muety/wakapi/models/duration.go:51.22,52.18 1 0 -github.com/muety/wakapi/models/duration.go:53.21,54.17 1 0 -github.com/muety/wakapi/models/duration.go:55.23,56.19 1 0 -github.com/muety/wakapi/models/duration.go:57.17,58.26 1 0 -github.com/muety/wakapi/models/duration.go:59.22,60.18 1 0 -github.com/muety/wakapi/models/duration.go:61.21,62.17 1 0 -github.com/muety/wakapi/models/duration.go:65.15,67.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 -github.com/muety/wakapi/models/heartbeats.go:19.43,22.2 2 0 -github.com/muety/wakapi/models/heartbeats.go:24.41,26.18 1 0 -github.com/muety/wakapi/models/heartbeats.go:29.2,29.16 1 0 -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/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/durations.go:7.30,9.2 1 0 -github.com/muety/wakapi/models/durations.go:11.40,13.2 1 0 -github.com/muety/wakapi/models/durations.go:15.35,17.2 1 0 -github.com/muety/wakapi/models/durations.go:19.45,21.22 2 0 -github.com/muety/wakapi/models/durations.go:24.2,24.14 1 0 -github.com/muety/wakapi/models/durations.go:21.22,23.3 1 0 -github.com/muety/wakapi/models/durations.go:27.39,30.2 2 0 -github.com/muety/wakapi/models/durations.go:32.39,34.18 1 0 -github.com/muety/wakapi/models/durations.go:37.2,37.16 1 0 -github.com/muety/wakapi/models/durations.go:34.18,36.3 1 0 -github.com/muety/wakapi/models/durations.go:40.38,42.18 1 0 -github.com/muety/wakapi/models/durations.go:45.2,45.24 1 0 -github.com/muety/wakapi/models/durations.go:42.18,44.3 1 0 -github.com/muety/wakapi/models/filters.go:21.33,23.2 1 1 -github.com/muety/wakapi/models/filters.go:25.48,26.22 1 1 -github.com/muety/wakapi/models/filters.go:31.2,31.14 1 1 -github.com/muety/wakapi/models/filters.go:26.22,27.18 1 1 -github.com/muety/wakapi/models/filters.go:27.18,29.4 1 1 -github.com/muety/wakapi/models/filters.go:39.56,41.2 1 1 -github.com/muety/wakapi/models/filters.go:43.66,46.2 2 1 -github.com/muety/wakapi/models/filters.go:48.59,50.2 1 1 -github.com/muety/wakapi/models/filters.go:52.70,53.16 1 1 -github.com/muety/wakapi/models/filters.go:69.2,69.10 1 1 -github.com/muety/wakapi/models/filters.go:54.22,55.41 1 1 -github.com/muety/wakapi/models/filters.go:56.17,57.31 1 0 -github.com/muety/wakapi/models/filters.go:58.23,59.43 1 1 -github.com/muety/wakapi/models/filters.go:60.21,61.39 1 0 -github.com/muety/wakapi/models/filters.go:62.22,63.41 1 0 -github.com/muety/wakapi/models/filters.go:64.20,65.37 1 1 -github.com/muety/wakapi/models/filters.go:66.21,67.39 1 0 -github.com/muety/wakapi/models/filters.go:72.49,73.44 1 1 -github.com/muety/wakapi/models/filters.go:88.2,88.29 1 1 -github.com/muety/wakapi/models/filters.go:73.44,75.3 1 1 -github.com/muety/wakapi/models/filters.go:75.8,75.41 1 1 -github.com/muety/wakapi/models/filters.go:75.41,77.3 1 0 -github.com/muety/wakapi/models/filters.go:77.8,77.53 1 1 -github.com/muety/wakapi/models/filters.go:77.53,79.3 1 1 -github.com/muety/wakapi/models/filters.go:79.8,79.49 1 1 -github.com/muety/wakapi/models/filters.go:79.49,81.3 1 0 -github.com/muety/wakapi/models/filters.go:81.8,81.51 1 1 -github.com/muety/wakapi/models/filters.go:81.51,83.3 1 0 -github.com/muety/wakapi/models/filters.go:83.8,83.47 1 1 -github.com/muety/wakapi/models/filters.go:83.47,85.3 1 0 -github.com/muety/wakapi/models/filters.go:85.8,85.49 1 1 -github.com/muety/wakapi/models/filters.go:85.49,87.3 1 0 -github.com/muety/wakapi/models/filters.go:91.46,92.30 1 1 -github.com/muety/wakapi/models/filters.go:95.2,95.24 1 0 -github.com/muety/wakapi/models/filters.go:92.30,94.3 1 1 -github.com/muety/wakapi/models/filters.go:98.34,101.2 2 1 -github.com/muety/wakapi/models/filters.go:103.33,105.16 2 0 -github.com/muety/wakapi/models/filters.go:108.2,108.32 1 0 -github.com/muety/wakapi/models/filters.go:105.16,107.3 1 0 -github.com/muety/wakapi/models/filters.go:111.44,117.2 1 1 -github.com/muety/wakapi/models/filters.go:120.70,121.22 1 1 -github.com/muety/wakapi/models/filters.go:129.2,129.17 1 1 -github.com/muety/wakapi/models/filters.go:137.2,137.23 1 1 -github.com/muety/wakapi/models/filters.go:145.2,145.21 1 1 -github.com/muety/wakapi/models/filters.go:153.2,153.22 1 1 -github.com/muety/wakapi/models/filters.go:161.2,161.21 1 1 -github.com/muety/wakapi/models/filters.go:169.2,169.10 1 1 -github.com/muety/wakapi/models/filters.go:121.22,123.31 2 1 -github.com/muety/wakapi/models/filters.go:127.3,127.22 1 1 -github.com/muety/wakapi/models/filters.go:123.31,126.4 2 1 -github.com/muety/wakapi/models/filters.go:129.17,131.26 2 0 -github.com/muety/wakapi/models/filters.go:135.3,135.17 1 0 -github.com/muety/wakapi/models/filters.go:131.26,134.4 2 0 -github.com/muety/wakapi/models/filters.go:137.23,139.32 2 1 -github.com/muety/wakapi/models/filters.go:143.3,143.23 1 1 -github.com/muety/wakapi/models/filters.go:139.32,142.4 2 1 -github.com/muety/wakapi/models/filters.go:145.21,147.30 2 0 -github.com/muety/wakapi/models/filters.go:151.3,151.21 1 0 -github.com/muety/wakapi/models/filters.go:147.30,150.4 2 0 -github.com/muety/wakapi/models/filters.go:153.22,155.31 2 0 -github.com/muety/wakapi/models/filters.go:159.3,159.22 1 0 -github.com/muety/wakapi/models/filters.go:155.31,158.4 2 0 -github.com/muety/wakapi/models/filters.go:161.21,163.30 2 0 -github.com/muety/wakapi/models/filters.go:167.3,167.21 1 0 -github.com/muety/wakapi/models/filters.go:163.30,166.4 2 0 -github.com/muety/wakapi/models/filters.go:172.83,173.41 1 1 -github.com/muety/wakapi/models/filters.go:176.2,176.28 1 1 -github.com/muety/wakapi/models/filters.go:179.2,179.10 1 1 -github.com/muety/wakapi/models/filters.go:173.41,175.3 1 0 -github.com/muety/wakapi/models/filters.go:176.28,178.3 1 1 -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/mail_address.go:15.13,18.2 2 1 github.com/muety/wakapi/models/mail_address.go:24.38,26.2 1 0 github.com/muety/wakapi/models/mail_address.go:28.35,30.21 2 1 @@ -197,7 +17,7 @@ github.com/muety/wakapi/models/mail_address.go:59.40,60.22 1 1 github.com/muety/wakapi/models/mail_address.go:65.2,65.13 1 1 github.com/muety/wakapi/models/mail_address.go:60.22,61.17 1 1 github.com/muety/wakapi/models/mail_address.go:61.17,63.4 1 1 -github.com/muety/wakapi/models/project_label.go:14.39,16.2 1 0 +github.com/muety/wakapi/models/models.go:3.14,5.2 0 1 github.com/muety/wakapi/models/summary.go:63.29,65.2 1 1 github.com/muety/wakapi/models/summary.go:67.35,69.2 1 0 github.com/muety/wakapi/models/summary.go:71.38,73.2 1 0 @@ -282,6 +102,186 @@ github.com/muety/wakapi/models/summary.go:328.50,332.2 1 1 github.com/muety/wakapi/models/summary.go:334.33,336.2 1 1 github.com/muety/wakapi/models/summary.go:338.43,340.2 1 1 github.com/muety/wakapi/models/summary.go:342.38,344.2 1 1 +github.com/muety/wakapi/models/mail.go:19.44,23.2 3 0 +github.com/muety/wakapi/models/mail.go:25.44,29.2 3 0 +github.com/muety/wakapi/models/mail.go:31.32,44.2 1 0 +github.com/muety/wakapi/models/mail.go:46.41,48.2 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/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:50.52,56.22 2 0 +github.com/muety/wakapi/models/shared.go:71.2,74.12 3 0 +github.com/muety/wakapi/models/shared.go:57.14,61.17 2 0 +github.com/muety/wakapi/models/shared.go:64.17,66.8 2 0 +github.com/muety/wakapi/models/shared.go:67.10,68.64 1 0 +github.com/muety/wakapi/models/shared.go:61.17,63.4 1 0 +github.com/muety/wakapi/models/shared.go:77.51,80.2 2 0 +github.com/muety/wakapi/models/shared.go:82.45,84.2 1 0 +github.com/muety/wakapi/models/shared.go:86.37,88.2 1 0 +github.com/muety/wakapi/models/shared.go:90.35,92.2 1 0 +github.com/muety/wakapi/models/shared.go:94.34,96.2 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/project_label.go:14.39,16.2 1 0 +github.com/muety/wakapi/models/durations.go:7.30,9.2 1 0 +github.com/muety/wakapi/models/durations.go:11.40,13.2 1 0 +github.com/muety/wakapi/models/durations.go:15.35,17.2 1 0 +github.com/muety/wakapi/models/durations.go:19.45,21.22 2 0 +github.com/muety/wakapi/models/durations.go:24.2,24.14 1 0 +github.com/muety/wakapi/models/durations.go:21.22,23.3 1 0 +github.com/muety/wakapi/models/durations.go:27.39,30.2 2 0 +github.com/muety/wakapi/models/durations.go:32.39,34.18 1 0 +github.com/muety/wakapi/models/durations.go:37.2,37.16 1 0 +github.com/muety/wakapi/models/durations.go:34.18,36.3 1 0 +github.com/muety/wakapi/models/durations.go:40.38,42.18 1 0 +github.com/muety/wakapi/models/durations.go:45.2,45.24 1 0 +github.com/muety/wakapi/models/durations.go:42.18,44.3 1 0 +github.com/muety/wakapi/models/filters.go:21.33,23.2 1 1 +github.com/muety/wakapi/models/filters.go:25.48,26.22 1 1 +github.com/muety/wakapi/models/filters.go:31.2,31.14 1 1 +github.com/muety/wakapi/models/filters.go:26.22,27.18 1 1 +github.com/muety/wakapi/models/filters.go:27.18,29.4 1 1 +github.com/muety/wakapi/models/filters.go:39.56,41.2 1 1 +github.com/muety/wakapi/models/filters.go:43.66,46.2 2 1 +github.com/muety/wakapi/models/filters.go:48.59,50.2 1 1 +github.com/muety/wakapi/models/filters.go:52.70,53.16 1 1 +github.com/muety/wakapi/models/filters.go:69.2,69.10 1 1 +github.com/muety/wakapi/models/filters.go:54.22,55.41 1 1 +github.com/muety/wakapi/models/filters.go:56.17,57.31 1 0 +github.com/muety/wakapi/models/filters.go:58.23,59.43 1 1 +github.com/muety/wakapi/models/filters.go:60.21,61.39 1 0 +github.com/muety/wakapi/models/filters.go:62.22,63.41 1 0 +github.com/muety/wakapi/models/filters.go:64.20,65.37 1 1 +github.com/muety/wakapi/models/filters.go:66.21,67.39 1 0 +github.com/muety/wakapi/models/filters.go:72.49,73.44 1 1 +github.com/muety/wakapi/models/filters.go:88.2,88.29 1 1 +github.com/muety/wakapi/models/filters.go:73.44,75.3 1 1 +github.com/muety/wakapi/models/filters.go:75.8,75.41 1 1 +github.com/muety/wakapi/models/filters.go:75.41,77.3 1 0 +github.com/muety/wakapi/models/filters.go:77.8,77.53 1 1 +github.com/muety/wakapi/models/filters.go:77.53,79.3 1 1 +github.com/muety/wakapi/models/filters.go:79.8,79.49 1 1 +github.com/muety/wakapi/models/filters.go:79.49,81.3 1 0 +github.com/muety/wakapi/models/filters.go:81.8,81.51 1 1 +github.com/muety/wakapi/models/filters.go:81.51,83.3 1 0 +github.com/muety/wakapi/models/filters.go:83.8,83.47 1 1 +github.com/muety/wakapi/models/filters.go:83.47,85.3 1 0 +github.com/muety/wakapi/models/filters.go:85.8,85.49 1 1 +github.com/muety/wakapi/models/filters.go:85.49,87.3 1 0 +github.com/muety/wakapi/models/filters.go:91.46,92.30 1 1 +github.com/muety/wakapi/models/filters.go:95.2,95.24 1 0 +github.com/muety/wakapi/models/filters.go:92.30,94.3 1 1 +github.com/muety/wakapi/models/filters.go:98.34,101.2 2 1 +github.com/muety/wakapi/models/filters.go:103.33,105.16 2 0 +github.com/muety/wakapi/models/filters.go:108.2,108.32 1 0 +github.com/muety/wakapi/models/filters.go:105.16,107.3 1 0 +github.com/muety/wakapi/models/filters.go:111.44,117.2 1 1 +github.com/muety/wakapi/models/filters.go:120.70,121.22 1 1 +github.com/muety/wakapi/models/filters.go:129.2,129.17 1 1 +github.com/muety/wakapi/models/filters.go:137.2,137.23 1 1 +github.com/muety/wakapi/models/filters.go:145.2,145.21 1 1 +github.com/muety/wakapi/models/filters.go:153.2,153.22 1 1 +github.com/muety/wakapi/models/filters.go:161.2,161.21 1 1 +github.com/muety/wakapi/models/filters.go:169.2,169.10 1 1 +github.com/muety/wakapi/models/filters.go:121.22,123.31 2 1 +github.com/muety/wakapi/models/filters.go:127.3,127.22 1 1 +github.com/muety/wakapi/models/filters.go:123.31,126.4 2 1 +github.com/muety/wakapi/models/filters.go:129.17,131.26 2 0 +github.com/muety/wakapi/models/filters.go:135.3,135.17 1 0 +github.com/muety/wakapi/models/filters.go:131.26,134.4 2 0 +github.com/muety/wakapi/models/filters.go:137.23,139.32 2 1 +github.com/muety/wakapi/models/filters.go:143.3,143.23 1 1 +github.com/muety/wakapi/models/filters.go:139.32,142.4 2 1 +github.com/muety/wakapi/models/filters.go:145.21,147.30 2 0 +github.com/muety/wakapi/models/filters.go:151.3,151.21 1 0 +github.com/muety/wakapi/models/filters.go:147.30,150.4 2 0 +github.com/muety/wakapi/models/filters.go:153.22,155.31 2 0 +github.com/muety/wakapi/models/filters.go:159.3,159.22 1 0 +github.com/muety/wakapi/models/filters.go:155.31,158.4 2 0 +github.com/muety/wakapi/models/filters.go:161.21,163.30 2 0 +github.com/muety/wakapi/models/filters.go:167.3,167.21 1 0 +github.com/muety/wakapi/models/filters.go:163.30,166.4 2 0 +github.com/muety/wakapi/models/filters.go:172.83,173.41 1 1 +github.com/muety/wakapi/models/filters.go:176.2,176.28 1 1 +github.com/muety/wakapi/models/filters.go:179.2,179.10 1 1 +github.com/muety/wakapi/models/filters.go:173.41,175.3 1 0 +github.com/muety/wakapi/models/filters.go:176.28,178.3 1 1 +github.com/muety/wakapi/models/heartbeat.go:33.34,35.2 1 1 +github.com/muety/wakapi/models/heartbeat.go:37.65,39.46 2 1 +github.com/muety/wakapi/models/heartbeat.go:39.46,40.108 1 1 +github.com/muety/wakapi/models/heartbeat.go:40.108,43.4 2 1 +github.com/muety/wakapi/models/heartbeat.go:47.50,48.11 1 1 +github.com/muety/wakapi/models/heartbeat.go:63.2,63.15 1 1 +github.com/muety/wakapi/models/heartbeat.go:67.2,67.12 1 1 +github.com/muety/wakapi/models/heartbeat.go:49.22,50.18 1 1 +github.com/muety/wakapi/models/heartbeat.go:51.21,52.17 1 1 +github.com/muety/wakapi/models/heartbeat.go:53.23,54.19 1 1 +github.com/muety/wakapi/models/heartbeat.go:55.17,56.26 1 1 +github.com/muety/wakapi/models/heartbeat.go:57.22,58.18 1 1 +github.com/muety/wakapi/models/heartbeat.go:59.21,60.17 1 0 +github.com/muety/wakapi/models/heartbeat.go:63.15,65.3 1 1 +github.com/muety/wakapi/models/heartbeat.go:70.37,86.2 1 0 +github.com/muety/wakapi/models/heartbeat.go:94.41,96.16 2 0 +github.com/muety/wakapi/models/heartbeat.go:99.2,100.10 2 0 +github.com/muety/wakapi/models/heartbeat.go:96.16,98.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 +github.com/muety/wakapi/models/heartbeats.go:19.43,22.2 2 0 +github.com/muety/wakapi/models/heartbeats.go:24.41,26.18 1 0 +github.com/muety/wakapi/models/heartbeats.go:29.2,29.16 1 0 +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/user.go:11.13,13.2 1 1 +github.com/muety/wakapi/models/user.go:83.36,84.22 1 1 +github.com/muety/wakapi/models/user.go:87.2,88.16 2 1 +github.com/muety/wakapi/models/user.go:91.2,91.11 1 1 +github.com/muety/wakapi/models/user.go:84.22,86.3 1 1 +github.com/muety/wakapi/models/user.go:88.16,90.3 1 0 +github.com/muety/wakapi/models/user.go:96.41,99.2 2 1 +github.com/muety/wakapi/models/user.go:101.53,104.54 3 0 +github.com/muety/wakapi/models/user.go:107.2,107.51 1 0 +github.com/muety/wakapi/models/user.go:110.2,110.20 1 0 +github.com/muety/wakapi/models/user.go:104.54,106.3 1 0 +github.com/muety/wakapi/models/user.go:107.51,109.3 1 0 +github.com/muety/wakapi/models/user.go:114.52,115.28 1 0 +github.com/muety/wakapi/models/user.go:118.2,118.17 1 0 +github.com/muety/wakapi/models/user.go:115.28,117.3 1 0 +github.com/muety/wakapi/models/user.go:121.43,124.2 1 0 +github.com/muety/wakapi/models/user.go:126.45,129.2 1 0 +github.com/muety/wakapi/models/user.go:131.33,136.2 1 0 +github.com/muety/wakapi/models/user.go:138.41,140.2 1 0 +github.com/muety/wakapi/models/user.go:142.45,144.2 1 0 +github.com/muety/wakapi/models/user.go:146.45,148.2 1 0 +github.com/muety/wakapi/models/user.go:150.39,152.2 1 0 +github.com/muety/wakapi/models/user.go:154.39,157.2 2 0 +github.com/muety/wakapi/models/alias.go:18.32,20.2 1 0 +github.com/muety/wakapi/models/alias.go:22.37,23.35 1 0 +github.com/muety/wakapi/models/alias.go:28.2,28.14 1 0 +github.com/muety/wakapi/models/alias.go:23.35,24.18 1 0 +github.com/muety/wakapi/models/alias.go:24.18,26.4 1 0 +github.com/muety/wakapi/models/duration.go:24.55,38.2 2 0 +github.com/muety/wakapi/models/duration.go:40.39,42.16 2 0 +github.com/muety/wakapi/models/duration.go:45.2,46.10 2 0 +github.com/muety/wakapi/models/duration.go:42.16,44.3 1 0 +github.com/muety/wakapi/models/duration.go:49.49,50.11 1 0 +github.com/muety/wakapi/models/duration.go:65.2,65.15 1 0 +github.com/muety/wakapi/models/duration.go:69.2,69.12 1 0 +github.com/muety/wakapi/models/duration.go:51.22,52.18 1 0 +github.com/muety/wakapi/models/duration.go:53.21,54.17 1 0 +github.com/muety/wakapi/models/duration.go:55.23,56.19 1 0 +github.com/muety/wakapi/models/duration.go:57.17,58.26 1 0 +github.com/muety/wakapi/models/duration.go:59.22,60.18 1 0 +github.com/muety/wakapi/models/duration.go:61.21,62.17 1 0 +github.com/muety/wakapi/models/duration.go:65.15,67.3 1 0 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:30.112,37.2 1 0 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:39.59,43.2 2 0 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:55.68,60.79 4 0 @@ -315,39 +315,6 @@ github.com/muety/wakapi/routes/compat/shields/v1/badge.go:167.2,167.36 1 0 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:140.16,142.3 1 0 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:151.29,153.3 1 0 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:163.16,165.3 1 0 -github.com/muety/wakapi/config/sentry.go:22.35,24.2 1 0 -github.com/muety/wakapi/config/sentry.go:26.62,29.2 2 0 -github.com/muety/wakapi/config/sentry.go:39.33,46.2 2 0 -github.com/muety/wakapi/config/sentry.go:48.79,51.2 2 0 -github.com/muety/wakapi/config/sentry.go:53.72,57.2 3 0 -github.com/muety/wakapi/config/sentry.go:59.71,63.2 3 0 -github.com/muety/wakapi/config/sentry.go:65.71,69.2 3 0 -github.com/muety/wakapi/config/sentry.go:71.72,75.2 3 0 -github.com/muety/wakapi/config/sentry.go:77.72,81.2 3 0 -github.com/muety/wakapi/config/sentry.go:83.67,88.18 4 0 -github.com/muety/wakapi/config/sentry.go:100.2,100.28 1 0 -github.com/muety/wakapi/config/sentry.go:88.18,89.65 1 0 -github.com/muety/wakapi/config/sentry.go:89.65,92.42 3 0 -github.com/muety/wakapi/config/sentry.go:95.4,96.10 2 0 -github.com/muety/wakapi/config/sentry.go:92.42,94.5 1 0 -github.com/muety/wakapi/config/sentry.go:110.50,114.91 1 0 -github.com/muety/wakapi/config/sentry.go:114.91,115.29 1 0 -github.com/muety/wakapi/config/sentry.go:119.4,122.38 3 0 -github.com/muety/wakapi/config/sentry.go:127.4,127.39 1 0 -github.com/muety/wakapi/config/sentry.go:130.4,130.69 1 0 -github.com/muety/wakapi/config/sentry.go:115.29,117.5 1 0 -github.com/muety/wakapi/config/sentry.go:122.38,123.38 1 0 -github.com/muety/wakapi/config/sentry.go:123.38,125.6 1 0 -github.com/muety/wakapi/config/sentry.go:127.39,129.5 1 0 -github.com/muety/wakapi/config/sentry.go:132.79,133.27 1 0 -github.com/muety/wakapi/config/sentry.go:140.4,140.16 1 0 -github.com/muety/wakapi/config/sentry.go:133.27,134.84 1 0 -github.com/muety/wakapi/config/sentry.go:134.84,135.42 1 0 -github.com/muety/wakapi/config/sentry.go:135.42,137.7 1 0 -github.com/muety/wakapi/config/sentry.go:142.17,144.3 1 0 -github.com/muety/wakapi/config/sentry.go:147.49,151.51 2 0 -github.com/muety/wakapi/config/sentry.go:154.2,154.12 1 0 -github.com/muety/wakapi/config/sentry.go:151.51,153.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 @@ -458,6 +425,81 @@ github.com/muety/wakapi/config/eventbus.go:30.26,32.2 1 0 github.com/muety/wakapi/config/fs.go:9.56,10.19 1 0 github.com/muety/wakapi/config/fs.go:13.2,13.19 1 0 github.com/muety/wakapi/config/fs.go:10.19,12.3 1 0 +github.com/muety/wakapi/config/sentry.go:22.35,24.2 1 0 +github.com/muety/wakapi/config/sentry.go:26.62,29.2 2 0 +github.com/muety/wakapi/config/sentry.go:39.33,46.2 2 0 +github.com/muety/wakapi/config/sentry.go:48.79,51.2 2 0 +github.com/muety/wakapi/config/sentry.go:53.72,57.2 3 0 +github.com/muety/wakapi/config/sentry.go:59.71,63.2 3 0 +github.com/muety/wakapi/config/sentry.go:65.71,69.2 3 0 +github.com/muety/wakapi/config/sentry.go:71.72,75.2 3 0 +github.com/muety/wakapi/config/sentry.go:77.72,81.2 3 0 +github.com/muety/wakapi/config/sentry.go:83.67,88.18 4 0 +github.com/muety/wakapi/config/sentry.go:100.2,100.28 1 0 +github.com/muety/wakapi/config/sentry.go:88.18,89.65 1 0 +github.com/muety/wakapi/config/sentry.go:89.65,92.42 3 0 +github.com/muety/wakapi/config/sentry.go:95.4,96.10 2 0 +github.com/muety/wakapi/config/sentry.go:92.42,94.5 1 0 +github.com/muety/wakapi/config/sentry.go:110.50,114.91 1 0 +github.com/muety/wakapi/config/sentry.go:114.91,115.29 1 0 +github.com/muety/wakapi/config/sentry.go:119.4,122.38 3 0 +github.com/muety/wakapi/config/sentry.go:127.4,127.39 1 0 +github.com/muety/wakapi/config/sentry.go:130.4,130.69 1 0 +github.com/muety/wakapi/config/sentry.go:115.29,117.5 1 0 +github.com/muety/wakapi/config/sentry.go:122.38,123.38 1 0 +github.com/muety/wakapi/config/sentry.go:123.38,125.6 1 0 +github.com/muety/wakapi/config/sentry.go:127.39,129.5 1 0 +github.com/muety/wakapi/config/sentry.go:132.79,133.27 1 0 +github.com/muety/wakapi/config/sentry.go:140.4,140.16 1 0 +github.com/muety/wakapi/config/sentry.go:133.27,134.84 1 0 +github.com/muety/wakapi/config/sentry.go:134.84,135.42 1 0 +github.com/muety/wakapi/config/sentry.go:135.42,137.7 1 0 +github.com/muety/wakapi/config/sentry.go:142.17,144.3 1 0 +github.com/muety/wakapi/config/sentry.go:147.49,151.51 2 0 +github.com/muety/wakapi/config/sentry.go:154.2,154.12 1 0 +github.com/muety/wakapi/config/sentry.go:151.51,153.3 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:30.91,36.2 1 1 +github.com/muety/wakapi/middlewares/authenticate.go:38.90,41.2 2 0 +github.com/muety/wakapi/middlewares/authenticate.go:43.90,46.2 2 0 +github.com/muety/wakapi/middlewares/authenticate.go:48.71,49.71 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:49.71,51.3 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:54.107,58.16 3 0 +github.com/muety/wakapi/middlewares/authenticate.go:61.2,61.16 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:65.2,65.31 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:81.2,82.12 2 0 +github.com/muety/wakapi/middlewares/authenticate.go:58.16,60.3 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:61.16,63.3 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:65.31,66.31 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:71.3,71.29 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:78.3,78.9 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:66.31,69.4 2 0 +github.com/muety/wakapi/middlewares/authenticate.go:71.29,74.4 2 0 +github.com/muety/wakapi/middlewares/authenticate.go:74.9,77.4 2 0 +github.com/muety/wakapi/middlewares/authenticate.go:85.70,86.39 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:91.2,91.14 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:86.39,87.60 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:87.60,89.4 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:94.98,96.16 2 1 +github.com/muety/wakapi/middlewares/authenticate.go:100.2,103.16 4 1 +github.com/muety/wakapi/middlewares/authenticate.go:106.2,106.18 1 1 +github.com/muety/wakapi/middlewares/authenticate.go:96.16,98.3 1 1 +github.com/muety/wakapi/middlewares/authenticate.go:103.16,105.3 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:109.97,113.19 4 1 +github.com/muety/wakapi/middlewares/authenticate.go:116.2,117.16 2 1 +github.com/muety/wakapi/middlewares/authenticate.go:120.2,120.18 1 1 +github.com/muety/wakapi/middlewares/authenticate.go:113.19,115.3 1 1 +github.com/muety/wakapi/middlewares/authenticate.go:117.16,119.3 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:123.92,125.16 2 0 +github.com/muety/wakapi/middlewares/authenticate.go:129.2,130.16 2 0 +github.com/muety/wakapi/middlewares/authenticate.go:137.2,137.18 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:125.16,127.3 1 0 +github.com/muety/wakapi/middlewares/authenticate.go:130.16,132.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 @@ -506,48 +548,6 @@ github.com/muety/wakapi/middlewares/sentry.go:16.43,20.3 1 0 github.com/muety/wakapi/middlewares/sentry.go:23.78,26.54 3 0 github.com/muety/wakapi/middlewares/sentry.go:26.54,27.43 1 0 github.com/muety/wakapi/middlewares/sentry.go:27.43,29.4 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:30.91,36.2 1 1 -github.com/muety/wakapi/middlewares/authenticate.go:38.90,41.2 2 0 -github.com/muety/wakapi/middlewares/authenticate.go:43.90,46.2 2 0 -github.com/muety/wakapi/middlewares/authenticate.go:48.71,49.71 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:49.71,51.3 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:54.107,58.16 3 0 -github.com/muety/wakapi/middlewares/authenticate.go:61.2,61.16 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:65.2,65.31 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:81.2,82.12 2 0 -github.com/muety/wakapi/middlewares/authenticate.go:58.16,60.3 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:61.16,63.3 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:65.31,66.31 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:71.3,71.29 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:78.3,78.9 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:66.31,69.4 2 0 -github.com/muety/wakapi/middlewares/authenticate.go:71.29,74.4 2 0 -github.com/muety/wakapi/middlewares/authenticate.go:74.9,77.4 2 0 -github.com/muety/wakapi/middlewares/authenticate.go:85.70,86.39 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:91.2,91.14 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:86.39,87.60 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:87.60,89.4 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:94.98,96.16 2 1 -github.com/muety/wakapi/middlewares/authenticate.go:100.2,103.16 4 1 -github.com/muety/wakapi/middlewares/authenticate.go:106.2,106.18 1 1 -github.com/muety/wakapi/middlewares/authenticate.go:96.16,98.3 1 1 -github.com/muety/wakapi/middlewares/authenticate.go:103.16,105.3 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:109.97,113.19 4 1 -github.com/muety/wakapi/middlewares/authenticate.go:116.2,117.16 2 1 -github.com/muety/wakapi/middlewares/authenticate.go:120.2,120.18 1 1 -github.com/muety/wakapi/middlewares/authenticate.go:113.19,115.3 1 1 -github.com/muety/wakapi/middlewares/authenticate.go:117.16,119.3 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:123.92,125.16 2 0 -github.com/muety/wakapi/middlewares/authenticate.go:129.2,130.16 2 0 -github.com/muety/wakapi/middlewares/authenticate.go:137.2,137.18 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:125.16,127.3 1 0 -github.com/muety/wakapi/middlewares/authenticate.go:130.16,132.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/utils/template.go:13.41,15.16 2 0 github.com/muety/wakapi/utils/template.go:18.2,18.23 1 0 github.com/muety/wakapi/utils/template.go:15.16,17.3 1 0 @@ -567,92 +567,9 @@ github.com/muety/wakapi/utils/template.go:39.51,40.12 1 0 github.com/muety/wakapi/utils/template.go:44.17,46.4 1 0 github.com/muety/wakapi/utils/template.go:48.17,50.4 1 0 github.com/muety/wakapi/utils/template.go:55.17,57.4 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/utils/collection.go:3.59,5.22 2 0 github.com/muety/wakapi/utils/collection.go:8.2,8.15 1 0 github.com/muety/wakapi/utils/collection.go:5.22,7.3 1 0 -github.com/muety/wakapi/utils/http.go:9.90,12.58 3 0 -github.com/muety/wakapi/utils/http.go:12.58,14.3 1 0 -github.com/muety/wakapi/utils/strings.go:8.34,10.2 1 0 -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/set.go:3.51,5.26 2 0 -github.com/muety/wakapi/utils/set.go:8.2,8.12 1 0 -github.com/muety/wakapi/utils/set.go:5.26,7.3 1 0 -github.com/muety/wakapi/utils/set.go:11.49,13.21 2 0 -github.com/muety/wakapi/utils/set.go:16.2,16.14 1 0 -github.com/muety/wakapi/utils/set.go:13.21,15.3 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.88,22.2 2 0 -github.com/muety/wakapi/utils/summary.go:24.95,26.16 2 0 -github.com/muety/wakapi/utils/summary.go:29.2,29.38 1 0 -github.com/muety/wakapi/utils/summary.go:26.16,28.3 1 0 -github.com/muety/wakapi/utils/summary.go:32.105,36.18 3 0 -github.com/muety/wakapi/utils/summary.go:71.2,71.22 1 0 -github.com/muety/wakapi/utils/summary.go:37.28,38.26 1 0 -github.com/muety/wakapi/utils/summary.go:39.32,41.24 2 0 -github.com/muety/wakapi/utils/summary.go:42.31,43.29 1 0 -github.com/muety/wakapi/utils/summary.go:44.31,46.27 2 0 -github.com/muety/wakapi/utils/summary.go:47.32,48.30 1 0 -github.com/muety/wakapi/utils/summary.go:49.32,51.28 2 0 -github.com/muety/wakapi/utils/summary.go:52.31,53.29 1 0 -github.com/muety/wakapi/utils/summary.go:54.32,55.31 1 0 -github.com/muety/wakapi/utils/summary.go:56.41,58.42 2 0 -github.com/muety/wakapi/utils/summary.go:59.33,60.32 1 0 -github.com/muety/wakapi/utils/summary.go:61.33,62.32 1 0 -github.com/muety/wakapi/utils/summary.go:63.35,64.32 1 0 -github.com/muety/wakapi/utils/summary.go:65.26,66.21 1 0 -github.com/muety/wakapi/utils/summary.go:67.10,68.39 1 0 -github.com/muety/wakapi/utils/summary.go:74.73,81.56 5 0 -github.com/muety/wakapi/utils/summary.go:97.2,107.8 3 0 -github.com/muety/wakapi/utils/summary.go:81.56,83.3 1 0 -github.com/muety/wakapi/utils/summary.go:83.8,83.54 1 0 -github.com/muety/wakapi/utils/summary.go:83.54,85.3 1 0 -github.com/muety/wakapi/utils/summary.go:85.8,87.17 2 0 -github.com/muety/wakapi/utils/summary.go:91.3,92.17 2 0 -github.com/muety/wakapi/utils/summary.go:87.17,89.4 1 0 -github.com/muety/wakapi/utils/summary.go:92.17,94.4 1 0 -github.com/muety/wakapi/utils/summary.go:110.59,112.48 2 0 -github.com/muety/wakapi/utils/summary.go:115.2,115.49 1 0 -github.com/muety/wakapi/utils/summary.go:118.2,118.47 1 0 -github.com/muety/wakapi/utils/summary.go:121.2,121.48 1 0 -github.com/muety/wakapi/utils/summary.go:124.2,124.57 1 0 -github.com/muety/wakapi/utils/summary.go:127.2,127.46 1 0 -github.com/muety/wakapi/utils/summary.go:130.2,130.47 1 0 -github.com/muety/wakapi/utils/summary.go:133.2,133.16 1 0 -github.com/muety/wakapi/utils/summary.go:112.48,114.3 1 0 -github.com/muety/wakapi/utils/summary.go:115.49,117.3 1 0 -github.com/muety/wakapi/utils/summary.go:118.47,120.3 1 0 -github.com/muety/wakapi/utils/summary.go:121.48,123.3 1 0 -github.com/muety/wakapi/utils/summary.go:124.57,126.3 1 0 -github.com/muety/wakapi/utils/summary.go:127.46,129.3 1 0 -github.com/muety/wakapi/utils/summary.go:130.47,132.3 1 0 -github.com/muety/wakapi/utils/summary.go:136.48,140.51 2 0 -github.com/muety/wakapi/utils/summary.go:143.2,143.12 1 0 -github.com/muety/wakapi/utils/summary.go:140.51,142.3 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 @@ -713,57 +630,155 @@ github.com/muety/wakapi/utils/db.go:30.2,31.14 2 0 github.com/muety/wakapi/utils/db.go:22.37,24.119 2 0 github.com/muety/wakapi/utils/db.go:28.3,28.20 1 0 github.com/muety/wakapi/utils/db.go:24.119,27.4 2 0 -github.com/muety/wakapi/services/user.go:24.99,34.33 3 0 -github.com/muety/wakapi/services/user.go:55.2,55.12 1 0 -github.com/muety/wakapi/services/user.go:34.33,35.31 1 0 -github.com/muety/wakapi/services/user.go:35.31,41.73 4 0 -github.com/muety/wakapi/services/user.go:45.4,45.24 1 0 -github.com/muety/wakapi/services/user.go:41.73,43.5 1 0 -github.com/muety/wakapi/services/user.go:45.24,46.80 1 0 -github.com/muety/wakapi/services/user.go:46.80,48.6 1 0 -github.com/muety/wakapi/services/user.go:48.11,50.6 1 0 -github.com/muety/wakapi/services/user.go:58.74,59.40 1 0 -github.com/muety/wakapi/services/user.go:63.2,64.16 2 0 -github.com/muety/wakapi/services/user.go:68.2,69.15 2 0 -github.com/muety/wakapi/services/user.go:59.40,61.3 1 0 -github.com/muety/wakapi/services/user.go:64.16,66.3 1 0 -github.com/muety/wakapi/services/user.go:72.72,73.37 1 0 -github.com/muety/wakapi/services/user.go:77.2,78.16 2 0 -github.com/muety/wakapi/services/user.go:82.2,83.15 2 0 -github.com/muety/wakapi/services/user.go:73.37,75.3 1 0 -github.com/muety/wakapi/services/user.go:78.16,80.3 1 0 -github.com/muety/wakapi/services/user.go:86.76,88.2 1 0 -github.com/muety/wakapi/services/user.go:90.86,92.2 1 0 -github.com/muety/wakapi/services/user.go:94.58,96.2 1 0 -github.com/muety/wakapi/services/user.go:98.86,100.2 1 0 -github.com/muety/wakapi/services/user.go:102.71,104.12 2 0 -github.com/muety/wakapi/services/user.go:108.2,109.42 2 0 -github.com/muety/wakapi/services/user.go:113.2,114.16 2 0 -github.com/muety/wakapi/services/user.go:118.2,119.21 2 0 -github.com/muety/wakapi/services/user.go:104.12,106.3 1 0 -github.com/muety/wakapi/services/user.go:109.42,111.3 1 0 -github.com/muety/wakapi/services/user.go:114.16,116.3 1 0 -github.com/muety/wakapi/services/user.go:122.48,124.2 1 0 -github.com/muety/wakapi/services/user.go:126.102,136.93 2 0 -github.com/muety/wakapi/services/user.go:142.2,142.38 1 0 -github.com/muety/wakapi/services/user.go:136.93,138.3 1 0 -github.com/muety/wakapi/services/user.go:138.8,140.3 1 0 -github.com/muety/wakapi/services/user.go:145.73,149.2 3 0 -github.com/muety/wakapi/services/user.go:151.78,155.2 3 0 -github.com/muety/wakapi/services/user.go:157.122,160.35 2 0 -github.com/muety/wakapi/services/user.go:166.2,166.35 1 0 -github.com/muety/wakapi/services/user.go:170.2,170.18 1 0 -github.com/muety/wakapi/services/user.go:160.35,161.89 1 0 -github.com/muety/wakapi/services/user.go:161.89,163.4 1 0 -github.com/muety/wakapi/services/user.go:166.35,168.3 1 0 -github.com/muety/wakapi/services/user.go:173.106,176.96 3 0 -github.com/muety/wakapi/services/user.go:181.2,181.68 1 0 -github.com/muety/wakapi/services/user.go:176.96,178.3 1 0 -github.com/muety/wakapi/services/user.go:178.8,180.3 1 0 -github.com/muety/wakapi/services/user.go:184.85,186.2 1 0 -github.com/muety/wakapi/services/user.go:188.57,195.2 4 0 -github.com/muety/wakapi/services/user.go:197.38,199.2 1 0 -github.com/muety/wakapi/services/user.go:201.57,206.2 1 0 +github.com/muety/wakapi/utils/http.go:9.90,12.58 3 0 +github.com/muety/wakapi/utils/http.go:12.58,14.3 1 0 +github.com/muety/wakapi/utils/set.go:3.51,5.26 2 0 +github.com/muety/wakapi/utils/set.go:8.2,8.12 1 0 +github.com/muety/wakapi/utils/set.go:5.26,7.3 1 0 +github.com/muety/wakapi/utils/set.go:11.49,13.21 2 0 +github.com/muety/wakapi/utils/set.go:16.2,16.14 1 0 +github.com/muety/wakapi/utils/set.go:13.21,15.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/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.88,22.2 2 0 +github.com/muety/wakapi/utils/summary.go:24.95,26.16 2 0 +github.com/muety/wakapi/utils/summary.go:29.2,29.38 1 0 +github.com/muety/wakapi/utils/summary.go:26.16,28.3 1 0 +github.com/muety/wakapi/utils/summary.go:32.105,36.18 3 0 +github.com/muety/wakapi/utils/summary.go:71.2,71.22 1 0 +github.com/muety/wakapi/utils/summary.go:37.28,38.26 1 0 +github.com/muety/wakapi/utils/summary.go:39.32,41.24 2 0 +github.com/muety/wakapi/utils/summary.go:42.31,43.29 1 0 +github.com/muety/wakapi/utils/summary.go:44.31,46.27 2 0 +github.com/muety/wakapi/utils/summary.go:47.32,48.30 1 0 +github.com/muety/wakapi/utils/summary.go:49.32,51.28 2 0 +github.com/muety/wakapi/utils/summary.go:52.31,53.29 1 0 +github.com/muety/wakapi/utils/summary.go:54.32,55.31 1 0 +github.com/muety/wakapi/utils/summary.go:56.41,58.42 2 0 +github.com/muety/wakapi/utils/summary.go:59.33,60.32 1 0 +github.com/muety/wakapi/utils/summary.go:61.33,62.32 1 0 +github.com/muety/wakapi/utils/summary.go:63.35,64.32 1 0 +github.com/muety/wakapi/utils/summary.go:65.26,66.21 1 0 +github.com/muety/wakapi/utils/summary.go:67.10,68.39 1 0 +github.com/muety/wakapi/utils/summary.go:74.73,81.56 5 0 +github.com/muety/wakapi/utils/summary.go:97.2,107.8 3 0 +github.com/muety/wakapi/utils/summary.go:81.56,83.3 1 0 +github.com/muety/wakapi/utils/summary.go:83.8,83.54 1 0 +github.com/muety/wakapi/utils/summary.go:83.54,85.3 1 0 +github.com/muety/wakapi/utils/summary.go:85.8,87.17 2 0 +github.com/muety/wakapi/utils/summary.go:91.3,92.17 2 0 +github.com/muety/wakapi/utils/summary.go:87.17,89.4 1 0 +github.com/muety/wakapi/utils/summary.go:92.17,94.4 1 0 +github.com/muety/wakapi/utils/summary.go:110.59,112.48 2 0 +github.com/muety/wakapi/utils/summary.go:115.2,115.49 1 0 +github.com/muety/wakapi/utils/summary.go:118.2,118.47 1 0 +github.com/muety/wakapi/utils/summary.go:121.2,121.48 1 0 +github.com/muety/wakapi/utils/summary.go:124.2,124.57 1 0 +github.com/muety/wakapi/utils/summary.go:127.2,127.46 1 0 +github.com/muety/wakapi/utils/summary.go:130.2,130.47 1 0 +github.com/muety/wakapi/utils/summary.go:133.2,133.16 1 0 +github.com/muety/wakapi/utils/summary.go:112.48,114.3 1 0 +github.com/muety/wakapi/utils/summary.go:115.49,117.3 1 0 +github.com/muety/wakapi/utils/summary.go:118.47,120.3 1 0 +github.com/muety/wakapi/utils/summary.go:121.48,123.3 1 0 +github.com/muety/wakapi/utils/summary.go:124.57,126.3 1 0 +github.com/muety/wakapi/utils/summary.go:127.46,129.3 1 0 +github.com/muety/wakapi/utils/summary.go:130.47,132.3 1 0 +github.com/muety/wakapi/utils/summary.go:136.48,140.51 2 0 +github.com/muety/wakapi/utils/summary.go:143.2,143.12 1 0 +github.com/muety/wakapi/utils/summary.go:140.51,142.3 1 0 +github.com/muety/wakapi/utils/strings.go:8.34,10.2 1 0 +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/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.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/project_label.go:20.111,27.2 1 0 +github.com/muety/wakapi/services/project_label.go:29.80,31.2 1 0 +github.com/muety/wakapi/services/project_label.go:33.90,34.51 1 0 +github.com/muety/wakapi/services/project_label.go:38.2,39.16 2 0 +github.com/muety/wakapi/services/project_label.go:42.2,43.20 2 0 +github.com/muety/wakapi/services/project_label.go:34.51,36.3 1 0 +github.com/muety/wakapi/services/project_label.go:39.16,41.3 1 0 +github.com/muety/wakapi/services/project_label.go:47.108,50.16 3 0 +github.com/muety/wakapi/services/project_label.go:54.2,54.31 1 0 +github.com/muety/wakapi/services/project_label.go:61.2,61.29 1 0 +github.com/muety/wakapi/services/project_label.go:50.16,52.3 1 0 +github.com/muety/wakapi/services/project_label.go:54.31,55.50 1 0 +github.com/muety/wakapi/services/project_label.go:55.50,57.4 1 0 +github.com/muety/wakapi/services/project_label.go:57.9,59.4 1 0 +github.com/muety/wakapi/services/project_label.go:65.116,68.16 3 0 +github.com/muety/wakapi/services/project_label.go:72.2,72.31 1 0 +github.com/muety/wakapi/services/project_label.go:79.2,79.29 1 0 +github.com/muety/wakapi/services/project_label.go:68.16,70.3 1 0 +github.com/muety/wakapi/services/project_label.go:72.31,73.45 1 0 +github.com/muety/wakapi/services/project_label.go:73.45,75.4 1 0 +github.com/muety/wakapi/services/project_label.go:75.9,77.4 1 0 +github.com/muety/wakapi/services/project_label.go:82.98,84.16 2 0 +github.com/muety/wakapi/services/project_label.go:88.2,90.20 3 0 +github.com/muety/wakapi/services/project_label.go:84.16,86.3 1 0 +github.com/muety/wakapi/services/project_label.go:93.74,94.24 1 0 +github.com/muety/wakapi/services/project_label.go:97.2,100.12 4 0 +github.com/muety/wakapi/services/project_label.go:94.24,96.3 1 0 +github.com/muety/wakapi/services/project_label.go:103.89,105.14 2 0 +github.com/muety/wakapi/services/project_label.go:108.2,111.4 1 0 +github.com/muety/wakapi/services/project_label.go:105.14,107.3 1 0 +github.com/muety/wakapi/services/report.go:30.122,44.33 4 0 +github.com/muety/wakapi/services/report.go:50.2,50.12 1 0 +github.com/muety/wakapi/services/report.go:44.33,45.31 1 0 +github.com/muety/wakapi/services/report.go:45.31,47.4 1 0 +github.com/muety/wakapi/services/report.go:53.38,57.16 3 0 +github.com/muety/wakapi/services/report.go:61.2,62.26 2 0 +github.com/muety/wakapi/services/report.go:57.16,59.3 1 0 +github.com/muety/wakapi/services/report.go:62.26,64.3 1 0 +github.com/muety/wakapi/services/report.go:69.61,74.22 3 0 +github.com/muety/wakapi/services/report.go:81.2,81.65 1 0 +github.com/muety/wakapi/services/report.go:98.2,98.24 1 0 +github.com/muety/wakapi/services/report.go:74.22,78.3 3 0 +github.com/muety/wakapi/services/report.go:81.65,91.47 3 0 +github.com/muety/wakapi/services/report.go:91.47,93.4 1 0 +github.com/muety/wakapi/services/report.go:93.9,95.4 1 0 +github.com/muety/wakapi/services/report.go:101.80,102.22 1 0 +github.com/muety/wakapi/services/report.go:107.2,107.29 1 0 +github.com/muety/wakapi/services/report.go:112.2,116.16 4 0 +github.com/muety/wakapi/services/report.go:121.2,128.65 2 0 +github.com/muety/wakapi/services/report.go:133.2,134.12 2 0 +github.com/muety/wakapi/services/report.go:102.22,105.3 2 0 +github.com/muety/wakapi/services/report.go:107.29,110.3 2 0 +github.com/muety/wakapi/services/report.go:116.16,119.3 2 0 +github.com/muety/wakapi/services/report.go:128.65,131.3 2 0 +github.com/muety/wakapi/services/report.go:137.63,138.41 1 0 +github.com/muety/wakapi/services/report.go:145.2,145.12 1 0 +github.com/muety/wakapi/services/report.go:138.41,139.30 1 0 +github.com/muety/wakapi/services/report.go:139.30,140.16 1 0 +github.com/muety/wakapi/services/report.go:140.16,142.5 1 0 github.com/muety/wakapi/services/aggregation.go:29.142,37.2 1 0 github.com/muety/wakapi/services/aggregation.go:46.43,48.37 1 0 github.com/muety/wakapi/services/aggregation.go:52.2,54.19 3 0 @@ -877,36 +892,27 @@ github.com/muety/wakapi/services/alias.go:172.16,174.5 1 0 github.com/muety/wakapi/services/alias.go:177.8,179.3 1 0 github.com/muety/wakapi/services/diagnostics.go:14.101,19.2 1 0 github.com/muety/wakapi/services/diagnostics.go:21.101,23.2 1 0 -github.com/muety/wakapi/services/project_label.go:20.111,27.2 1 0 -github.com/muety/wakapi/services/project_label.go:29.80,31.2 1 0 -github.com/muety/wakapi/services/project_label.go:33.90,34.51 1 0 -github.com/muety/wakapi/services/project_label.go:38.2,39.16 2 0 -github.com/muety/wakapi/services/project_label.go:42.2,43.20 2 0 -github.com/muety/wakapi/services/project_label.go:34.51,36.3 1 0 -github.com/muety/wakapi/services/project_label.go:39.16,41.3 1 0 -github.com/muety/wakapi/services/project_label.go:47.108,50.16 3 0 -github.com/muety/wakapi/services/project_label.go:54.2,54.31 1 0 -github.com/muety/wakapi/services/project_label.go:61.2,61.29 1 0 -github.com/muety/wakapi/services/project_label.go:50.16,52.3 1 0 -github.com/muety/wakapi/services/project_label.go:54.31,55.50 1 0 -github.com/muety/wakapi/services/project_label.go:55.50,57.4 1 0 -github.com/muety/wakapi/services/project_label.go:57.9,59.4 1 0 -github.com/muety/wakapi/services/project_label.go:65.116,68.16 3 0 -github.com/muety/wakapi/services/project_label.go:72.2,72.31 1 0 -github.com/muety/wakapi/services/project_label.go:79.2,79.29 1 0 -github.com/muety/wakapi/services/project_label.go:68.16,70.3 1 0 -github.com/muety/wakapi/services/project_label.go:72.31,73.45 1 0 -github.com/muety/wakapi/services/project_label.go:73.45,75.4 1 0 -github.com/muety/wakapi/services/project_label.go:75.9,77.4 1 0 -github.com/muety/wakapi/services/project_label.go:82.98,84.16 2 0 -github.com/muety/wakapi/services/project_label.go:88.2,90.20 3 0 -github.com/muety/wakapi/services/project_label.go:84.16,86.3 1 0 -github.com/muety/wakapi/services/project_label.go:93.74,94.24 1 0 -github.com/muety/wakapi/services/project_label.go:97.2,100.12 4 0 -github.com/muety/wakapi/services/project_label.go:94.24,96.3 1 0 -github.com/muety/wakapi/services/project_label.go:103.89,105.14 2 0 -github.com/muety/wakapi/services/project_label.go:108.2,111.4 1 0 -github.com/muety/wakapi/services/project_label.go:105.14,107.3 1 0 +github.com/muety/wakapi/services/misc.go:21.126,28.2 1 0 +github.com/muety/wakapi/services/misc.go:40.50,42.48 1 0 +github.com/muety/wakapi/services/misc.go:46.2,48.19 3 0 +github.com/muety/wakapi/services/misc.go:42.48,44.3 1 0 +github.com/muety/wakapi/services/misc.go:51.51,53.16 2 0 +github.com/muety/wakapi/services/misc.go:57.2,60.26 3 0 +github.com/muety/wakapi/services/misc.go:66.2,68.40 2 0 +github.com/muety/wakapi/services/misc.go:73.2,75.33 3 0 +github.com/muety/wakapi/services/misc.go:79.2,84.17 2 0 +github.com/muety/wakapi/services/misc.go:88.2,91.17 1 0 +github.com/muety/wakapi/services/misc.go:95.2,95.12 1 0 +github.com/muety/wakapi/services/misc.go:53.16,55.3 1 0 +github.com/muety/wakapi/services/misc.go:60.26,65.3 1 0 +github.com/muety/wakapi/services/misc.go:68.40,70.3 1 0 +github.com/muety/wakapi/services/misc.go:75.33,78.3 2 0 +github.com/muety/wakapi/services/misc.go:84.17,86.3 1 0 +github.com/muety/wakapi/services/misc.go:91.17,93.3 1 0 +github.com/muety/wakapi/services/misc.go:98.116,99.24 1 0 +github.com/muety/wakapi/services/misc.go:99.24,100.156 1 0 +github.com/muety/wakapi/services/misc.go:100.156,102.4 1 0 +github.com/muety/wakapi/services/misc.go:102.9,107.4 1 0 github.com/muety/wakapi/services/summary.go:29.189,41.33 3 1 github.com/muety/wakapi/services/summary.go:52.2,52.12 1 1 github.com/muety/wakapi/services/summary.go:41.33,42.31 1 1 @@ -1034,35 +1040,57 @@ github.com/muety/wakapi/services/summary.go:462.3,462.24 1 1 github.com/muety/wakapi/services/summary.go:453.17,454.33 1 1 github.com/muety/wakapi/services/summary.go:454.33,456.5 1 1 github.com/muety/wakapi/services/summary.go:459.28,461.4 1 1 -github.com/muety/wakapi/services/report.go:30.122,44.33 4 0 -github.com/muety/wakapi/services/report.go:50.2,50.12 1 0 -github.com/muety/wakapi/services/report.go:44.33,45.31 1 0 -github.com/muety/wakapi/services/report.go:45.31,47.4 1 0 -github.com/muety/wakapi/services/report.go:53.38,57.16 3 0 -github.com/muety/wakapi/services/report.go:61.2,62.26 2 0 -github.com/muety/wakapi/services/report.go:57.16,59.3 1 0 -github.com/muety/wakapi/services/report.go:62.26,64.3 1 0 -github.com/muety/wakapi/services/report.go:69.61,74.22 3 0 -github.com/muety/wakapi/services/report.go:81.2,81.65 1 0 -github.com/muety/wakapi/services/report.go:98.2,98.24 1 0 -github.com/muety/wakapi/services/report.go:74.22,78.3 3 0 -github.com/muety/wakapi/services/report.go:81.65,91.47 3 0 -github.com/muety/wakapi/services/report.go:91.47,93.4 1 0 -github.com/muety/wakapi/services/report.go:93.9,95.4 1 0 -github.com/muety/wakapi/services/report.go:101.80,102.22 1 0 -github.com/muety/wakapi/services/report.go:107.2,107.29 1 0 -github.com/muety/wakapi/services/report.go:112.2,116.16 4 0 -github.com/muety/wakapi/services/report.go:121.2,128.65 2 0 -github.com/muety/wakapi/services/report.go:133.2,134.12 2 0 -github.com/muety/wakapi/services/report.go:102.22,105.3 2 0 -github.com/muety/wakapi/services/report.go:107.29,110.3 2 0 -github.com/muety/wakapi/services/report.go:116.16,119.3 2 0 -github.com/muety/wakapi/services/report.go:128.65,131.3 2 0 -github.com/muety/wakapi/services/report.go:137.63,138.41 1 0 -github.com/muety/wakapi/services/report.go:145.2,145.12 1 0 -github.com/muety/wakapi/services/report.go:138.41,139.30 1 0 -github.com/muety/wakapi/services/report.go:139.30,140.16 1 0 -github.com/muety/wakapi/services/report.go:140.16,142.5 1 0 +github.com/muety/wakapi/services/user.go:24.99,34.33 3 0 +github.com/muety/wakapi/services/user.go:55.2,55.12 1 0 +github.com/muety/wakapi/services/user.go:34.33,35.31 1 0 +github.com/muety/wakapi/services/user.go:35.31,41.73 4 0 +github.com/muety/wakapi/services/user.go:45.4,45.24 1 0 +github.com/muety/wakapi/services/user.go:41.73,43.5 1 0 +github.com/muety/wakapi/services/user.go:45.24,46.80 1 0 +github.com/muety/wakapi/services/user.go:46.80,48.6 1 0 +github.com/muety/wakapi/services/user.go:48.11,50.6 1 0 +github.com/muety/wakapi/services/user.go:58.74,59.40 1 0 +github.com/muety/wakapi/services/user.go:63.2,64.16 2 0 +github.com/muety/wakapi/services/user.go:68.2,69.15 2 0 +github.com/muety/wakapi/services/user.go:59.40,61.3 1 0 +github.com/muety/wakapi/services/user.go:64.16,66.3 1 0 +github.com/muety/wakapi/services/user.go:72.72,73.37 1 0 +github.com/muety/wakapi/services/user.go:77.2,78.16 2 0 +github.com/muety/wakapi/services/user.go:82.2,83.15 2 0 +github.com/muety/wakapi/services/user.go:73.37,75.3 1 0 +github.com/muety/wakapi/services/user.go:78.16,80.3 1 0 +github.com/muety/wakapi/services/user.go:86.76,88.2 1 0 +github.com/muety/wakapi/services/user.go:90.86,92.2 1 0 +github.com/muety/wakapi/services/user.go:94.58,96.2 1 0 +github.com/muety/wakapi/services/user.go:98.86,100.2 1 0 +github.com/muety/wakapi/services/user.go:102.71,104.12 2 0 +github.com/muety/wakapi/services/user.go:108.2,109.42 2 0 +github.com/muety/wakapi/services/user.go:113.2,114.16 2 0 +github.com/muety/wakapi/services/user.go:118.2,119.21 2 0 +github.com/muety/wakapi/services/user.go:104.12,106.3 1 0 +github.com/muety/wakapi/services/user.go:109.42,111.3 1 0 +github.com/muety/wakapi/services/user.go:114.16,116.3 1 0 +github.com/muety/wakapi/services/user.go:122.48,124.2 1 0 +github.com/muety/wakapi/services/user.go:126.102,136.93 2 0 +github.com/muety/wakapi/services/user.go:142.2,142.38 1 0 +github.com/muety/wakapi/services/user.go:136.93,138.3 1 0 +github.com/muety/wakapi/services/user.go:138.8,140.3 1 0 +github.com/muety/wakapi/services/user.go:145.73,149.2 3 0 +github.com/muety/wakapi/services/user.go:151.78,155.2 3 0 +github.com/muety/wakapi/services/user.go:157.122,160.35 2 0 +github.com/muety/wakapi/services/user.go:166.2,166.35 1 0 +github.com/muety/wakapi/services/user.go:170.2,170.18 1 0 +github.com/muety/wakapi/services/user.go:160.35,161.89 1 0 +github.com/muety/wakapi/services/user.go:161.89,163.4 1 0 +github.com/muety/wakapi/services/user.go:166.35,168.3 1 0 +github.com/muety/wakapi/services/user.go:173.106,176.96 3 0 +github.com/muety/wakapi/services/user.go:181.2,181.68 1 0 +github.com/muety/wakapi/services/user.go:176.96,178.3 1 0 +github.com/muety/wakapi/services/user.go:178.8,180.3 1 0 +github.com/muety/wakapi/services/user.go:184.85,186.2 1 0 +github.com/muety/wakapi/services/user.go:188.57,195.2 4 0 +github.com/muety/wakapi/services/user.go:197.38,199.2 1 0 +github.com/muety/wakapi/services/user.go:201.57,206.2 1 0 github.com/muety/wakapi/services/duration.go:16.78,22.2 2 1 github.com/muety/wakapi/services/duration.go:24.123,26.16 2 1 github.com/muety/wakapi/services/duration.go:31.2,36.31 4 1 @@ -1087,74 +1115,67 @@ github.com/muety/wakapi/services/duration.go:73.31,74.26 1 1 github.com/muety/wakapi/services/duration.go:74.26,75.23 1 1 github.com/muety/wakapi/services/duration.go:78.4,78.36 1 1 github.com/muety/wakapi/services/duration.go:75.23,77.5 1 1 -github.com/muety/wakapi/services/heartbeat.go:26.141,40.33 3 0 -github.com/muety/wakapi/services/heartbeat.go:48.2,48.12 1 0 -github.com/muety/wakapi/services/heartbeat.go:40.33,41.31 1 0 -github.com/muety/wakapi/services/heartbeat.go:41.31,45.4 3 0 -github.com/muety/wakapi/services/heartbeat.go:51.72,54.2 2 0 -github.com/muety/wakapi/services/heartbeat.go:56.80,61.32 3 0 -github.com/muety/wakapi/services/heartbeat.go:69.2,70.16 2 0 -github.com/muety/wakapi/services/heartbeat.go:73.2,73.12 1 0 -github.com/muety/wakapi/services/heartbeat.go:61.32,62.36 1 0 -github.com/muety/wakapi/services/heartbeat.go:66.3,66.46 1 0 -github.com/muety/wakapi/services/heartbeat.go:62.36,65.4 2 0 -github.com/muety/wakapi/services/heartbeat.go:70.16,72.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:76.53,78.8 2 0 -github.com/muety/wakapi/services/heartbeat.go:81.2,82.16 2 0 -github.com/muety/wakapi/services/heartbeat.go:85.2,85.19 1 0 -github.com/muety/wakapi/services/heartbeat.go:78.8,80.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:82.16,84.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:88.76,91.8 3 0 -github.com/muety/wakapi/services/heartbeat.go:94.2,95.16 2 0 -github.com/muety/wakapi/services/heartbeat.go:98.2,98.19 1 0 -github.com/muety/wakapi/services/heartbeat.go:91.8,93.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:95.16,97.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:101.96,105.26 3 0 -github.com/muety/wakapi/services/heartbeat.go:115.2,116.16 2 0 -github.com/muety/wakapi/services/heartbeat.go:120.2,120.28 1 0 -github.com/muety/wakapi/services/heartbeat.go:126.2,126.24 1 0 -github.com/muety/wakapi/services/heartbeat.go:105.26,108.9 3 0 -github.com/muety/wakapi/services/heartbeat.go:108.9,110.4 1 0 -github.com/muety/wakapi/services/heartbeat.go:110.9,112.4 1 0 -github.com/muety/wakapi/services/heartbeat.go:116.16,118.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:120.28,124.3 3 0 -github.com/muety/wakapi/services/heartbeat.go:129.111,131.16 2 0 -github.com/muety/wakapi/services/heartbeat.go:134.2,134.43 1 0 -github.com/muety/wakapi/services/heartbeat.go:131.16,133.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:137.92,139.2 1 0 -github.com/muety/wakapi/services/heartbeat.go:141.116,143.2 1 0 -github.com/muety/wakapi/services/heartbeat.go:145.78,147.2 1 0 -github.com/muety/wakapi/services/heartbeat.go:149.104,151.54 2 0 -github.com/muety/wakapi/services/heartbeat.go:157.2,158.16 2 0 -github.com/muety/wakapi/services/heartbeat.go:162.2,163.28 2 0 -github.com/muety/wakapi/services/heartbeat.go:169.2,170.22 2 0 -github.com/muety/wakapi/services/heartbeat.go:151.54,155.3 3 0 -github.com/muety/wakapi/services/heartbeat.go:158.16,160.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:163.28,164.33 1 0 -github.com/muety/wakapi/services/heartbeat.go:164.33,166.4 1 0 -github.com/muety/wakapi/services/heartbeat.go:173.62,175.2 1 0 -github.com/muety/wakapi/services/heartbeat.go:177.116,179.16 2 0 -github.com/muety/wakapi/services/heartbeat.go:183.2,183.28 1 0 -github.com/muety/wakapi/services/heartbeat.go:187.2,187.24 1 0 -github.com/muety/wakapi/services/heartbeat.go:179.16,181.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:183.28,185.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:190.96,192.2 1 0 -github.com/muety/wakapi/services/heartbeat.go:194.107,196.55 2 0 -github.com/muety/wakapi/services/heartbeat.go:196.55,202.41 4 0 -github.com/muety/wakapi/services/heartbeat.go:202.41,207.4 2 0 -github.com/muety/wakapi/services/heartbeat.go:211.85,218.2 6 0 -github.com/muety/wakapi/services/heartbeat.go:220.74,221.32 1 0 -github.com/muety/wakapi/services/heartbeat.go:221.32,226.3 1 0 -github.com/muety/wakapi/services/heartbeat.go:229.72,231.2 1 0 -github.com/muety/wakapi/services/heartbeat.go:233.58,235.2 1 0 -github.com/muety/wakapi/services/heartbeat.go:237.60,239.2 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.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/heartbeat.go:27.141,41.33 3 0 +github.com/muety/wakapi/services/heartbeat.go:49.2,49.12 1 0 +github.com/muety/wakapi/services/heartbeat.go:41.33,42.31 1 0 +github.com/muety/wakapi/services/heartbeat.go:42.31,46.4 3 0 +github.com/muety/wakapi/services/heartbeat.go:52.72,55.2 2 0 +github.com/muety/wakapi/services/heartbeat.go:57.80,62.32 3 0 +github.com/muety/wakapi/services/heartbeat.go:70.2,71.16 2 0 +github.com/muety/wakapi/services/heartbeat.go:74.2,74.12 1 0 +github.com/muety/wakapi/services/heartbeat.go:62.32,63.36 1 0 +github.com/muety/wakapi/services/heartbeat.go:67.3,67.46 1 0 +github.com/muety/wakapi/services/heartbeat.go:63.36,66.4 2 0 +github.com/muety/wakapi/services/heartbeat.go:71.16,73.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:77.53,79.8 2 0 +github.com/muety/wakapi/services/heartbeat.go:82.2,83.16 2 0 +github.com/muety/wakapi/services/heartbeat.go:86.2,86.19 1 0 +github.com/muety/wakapi/services/heartbeat.go:79.8,81.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:83.16,85.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:89.76,92.8 3 0 +github.com/muety/wakapi/services/heartbeat.go:95.2,96.16 2 0 +github.com/muety/wakapi/services/heartbeat.go:99.2,99.19 1 0 +github.com/muety/wakapi/services/heartbeat.go:92.8,94.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:96.16,98.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:102.96,106.26 3 0 +github.com/muety/wakapi/services/heartbeat.go:116.2,117.16 2 0 +github.com/muety/wakapi/services/heartbeat.go:121.2,121.28 1 0 +github.com/muety/wakapi/services/heartbeat.go:127.2,127.24 1 0 +github.com/muety/wakapi/services/heartbeat.go:106.26,109.9 3 0 +github.com/muety/wakapi/services/heartbeat.go:109.9,111.4 1 0 +github.com/muety/wakapi/services/heartbeat.go:111.9,113.4 1 0 +github.com/muety/wakapi/services/heartbeat.go:117.16,119.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:121.28,125.3 3 0 +github.com/muety/wakapi/services/heartbeat.go:130.111,132.16 2 0 +github.com/muety/wakapi/services/heartbeat.go:135.2,135.43 1 0 +github.com/muety/wakapi/services/heartbeat.go:132.16,134.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:138.92,140.2 1 0 +github.com/muety/wakapi/services/heartbeat.go:142.116,144.2 1 0 +github.com/muety/wakapi/services/heartbeat.go:146.78,148.2 1 0 +github.com/muety/wakapi/services/heartbeat.go:150.104,152.54 2 0 +github.com/muety/wakapi/services/heartbeat.go:158.2,159.16 2 0 +github.com/muety/wakapi/services/heartbeat.go:163.2,164.28 2 0 +github.com/muety/wakapi/services/heartbeat.go:170.2,171.22 2 0 +github.com/muety/wakapi/services/heartbeat.go:152.54,156.3 3 0 +github.com/muety/wakapi/services/heartbeat.go:159.16,161.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:164.28,165.33 1 0 +github.com/muety/wakapi/services/heartbeat.go:165.33,167.4 1 0 +github.com/muety/wakapi/services/heartbeat.go:174.62,176.2 1 0 +github.com/muety/wakapi/services/heartbeat.go:178.116,180.16 2 0 +github.com/muety/wakapi/services/heartbeat.go:184.2,184.28 1 0 +github.com/muety/wakapi/services/heartbeat.go:188.2,188.24 1 0 +github.com/muety/wakapi/services/heartbeat.go:180.16,182.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:184.28,186.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:191.96,193.2 1 0 +github.com/muety/wakapi/services/heartbeat.go:195.107,197.55 2 0 +github.com/muety/wakapi/services/heartbeat.go:197.55,203.41 4 0 +github.com/muety/wakapi/services/heartbeat.go:203.41,208.4 2 0 +github.com/muety/wakapi/services/heartbeat.go:212.85,219.2 6 0 +github.com/muety/wakapi/services/heartbeat.go:221.74,222.32 1 0 +github.com/muety/wakapi/services/heartbeat.go:222.32,227.3 1 0 +github.com/muety/wakapi/services/heartbeat.go:230.72,232.2 1 0 +github.com/muety/wakapi/services/heartbeat.go:234.58,236.2 1 0 +github.com/muety/wakapi/services/heartbeat.go:238.60,240.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 @@ -1174,24 +1195,3 @@ 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:21.126,28.2 1 0 -github.com/muety/wakapi/services/misc.go:40.50,42.48 1 0 -github.com/muety/wakapi/services/misc.go:46.2,48.19 3 0 -github.com/muety/wakapi/services/misc.go:42.48,44.3 1 0 -github.com/muety/wakapi/services/misc.go:51.51,53.16 2 0 -github.com/muety/wakapi/services/misc.go:57.2,60.26 3 0 -github.com/muety/wakapi/services/misc.go:66.2,68.40 2 0 -github.com/muety/wakapi/services/misc.go:73.2,75.33 3 0 -github.com/muety/wakapi/services/misc.go:79.2,84.17 2 0 -github.com/muety/wakapi/services/misc.go:88.2,91.17 1 0 -github.com/muety/wakapi/services/misc.go:95.2,95.12 1 0 -github.com/muety/wakapi/services/misc.go:53.16,55.3 1 0 -github.com/muety/wakapi/services/misc.go:60.26,65.3 1 0 -github.com/muety/wakapi/services/misc.go:68.40,70.3 1 0 -github.com/muety/wakapi/services/misc.go:75.33,78.3 2 0 -github.com/muety/wakapi/services/misc.go:84.17,86.3 1 0 -github.com/muety/wakapi/services/misc.go:91.17,93.3 1 0 -github.com/muety/wakapi/services/misc.go:98.116,99.24 1 0 -github.com/muety/wakapi/services/misc.go:99.24,100.156 1 0 -github.com/muety/wakapi/services/misc.go:100.156,102.4 1 0 -github.com/muety/wakapi/services/misc.go:102.9,107.4 1 0 diff --git a/models/compat/wakatime/v1/heartbeat.go b/models/compat/wakatime/v1/heartbeat.go index 09304dd..39d25d1 100644 --- a/models/compat/wakatime/v1/heartbeat.go +++ b/models/compat/wakatime/v1/heartbeat.go @@ -2,6 +2,7 @@ package v1 import ( "strconv" + "time" "github.com/muety/wakapi/models" ) @@ -14,27 +15,26 @@ type HeartbeatsViewModel struct { // 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 float64 `json:"time"` - Type string `json:"type"` - UserId string `json:"user_id"` - MachineNameId string `json:"machine_name_id"` - UserAgentId string `json:"user_agent_id"` - CreatedAt models.CustomTime `json:"created_at"` - ModifiedAt models.CustomTime `json:"created_at",omitempty` + 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 float64 `json:"time"` + Type string `json:"type"` + UserId string `json:"user_id"` + MachineNameId string `json:"machine_name_id"` + UserAgentId string `json:"user_agent_id"` + CreatedAt time.Time `json:"created_at"` } -func ToHeartbeatEntry(entries []*models.Heartbeat) []HeartbeatEntry { - out := make([]HeartbeatEntry, len(entries)) +func HeartbeatsToCompat(entries []*models.Heartbeat) []*HeartbeatEntry { + out := make([]*HeartbeatEntry, len(entries)) for i := 0; i < len(entries); i++ { entry := entries[i] - out[i] = HeartbeatEntry{ + out[i] = &HeartbeatEntry{ Id: strconv.FormatUint(entry.ID, 10), Branch: entry.Branch, Category: entry.Category, @@ -47,7 +47,7 @@ func ToHeartbeatEntry(entries []*models.Heartbeat) []HeartbeatEntry { UserId: entry.UserID, MachineNameId: entry.Machine, UserAgentId: entry.UserAgent, - CreatedAt: entry.CreatedAt, + CreatedAt: entry.CreatedAt.T(), } } return out diff --git a/routes/compat/wakatime/v1/heartbeat.go b/routes/compat/wakatime/v1/heartbeat.go index 9e31aa0..eb1dd62 100644 --- a/routes/compat/wakatime/v1/heartbeat.go +++ b/routes/compat/wakatime/v1/heartbeat.go @@ -14,10 +14,10 @@ import ( ) type HeartbeatsResult struct { - Data []wakatime.HeartbeatEntry `json:"data"` - End string `json:"end"` - Start string `json:"start"` - Timezone string `json:"timezone"` + Data []*wakatime.HeartbeatEntry `json:"data"` + End string `json:"end"` + Start string `json:"start"` + Timezone string `json:"timezone"` } type HeartbeatHandler struct { @@ -46,7 +46,7 @@ func (h *HeartbeatHandler) RegisterRoutes(router *mux.Router) { // @Param date query string true "Date" // @Param user path string true "Username (or current)" // @Security ApiKeyAuth -// @Success 200 {object} v1.HeartbeatEntry +// @Success 200 {object} HeartbeatsResult // @Failure 400 {string} string "bad date" // @Router /compat/wakatime/v1/users/{user}/heartbeats [get] func (h *HeartbeatHandler) Get(w http.ResponseWriter, r *http.Request) { @@ -76,7 +76,7 @@ func (h *HeartbeatHandler) Get(w http.ResponseWriter, r *http.Request) { } res := HeartbeatsResult{ - Data: wakatime.ToHeartbeatEntry(heartbeats), + Data: wakatime.HeartbeatsToCompat(heartbeats), Start: rangeFrom.UTC().Format(time.RFC3339), End: rangeTo.UTC().Format(time.RFC3339), Timezone: timezone.String(), diff --git a/services/imports/wakatime.go b/services/imports/wakatime.go index 0a0fcd5..8b979eb 100644 --- a/services/imports/wakatime.go +++ b/services/imports/wakatime.go @@ -288,6 +288,7 @@ func mapHeartbeat( Time: models.CustomTime(time.Unix(0, int64(entry.Time*1e9))), Origin: OriginWakatime, OriginId: entry.Id, + CreatedAt: models.CustomTime(entry.CreatedAt), }).Hashed() } diff --git a/static/docs/docs.go b/static/docs/docs.go index 7b43356..b8cd1e2 100644 --- a/static/docs/docs.go +++ b/static/docs/docs.go @@ -1,13 +1,14 @@ -// Package docs GENERATED BY THE COMMAND ABOVE; DO NOT EDIT +// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT // This file was generated by swaggo/swag + package docs import ( "bytes" "encoding/json" "strings" - "text/template" + "github.com/alecthomas/template" "github.com/swaggo/swag" ) @@ -15,7 +16,7 @@ var doc = `{ "schemes": {{ marshal .Schemes }}, "swagger": "2.0", "info": { - "description": "{{escape .Description}}", + "description": "{{.Description}}", "title": "{{.Title}}", "contact": { "name": "Ferdinand Mütsch", @@ -191,7 +192,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/v1.HeartbeatEntry" + "$ref": "#/definitions/v1.HeartbeatsResult" } }, "400": { @@ -1340,6 +1341,9 @@ var doc = `{ "machine_name_id": { "type": "string" }, + "modified_at": { + "type": "string" + }, "project": { "type": "string" }, @@ -1357,6 +1361,26 @@ var doc = `{ } } }, + "v1.HeartbeatsResult": { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/v1.HeartbeatEntry" + } + }, + "end": { + "type": "string" + }, + "start": { + "type": "string" + }, + "timezone": { + "type": "string" + } + } + }, "v1.Project": { "type": "object", "properties": { @@ -1703,13 +1727,6 @@ func (s *s) ReadDoc() string { a, _ := json.Marshal(v) return string(a) }, - "escape": func(v interface{}) string { - // escape tabs - str := strings.Replace(v.(string), "\t", "\\t", -1) - // replace " with \", and if that results in \\", replace that with \\\" - str = strings.Replace(str, "\"", "\\\"", -1) - return strings.Replace(str, "\\\\\"", "\\\\\\\"", -1) - }, }).Parse(doc) if err != nil { return doc @@ -1724,5 +1741,5 @@ func (s *s) ReadDoc() string { } func init() { - swag.Register("swagger", &s{}) + swag.Register(swag.Name, &s{}) } diff --git a/static/docs/swagger.json b/static/docs/swagger.json index 0f7c4ea..ef6672b 100644 --- a/static/docs/swagger.json +++ b/static/docs/swagger.json @@ -176,7 +176,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/v1.HeartbeatEntry" + "$ref": "#/definitions/v1.HeartbeatsResult" } }, "400": { @@ -1325,6 +1325,9 @@ "machine_name_id": { "type": "string" }, + "modified_at": { + "type": "string" + }, "project": { "type": "string" }, @@ -1342,6 +1345,26 @@ } } }, + "v1.HeartbeatsResult": { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/v1.HeartbeatEntry" + } + }, + "end": { + "type": "string" + }, + "start": { + "type": "string" + }, + "timezone": { + "type": "string" + } + } + }, "v1.Project": { "type": "object", "properties": { diff --git a/static/docs/swagger.yaml b/static/docs/swagger.yaml index dce41a6..3202016 100644 --- a/static/docs/swagger.yaml +++ b/static/docs/swagger.yaml @@ -166,6 +166,8 @@ definitions: type: string machine_name_id: type: string + modified_at: + type: string project: type: string time: @@ -177,6 +179,19 @@ definitions: user_id: type: string type: object + v1.HeartbeatsResult: + properties: + data: + items: + $ref: '#/definitions/v1.HeartbeatEntry' + type: array + end: + type: string + start: + type: string + timezone: + type: string + type: object v1.Project: properties: id: @@ -501,7 +516,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/v1.HeartbeatEntry' + $ref: '#/definitions/v1.HeartbeatsResult' "400": description: bad date schema: diff --git a/version.txt b/version.txt index 50aea0e..e3a4f19 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.1.0 \ No newline at end of file +2.2.0 \ No newline at end of file