| {{ periodStats.nameDesc }} |
{
- console.debug("got login url" + response.data.data.link)
self.loginUrl = response.data.data.link
self.showLoginButton = true
});
diff --git a/src/frontend/src/main.ts b/src/frontend/src/main.ts
index 4f8f400..92fc184 100644
--- a/src/frontend/src/main.ts
+++ b/src/frontend/src/main.ts
@@ -4,6 +4,7 @@ import VueAxios from 'vue-axios'
import axios from 'axios'
import router from "@/router";
import {createPinia} from "pinia";
+import VueApexCharts from "vue3-apexcharts";
import {BootstrapVue3, BToastPlugin} from "bootstrap-vue-3";
import 'bootstrap/dist/css/bootstrap.css'
@@ -26,6 +27,7 @@ app
.use(router)
.use(BootstrapVue3)
.use(BToastPlugin)
+ .use(VueApexCharts)
.component("font-awesome-icon", FontAwesomeIcon)
.mount('#app')
diff --git a/src/frontend/src/models/stats-models.ts b/src/frontend/src/models/stats-models.ts
index 374e2da..5ceceb2 100644
--- a/src/frontend/src/models/stats-models.ts
+++ b/src/frontend/src/models/stats-models.ts
@@ -45,4 +45,19 @@ export type PeriodItemsStats = {
export type TimePeriod = {
begin: string //ISO standard
end: string //ISO standard
-}
\ No newline at end of file
+}
+
+export enum HeatmapType {
+ ARCHIVED = "ARCHIVED",
+ TODO = "TODO"
+}
+
+export interface IActivityHeatmapItem {
+ hour: number
+ weekday: number
+ count: number
+}
+
+export interface IActivityHeatmapStats {
+ items: IActivityHeatmapItem[],
+}
diff --git a/src/frontend/src/services/stats-service.ts b/src/frontend/src/services/stats-service.ts
index 4576dbc..2a25f0d 100644
--- a/src/frontend/src/services/stats-service.ts
+++ b/src/frontend/src/services/stats-service.ts
@@ -2,7 +2,14 @@ import {ConfigsService} from "@/services/configs-service";
import axios from "axios";
import {format} from "date-fns";
import {TimePeriod} from "@/models/time-models";
-import {DayStatsType, ILangStats, ItemsStatsAggregated, ITopTags,} from "@/models/stats-models";
+import {
+ DayStatsType,
+ HeatmapType,
+ IActivityHeatmapStats,
+ ILangStats,
+ ItemsStatsAggregated,
+ ITopTags,
+} from "@/models/stats-models";
export class StatsService {
configsService = new ConfigsService();
@@ -41,4 +48,12 @@ export class StatsService {
return response.data.data as ItemsStatsAggregated
});
}
+
+ getHeatmapOfArchived(type: HeatmapType) {
+ return axios
+ .get(`${this.configsService.backendUrl()}/stats/heatmap?type=` + type)
+ .then((response) => {
+ return response.data.data as IActivityHeatmapStats
+ });
+ }
}
\ No newline at end of file
diff --git a/src/frontend/src/views/HomeView.vue b/src/frontend/src/views/HomeView.vue
index d1f68b9..69656f6 100644
--- a/src/frontend/src/views/HomeView.vue
+++ b/src/frontend/src/views/HomeView.vue
@@ -21,9 +21,20 @@
-
+
+
+
@@ -34,14 +45,22 @@ import TopTools from "@/components/SyncPanel.vue";
import TopTags from "@/components/TopTags.vue";
import LangStats from "@/components/LangStats.vue";
import StatsPerPeriod from "@/components/StatsPerPeriod.vue";
+import HeatmapArchivedChart from "@/components/HeatmapArchivedChart.vue";
+import {HeatmapType} from "@/models/stats-models";
@Options({
+ computed: {
+ HeatmapType() {
+ return HeatmapType
+ }
+ },
components: {
LangStats,
TopTags,
DailyStatsChart,
TopTools,
- StatsPerPeriod
+ StatsPerPeriod,
+ HeatmapArchivedChart
},
})
export default class HomeView extends Vue {
diff --git a/src/main/java/eu/cybershu/pocketstats/pocket/api/ActivityHeatmapItem.java b/src/main/java/eu/cybershu/pocketstats/pocket/api/ActivityHeatmapItem.java
new file mode 100644
index 0000000..3fd5030
--- /dev/null
+++ b/src/main/java/eu/cybershu/pocketstats/pocket/api/ActivityHeatmapItem.java
@@ -0,0 +1,11 @@
+package eu.cybershu.pocketstats.pocket.api;
+
+import javax.validation.constraints.NotNull;
+
+public record ActivityHeatmapItem(
+ /* 0-23 */
+ int hour,
+ /* 1-monday, 7- sunday */
+ int weekday,
+ @NotNull long count) {
+}
diff --git a/src/main/java/eu/cybershu/pocketstats/pocket/api/ActivityHeatmapStats.java b/src/main/java/eu/cybershu/pocketstats/pocket/api/ActivityHeatmapStats.java
new file mode 100644
index 0000000..c6584de
--- /dev/null
+++ b/src/main/java/eu/cybershu/pocketstats/pocket/api/ActivityHeatmapStats.java
@@ -0,0 +1,8 @@
+package eu.cybershu.pocketstats.pocket.api;
+
+import java.util.List;
+
+public record ActivityHeatmapStats(
+ List items
+) {
+}
diff --git a/src/main/java/eu/cybershu/pocketstats/pocket/api/PocketItemStatsService.java b/src/main/java/eu/cybershu/pocketstats/pocket/api/PocketItemStatsService.java
index 5f4b1c7..007df3a 100644
--- a/src/main/java/eu/cybershu/pocketstats/pocket/api/PocketItemStatsService.java
+++ b/src/main/java/eu/cybershu/pocketstats/pocket/api/PocketItemStatsService.java
@@ -5,7 +5,7 @@
import eu.cybershu.pocketstats.events.UserSynchronizedItemsEvent;
import eu.cybershu.pocketstats.stats.DayStat;
import eu.cybershu.pocketstats.stats.DayStatsRecords;
-import eu.cybershu.pocketstats.stats.DayStatsType;
+import eu.cybershu.pocketstats.stats.StatsWithStatusType;
import eu.cybershu.pocketstats.stats.TopTag;
import eu.cybershu.pocketstats.utils.TimePeriod;
import eu.cybershu.pocketstats.utils.TimeUtils;
@@ -44,7 +44,7 @@ public PocketItemStatsService(
}
@Cacheable("stats-day-records")
- public DayStatsRecords getDayStatsRecords(LocalDate start, LocalDate end, DayStatsType type) {
+ public DayStatsRecords getDayStatsRecords(LocalDate start, LocalDate end, StatsWithStatusType type) {
log.info("Calculating {} items status by day from {} to {}", type, start, end);
final Date gteDate = Date.from(start.atStartOfDay()
@@ -85,7 +85,7 @@ public DayStatsRecords getDayStatsRecords(LocalDate start, LocalDate end, DaySta
return new DayStatsRecords(days, type);
}
- private String getTimeFieldForAggregation(DayStatsType type) {
+ private String getTimeFieldForAggregation(StatsWithStatusType type) {
return switch (type) {
case ARCHIVED -> "timeRead";
case TODO -> "timeAdded";
@@ -289,8 +289,88 @@ public Map getLangStats() {
return langStats;
}
+ /**
+ * Returns aggregated items with status (read or added) by hours and weekday. its for creating heatmap of activity
+ *
+ * @param type Item status
+ */
+ @Cacheable(value = "heatmap-by-status", key = "#type")
+ public ActivityHeatmapStats heatmapOfStatus(StatsWithStatusType type) {
+ if (type == StatsWithStatusType.DELETED) {
+ throw new IllegalArgumentException("DELETED heatmap activity is not supported.");
+ }
+
+ ItemStatus itemStatus = type.toItemStatus();
+ log.info("Calculating activity heatmap for status {}...", itemStatus);
+
+ String dateFieldForAggregation = "$" + getTimeFieldForAggregation(type);
+ log.debug("Using field {}", dateFieldForAggregation);
+
+ var collection = getPocketItemsCollection();
+
+ Document match;
+ if (itemStatus == ItemStatus.TO_READ) {
+ match = new Document("$match",
+ new Document("status",
+ new Document("$exists", true)
+ .append("$ne", ItemStatus.DELETED)));
+ } else {
+ match = new Document("$match",
+ new Document("status", itemStatus.name()));
+ }
+
+ AggregateIterable resultsIter = collection.aggregate(
+ Arrays.asList(match,
+ new Document("$project",
+ new Document("timeRead", dateFieldForAggregation)
+ .append("hour",
+ new Document("$hour", dateFieldForAggregation))
+ .append("weekday",
+ new Document("$let",
+ new Document("vars",
+ new Document("weekday",
+ new Document("$subtract",
+ Arrays.asList(new Document("$dayOfWeek", dateFieldForAggregation), 1L))))
+ .append("in",
+ new Document("$cond",
+ Arrays.asList(new Document("$eq",
+ Arrays.asList("$$weekday", 0L)), 7L, "$$weekday")))))),
+ new Document("$group",
+ new Document("_id",
+ new Document("hour", "$hour")
+ .append("weekday", "$weekday"))
+ .append("count",
+ new Document("$sum", 1L))),
+ new Document("$sort",
+ new Document("count", -1L))));
+
+ /*
+ {
+ "_id": {
+ "hour": 18,
+ "weekday": 1
+ },
+ "count": 289
+ }
+ */
+ List items = new LinkedList<>();
+ for (Document docs : resultsIter) {
+ Document hourAndWeekday = (Document) docs.get("_id");
+ long count = docs.getLong("count");
+
+ int weekday = Math.toIntExact(hourAndWeekday.getLong("weekday")); //1-monday, 7- sunday
+ int hour = hourAndWeekday.getInteger("hour"); //0-23
+
+ items.add(new ActivityHeatmapItem(
+ hour,
+ weekday, count));
+ }
+
+ return new ActivityHeatmapStats(items);
+ }
+
@EventListener
- @CacheEvict(value = {"stats-day-records", "stats-top-tags", "stats-lang-stats", "stats-periods-aggregated"}, allEntries = true)
+ @CacheEvict(value = {"stats-day-records", "stats-top-tags", "stats-lang-stats", "stats-periods-aggregated", "heatmap-by-status"}, allEntries = true)
public void handleUserRemovedEvent(UserSynchronizedItemsEvent event) {
log.info("User synchronized items with GetPocket: {}", event.getSyncStatus());
}
diff --git a/src/main/java/eu/cybershu/pocketstats/stats/DayStatsRecords.java b/src/main/java/eu/cybershu/pocketstats/stats/DayStatsRecords.java
index c53af1e..addef30 100644
--- a/src/main/java/eu/cybershu/pocketstats/stats/DayStatsRecords.java
+++ b/src/main/java/eu/cybershu/pocketstats/stats/DayStatsRecords.java
@@ -3,6 +3,6 @@
import java.util.List;
public record DayStatsRecords(
- List stats, DayStatsType type
+ List stats, StatsWithStatusType type
) {
}
diff --git a/src/main/java/eu/cybershu/pocketstats/stats/StatsController.java b/src/main/java/eu/cybershu/pocketstats/stats/StatsController.java
index 37e5d5f..c334865 100644
--- a/src/main/java/eu/cybershu/pocketstats/stats/StatsController.java
+++ b/src/main/java/eu/cybershu/pocketstats/stats/StatsController.java
@@ -1,6 +1,7 @@
package eu.cybershu.pocketstats.stats;
import eu.cybershu.pocketstats.api.ApiResponse;
+import eu.cybershu.pocketstats.pocket.api.ActivityHeatmapStats;
import eu.cybershu.pocketstats.pocket.api.ItemsStatsAggregated;
import eu.cybershu.pocketstats.pocket.api.PocketItemStatsService;
import lombok.extern.slf4j.Slf4j;
@@ -51,4 +52,16 @@ public ApiResponse langsStats() {
public ApiResponse itemStatsAggregatedByPeriod() {
return new ApiResponse<>(0, null, statsService.itemsStatsAggregated());
}
+
+ @GetMapping(value = "/heatmap",
+ produces = MediaType.APPLICATION_JSON_VALUE)
+ public ApiResponse heatmapStats(
+ @RequestParam StatsWithStatusType type
+ ) {
+ log.info("Heatmap with status {}", type);
+
+ var heatmapRecords = statsService.heatmapOfStatus(type);
+
+ return new ApiResponse<>(0, null, heatmapRecords);
+ }
}
diff --git a/src/main/java/eu/cybershu/pocketstats/stats/StatsRequest.java b/src/main/java/eu/cybershu/pocketstats/stats/StatsRequest.java
index b64fd76..6983fbc 100644
--- a/src/main/java/eu/cybershu/pocketstats/stats/StatsRequest.java
+++ b/src/main/java/eu/cybershu/pocketstats/stats/StatsRequest.java
@@ -14,6 +14,6 @@ public record StatsRequest(
LocalDate end,
@NotNull
- DayStatsType type
+ StatsWithStatusType type
) {
}
diff --git a/src/main/java/eu/cybershu/pocketstats/stats/DayStatsType.java b/src/main/java/eu/cybershu/pocketstats/stats/StatsWithStatusType.java
similarity index 91%
rename from src/main/java/eu/cybershu/pocketstats/stats/DayStatsType.java
rename to src/main/java/eu/cybershu/pocketstats/stats/StatsWithStatusType.java
index 19f461b..e6927a1 100644
--- a/src/main/java/eu/cybershu/pocketstats/stats/DayStatsType.java
+++ b/src/main/java/eu/cybershu/pocketstats/stats/StatsWithStatusType.java
@@ -2,7 +2,7 @@
import eu.cybershu.pocketstats.pocket.api.ItemStatus;
-public enum DayStatsType {
+public enum StatsWithStatusType {
ARCHIVED,
DELETED,
TODO;
diff --git a/src/test/groovy/eu/cybershu/pocketstats/pocket/stats/PocketItemStatsServiceIntTest.groovy b/src/test/groovy/eu/cybershu/pocketstats/pocket/stats/PocketItemStatsServiceIntTest.groovy
index 429d015..7b0ad22 100644
--- a/src/test/groovy/eu/cybershu/pocketstats/pocket/stats/PocketItemStatsServiceIntTest.groovy
+++ b/src/test/groovy/eu/cybershu/pocketstats/pocket/stats/PocketItemStatsServiceIntTest.groovy
@@ -6,7 +6,7 @@ import eu.cybershu.pocketstats.pocket.api.BaseTest
import eu.cybershu.pocketstats.pocket.api.ItemsStatsAggregated
import eu.cybershu.pocketstats.pocket.api.PocketItemStatsService
import eu.cybershu.pocketstats.stats.DayStatsRecords
-import eu.cybershu.pocketstats.stats.DayStatsType
+import eu.cybershu.pocketstats.stats.StatsWithStatusType
import eu.cybershu.pocketstats.utils.TimePeriod
import eu.cybershu.pocketstats.utils.TimeUtils
import org.springframework.beans.factory.annotation.Autowired
@@ -96,10 +96,10 @@ class PocketItemStatsServiceIntTest extends BaseTest {
def end = LocalDate.now(clock)
when:
def result = statsService.getDayStatsRecords(
- start, end, DayStatsType.ARCHIVED
+ start, end, StatsWithStatusType.ARCHIVED
)
then:
- result.type() == DayStatsType.ARCHIVED
+ result.type() == StatsWithStatusType.ARCHIVED
and: "assert numbers"
assertNumberInDay(result, start, 3)
assertNumberInDay(result, end.minusDays(5), 2)
@@ -154,10 +154,10 @@ class PocketItemStatsServiceIntTest extends BaseTest {
assert repository.saveAll(items).size() == items.size()
when:
def result = statsService.getDayStatsRecords(
- start, end, DayStatsType.TODO
+ start, end, StatsWithStatusType.TODO
)
then:
- result.type() == DayStatsType.TODO
+ result.type() == StatsWithStatusType.TODO
and: "assert numbers"
assertNumberInDay(result, start, 3)
assertNumberInDay(result, end.minusDays(5), 4)
@@ -276,6 +276,93 @@ class PocketItemStatsServiceIntTest extends BaseTest {
}
}
+ private def "expect thrown IllegalArgumentException exception when getting heatmap of DELETED items stats"() {
+ when:
+ statsService.heatmapOfStatus(StatsWithStatusType.DELETED)
+ then:
+ thrown(IllegalArgumentException)
+ }
+
+ private def "expect to get a valid heatmap of ARCHIVED items stats"() {
+ given:
+ def pocketItems = [
+ hourAndDayArchivedItem(1, 1),
+ hourAndDayArchivedItem(2, 2),
+ hourAndDayAddedItem(2, 2),
+ hourAndDayArchivedItem(3, 3),
+ hourAndDayArchivedItem(4, 4),
+ hourAndDayArchivedItem(5, 5),
+ hourAndDayArchivedItem(5, 6),
+ hourAndDayArchivedItem(5, 6),
+ hourAndDayAddedItem(5, 6),
+ hourAndDayArchivedItem(11, 6),
+ hourAndDayArchivedItem(11, 7),
+ ]
+
+ assert repository.saveAll(pocketItems).size() == pocketItems.size()
+
+ when:
+ def result = statsService.heatmapOfStatus(StatsWithStatusType.ARCHIVED)
+ then:
+ def items = result.items()
+ !items.empty
+ verifyAll {
+ items.size() > 5
+ items.size() < pocketItems.size()
+
+ //by one weekday
+ items.findAll { it.weekday() == 6 }.size() == 2
+
+ //by one hour
+ items.findAll { it.hour() == 5 }.size() == 2
+
+ //by weekday and hour
+ items.find { it.hour() == 5 && it.weekday() == 6 }.count() == 2
+ items.find { it.hour() == 11 && it.weekday() == 7 }.count() == 1
+ }
+ }
+
+
+ private def "expect to get a valid heatmap of ADDED items stats"() {
+ given:
+ def pocketItems = [
+ hourAndDayArchivedItem(1, 1),
+ hourAndDayAddedItem(1, 1),
+ hourAndDayArchivedItem(2, 2),
+ hourAndDayArchivedItem(3, 3),
+ hourAndDayArchivedItem(4, 4),
+ hourAndDayAddedItem(6, 4),
+ hourAndDayArchivedItem(5, 5),
+ hourAndDayArchivedItem(5, 6),
+ hourAndDayArchivedItem(5, 6),
+ hourAndDayAddedItem(5, 6),
+ hourAndDayArchivedItem(11, 6),
+ hourAndDayArchivedItem(11, 7),
+ hourAndDayAddedItem(18, 7),
+ ]
+
+ assert repository.saveAll(pocketItems).size() == pocketItems.size()
+
+ when:
+ def result = statsService.heatmapOfStatus(StatsWithStatusType.TODO)
+ then:
+ def items = result.items()
+ !items.empty
+ verifyAll {
+ items.size() < pocketItems.size()
+
+ //by one weekday
+ items.findAll { it.weekday() == 6 }.size() == 2
+
+ //by one hour
+ items.findAll { it.hour() == 5 }.size() == 2
+
+ //by weekday and hour
+ items.find { it.hour() == 5 && it.weekday() == 6 }.count() == 3
+ items.find { it.hour() == 6 && it.weekday() == 4 }.count() == 1
+ }
+ }
+
private assetPeriodStats(ItemsStatsAggregated resul, String name, int expectedRead, int expectedAdded) {
assertThat(resul.findByName(name)).isPresent()
@@ -284,6 +371,26 @@ class PocketItemStatsServiceIntTest extends BaseTest {
assertThat(stats.added()).isEqualTo(expectedAdded)
}
+ private PocketItem hourAndDayArchivedItem(int hour, int weekday) {
+ def date = instantWithHourAndWeekday(hour, weekday)
+ archived(date, date)
+ }
+
+
+ private PocketItem hourAndDayAddedItem(int hour, int weekday) {
+ def date = instantWithHourAndWeekday(hour, weekday)
+ todo(date)
+ }
+
+ private Instant instantWithHourAndWeekday(int hour, int weekday) {
+ LocalDateTime localDateTime = LocalDateTime.now(clock)
+ LocalDateTime modifiedDateTime = localDateTime
+ .withHour(hour)
+ .with(DayOfWeek.of(weekday))
+
+ modifiedDateTime.atZone(ZoneId.systemDefault()).toInstant()
+ }
+
private PocketItem daysDiffAdded(int days) {
def timeAdded = instantDaysDiffers(days)
String title = "read " + timeAdded
|