diff --git a/api_functions.py b/api_functions.py index ac0411f..5ecd831 100644 --- a/api_functions.py +++ b/api_functions.py @@ -1,4 +1,4 @@ -from random import shuffle +import random def isEnd(cur, trueChatID): @@ -29,12 +29,19 @@ def isEnd(cur, trueChatID): return "" -def role_cnt(user_count): +def role_distribution(userIDs): + user_count = len(userIDs) + userIDs = list(userIDs) + resp = {} ls = [0, 0, 1, 1, 0] ls[4] = user_count//4 - ls[1] = user_count - ls[4] - return ls + ls[1] = user_count - ls[4]-2 + random.shuffle(userIDs) + for i in range(5): + for j in range(ls[i]): + print(type(userIDs)) + resp[userIDs.pop()] = str(i) + return resp -def role_distribution(userIDs, count_r): - pass + # [0, 4, 1, 1, 2] diff --git a/app.py b/app.py index 97087c2..e80ab22 100644 --- a/app.py +++ b/app.py @@ -51,11 +51,14 @@ def create(): @app.route('/start_game', methods=["POST"]) def start(): # Команда принимает на вход TCI = request.json['chatID'] - userlist = request.json['usderIDs'] + userlist = request.json['userIDs'] cursor = db.connection.cursor() - for id in userlist: + for idi in userlist: db.query_ins_user(id, curs) db.close() + resp = api_functions.role_distribution(userlist) + return ("", resp) + if __name__ == '__main__': diff --git a/test.py b/test.py new file mode 100644 index 0000000..5ac60fe --- /dev/null +++ b/test.py @@ -0,0 +1,11 @@ +# for i in range(0): +# print(i) + +# d = dict +# print(d) +import random + + +a = ["a", "b", "c", "d", "e", "f", "g"] + +print(role_distribution(a))