top_users write database

app.py

@@ -21,4 +21,4 @@ if __name__ == '__main__':
     build_database()
     logging.info("Build database models")
 
-    app.run(host="0.0.0.0")
+    app.run(host="0.0.0.0")

apps/group_stat_api.py

@@ -1,12 +1,33 @@
-from flask import Blueprint, jsonify
+from flask import Blueprint, jsonify, request
+from database import Message, Member
+
+from datetime import datetime
 
 group_stat_api = Blueprint('group_stat_api', __name__)
 
 
-@group_stat_api.route("/top3_users",methods=["POST"])
+@group_stat_api.route("/top_users",methods=["GET"])
 def top_users():
-    # TODO: database
+    number = request.args.get("number")
+
+    if not number: number = 3
+     
+    number = int(number)
+    
+    members = []
+    counts = []
+
+    for user in Member.select():
+        members.append(user.first_name)
+        counts.append(Message.select().where(Message.user_id == user.user_id).count())
+         
+    # Sorting
+    counts, members = (list(t) for t in zip(*sorted(zip(counts,members),reverse=True)))
+    
+    members.insert(number, "Others")
+    counts.insert(number,  sum(counts[number:]))
+
     return jsonify({
-        "members": ["Mr.D", "𝙲𝚊𝚝𝚒𝚘𝚗", "Тёма","Others"],
+        "members":members[:number+1],
-        "counts":[4026,3024,2024,4096]
+        "counts":counts[:number+1]
     })

database.py

@@ -1,8 +1,7 @@
-from peewee import Model, CharField, BigIntegerField, DateField, TimestampField
+from peewee import DateTimeField, ForeignKeyField, Model, CharField, BigIntegerField, DateField, TimestampField
 from playhouse.db_url import connect
 
-from datetime import date, datetime
+from datetime import date, datetime, timedelta
-
 from config import db_url 
 db = connect(db_url)
 
@@ -32,12 +31,12 @@ class Member(Model):
 
 class Message(Model):
     user_id   = BigIntegerField()
-    timestamp = TimestampField(default=datetime.now()) 
+    first_name = CharField()
-    
+    timestamp = DateTimeField(default=datetime.now()) 
+         
     class Meta:
         db_table = "messages"
         database = db
 
 def build_database():
-    # db.create_tables([Message])
+    db.create_tables([WebUser,Message])
-    db.create_tables([WebUser])

static/js/top-users.js

@@ -1,9 +1,8 @@
-const options = {
+fetch("/top_users?number=5", {
-    method: 'POST',
+    // method: 'POST',
     headers: {'Content-Type': 'application/json'}
-}
+    // body: JSON.stringify({number:5})
-
+})
-fetch("/top3_users", options)
     .then(response => {
         if (!response.ok) {
             throw new Error(`HTTP error: ${response.status}`);