Cache leaderboards and provide leaderboard data with user

api-server.nix

@@ -13,6 +13,7 @@ let
   databaseSetup = ./server/database/create-role-and-database.sql;
   tableSetup = pkgs.writeText "setup.sql" ''
     ${builtins.readFile ./server/database/create-tables.sql}
+    ${builtins.readFile ./server/database/create-materialized-views.sql}
     ${mockData}
   '';
 in
@@ -63,6 +64,27 @@ in
     wantedBy = [ "default.target" ];
   };
 
+  systemd.services.maptogether-refresh-views = {
+    description = "Refresh the MapTogether views";
+    serviceConfig = {
+      Type = "oneshot";
+      User = "maptogether";
+      Group = "maptogether";
+      ExecStart = "${pkgs.postgresql}/bin/psql -d maptogether -f ${./server/database/refresh-materialized-views.sql}";
+    };
+    requires = [ "maptogether-database-setup.service" "postgresql.service" ];
+    after = [ "maptogether-database-setup.service" "postgresql.service" ];
+  };
+
+  systemd.timers.maptogether-refresh-timer = {
+	description = "Timer to trigger refresh";
+	timerConfig = {
+		Unit = "maptogether-refresh-views";
+		OnCalendar = "*:*:0"; # once a minute
+	};
+	wantedBy = [ "default.target" ];
+  };
+
   users.groups.maptogether.gid = 1005;
   users.users.maptogether = {
     isSystemUser = true;

client/lib/widgets/error.dart

@@ -7,9 +7,15 @@ class Error extends StatelessWidget {
 
   @override
   build(BuildContext context) =>
-    Icon(
-        Icons.error_outline,
-        color: Colors.red,
-        size: 60,
+    Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+            Icon(
+                Icons.error_outline,
+                color: Colors.red,
+                size: 60,
+            ),
+            Text(error.toString()),
+        ]
     );
 }

client/lib/widgets/social/overview.dart

@@ -64,7 +64,7 @@ class Overview extends StatelessWidget {
                 builder: (context) => LeaderboardWidget(leaderboard: context
                     .watch<LoginHandler>()
                     .mtApi()
-                    .leaderboard(name, type)),
+                    .leaderboard(type, name)),
               ));
         },
       ));

client/lib/widgets/social/user_overview.dart

@@ -40,13 +40,27 @@ class UserOverview extends StatelessWidget {
                               fontWeight: FontWeight.bold
                           )
                       ),
-                      Text("Score : ${user.score}",
+                      Text("Score : ${user.scoreAllTime}",
                           style: TextStyle(fontFamily: 'RobotoMono',
                               fontSize: 18,
                               color: Colors.lightGreen,
                               fontWeight: FontWeight.bold
                           )
-                      )
+                      ),
+                      Text("Monthly Score : ${user.scoreMonthly}",
+                          style: TextStyle(fontFamily: 'RobotoMono',
+                              fontSize: 18,
+                              color: Colors.lightGreen,
+                              fontWeight: FontWeight.bold
+                          )
+                      ),
+                      Text("Weekly Score : ${user.scoreWeekly}",
+                          style: TextStyle(fontFamily: 'RobotoMono',
+                              fontSize: 18,
+                              color: Colors.lightGreen,
+                              fontWeight: FontWeight.bold
+                          )
+                      ),
                     ],
                   )
                 ],

maptogether_api/example/maptogether_api_example.dart

@@ -20,6 +20,4 @@ void main() {
   api.leaderboard("global", LeaderboardType.all_time).then((l) {
     print(l.entries[1].user.name);
   });
-
 }
-

maptogether_api/lib/src/api.dart

@@ -2,19 +2,6 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'data.dart' as data;
 
-enum LeaderboardType { weekly, monthly, all_time }
-String stringify(LeaderboardType type) {
-  switch (type) {
-    case LeaderboardType.weekly:
-      return "weekly";
-    case LeaderboardType.monthly:
-      return "monthly";
-    case LeaderboardType.all_time:
-      return 'all_time';
-  }
-  throw 'Leaderboard type does not exsist';
-}
-
 class InvalidRegionException implements Exception {
   final String _message;
   InvalidRegionException(
@@ -62,31 +49,26 @@ class Api {
   Future<data.User> user(int id) =>
       _get('user/$id').then(_checkRequest('getting user')).then(_decodeUser);
 
-  Future<data.Leaderboard> leaderboard(String base, LeaderboardType type) =>
-      _get('leaderboard/$base/${stringify(type)}')
-          .then(_checkRequest('getting leaderboard'))
-          .then(_decodeLeaderboard);
+  leaderboardByPath(String path) => _get('leaderboard/$path')
+      .then(_checkRequest('getting leaderboard'))
+      .then(_decodeLeaderboard);
 
-  Future<data.Leaderboard> personalLeaderboard(LeaderboardType type) =>
-      leaderboard('personal', type);
+  Future<data.Leaderboard> leaderboard(
+          data.LeaderboardType type, String name) =>
+      leaderboardByPath('${type.stringify()}/$name');
 
-  Future<data.Leaderboard> globalLeaderboard(LeaderboardType type) =>
-      leaderboard('global', type);
+  Future<data.Leaderboard> personalLeaderboard(
+          data.LeaderboardType type, int id) =>
+      leaderboard(type, 'personal/${id}');
 
-  Future<data.Leaderboard> regionalLeaderboard(
-      String region, LeaderboardType type) {
-    if (region == 'personal' || region == 'global')
-      throw InvalidRegionException();
-    else
-      return leaderboard(region, type);
-  }
+  Future<data.Leaderboard> globalLeaderboard(data.LeaderboardType type) =>
+      leaderboard(type, 'global');
 
   // Push Endpoints
 
   Future<void> createUser(
           int id, String secret, String clientToken, String clientSecret) =>
-      _put('user/$id',
-              auth: '$_access $secret $clientToken $clientSecret')
+      _put('user/$id', auth: '$_access $secret $clientToken $clientSecret')
           .then(_checkRequest('creating user'));
 
   Future<void> follow(int id, int other) =>

maptogether_api/lib/src/data.dart

@@ -1,26 +1,34 @@
 import 'package:json_annotation/json_annotation.dart';
+import 'package:maptogether_api/src/api.dart';
 
 part 'data.g.dart';
 
 @JsonSerializable()
 class User {
-  final int id, score;
+  final int id;
+  @JsonKey(name: "score_all_time")
+  final int scoreAllTime;
+  @JsonKey(name: "score_monthly")
+  final int scoreMonthly;
+  @JsonKey(name: "score_weekly")
+  final int scoreWeekly;
   final String name;
 
-  @JsonKey(defaultValue: null)
   final List<Achievement> achievements;
-  @JsonKey(defaultValue: null)
   final List<SimpleUser> followers;
-  @JsonKey(defaultValue: null)
   final List<SimpleUser> following;
+  final List<LeaderboardSummary> leaderboards;
 
   User(
       {required this.id,
-      required this.score,
+      required this.scoreAllTime,
+      required this.scoreMonthly,
+      required this.scoreWeekly,
       required this.name,
       required this.achievements,
       required this.followers,
-      required this.following});
+      required this.following,
+      required this.leaderboards});
 
   factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
   Map<String, dynamic> toJson() => _$UserToJson(this);
@@ -96,3 +104,52 @@ class Leaderboard {
   factory Leaderboard.fromJson(List<dynamic> json) => Leaderboard(
       json.map((e) => LeaderboardEntry.fromJson(e)).toList(growable: false));
 }
+
+@JsonSerializable()
+class LeaderboardSummary {
+  final String path, name;
+  final int rank, total;
+
+  @JsonKey(fromJson: LeaderboardTypeExtension.fromString)
+  final LeaderboardType type;
+
+  LeaderboardSummary(
+      {required this.path,
+      required this.name,
+      required this.rank,
+      required this.total,
+      required this.type});
+
+  factory LeaderboardSummary.fromJson(Map<String, dynamic> json) =>
+      _$LeaderboardSummaryFromJson(json);
+  Map<String, dynamic> toJson() => _$LeaderboardSummaryToJson(this);
+}
+
+enum LeaderboardType { weekly, monthly, all_time }
+
+extension LeaderboardTypeExtension on LeaderboardType {
+  String stringify() {
+    switch (this) {
+      case LeaderboardType.weekly:
+        return "weekly";
+      case LeaderboardType.monthly:
+        return "monthly";
+      case LeaderboardType.all_time:
+        return 'all_time';
+    }
+    throw 'Leaderboard type does not exsist';
+  }
+
+  static LeaderboardType fromString(String type) {
+    switch (type) {
+      case "weekly":
+        return LeaderboardType.weekly;
+      case "monthly":
+        return LeaderboardType.monthly;
+      case "all_time":
+        return LeaderboardType.all_time;
+      default:
+        return LeaderboardType.all_time;
+    }
+  }
+}

maptogether_api/pubspec.yaml

@@ -1,6 +1,6 @@
 name: maptogether_api
 description: A library for accessing the maptogether api
-version: 0.2.0
+version: 0.3.0
 homepage: https://github.com/SEbbaDK/p8
 
 environment:

maptogether_api/test/api_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:maptogether_api/src/api.dart' as mt;
+import 'package:maptogether_api/maptogether_api.dart' as mt;
 
 void main() {
   group('Maptogether reads', () {

maptogether_api/test/data_test.dart

@@ -3,19 +3,35 @@ import 'package:maptogether_api/src/data.dart' as data;
 
 void main() {
   group('User', () {
-    var user = data.User(id: 1, score: 12, name: 'Jens', achievements: [
-      data.Achievement(
-        name: 'fdf',
-        description: 'Stuff',
-      )
-    ], followers: [
-      data.SimpleUser(
+    var user = data.User(
         id: 1,
-        name: 'Hej',
-      )
-    ], following: [
-      data.SimpleUser(id: 2, name: 'Med')
-    ]);
+        scoreAllTime: 12,
+        scoreMonthly: 5,
+        scoreWeekly: 2,
+        name: 'Jens',
+        achievements: [
+          data.Achievement(
+            name: 'fdf',
+            description: 'Stuff',
+          )
+        ],
+        followers: [
+          data.SimpleUser(
+            id: 1,
+            name: 'Hej',
+          )
+        ],
+        following: [
+          data.SimpleUser(id: 2, name: 'Med')
+        ],
+        leaderboards: [
+          data.LeaderboardSummary(
+              path: "/leaderboard/all_time/global",
+              name: "Global",
+              rank: 1,
+              total: 20,
+              type: data.LeaderboardType.all_time)
+        ]);
 
     test('have', () => expect(user.followers.length, 1));
   });

server.nix

@@ -30,5 +30,6 @@ in
   containers.api = {
     config = import ./api-server.nix { port = apiPort; inherit pkgs; };
     autoStart = true;
+    ephemeral = true;
   };
 }