new apps.epic app migrations for token expiration & cooldown; reject token renamed to return token everywhere; new mapps.epic.models & .views for expiration & cooldown; new apps.dash.views to manage stacking of like Token types not just in the kit bag but in the Gameboard's Game Kit applet & in the Dashwallet's Tokens applet; Free Tokens now display correctly in kit bag; apps.lyric.admin now ensures superuser cannot grant Free Tokens without an expiration date; corresponding tests in .tests.integrated.test_admin.TokenAdminFormTest; screendumps occurring for every test, regardless of passfail status, after one fail fixed in FTs.base; FTs.test_gatekeeper.GameKitInsertTest.test_free_token_insert_via_kit_consumed_on_confirm, for test purposes only, ensures starting Free Token deleted before fresh one assigned w. full 7d expiration battery
This commit is contained in:
@@ -6,6 +6,7 @@ from django.shortcuts import redirect, render
|
||||
from django.utils import timezone
|
||||
|
||||
from apps.epic.models import GateSlot, Room, RoomInvite, debit_token, select_token
|
||||
from apps.lyric.models import Token
|
||||
|
||||
|
||||
RESERVE_TIMEOUT = timedelta(seconds=60)
|
||||
@@ -117,7 +118,7 @@ def confirm_token(request, room_id):
|
||||
|
||||
|
||||
@login_required
|
||||
def reject_token(request, room_id):
|
||||
def return_token(request, room_id):
|
||||
if request.method == "POST":
|
||||
room = Room.objects.get(id=room_id)
|
||||
slot = room.gate_slots.filter(
|
||||
@@ -125,10 +126,28 @@ def reject_token(request, room_id):
|
||||
status__in=[GateSlot.RESERVED, GateSlot.FILLED],
|
||||
).first()
|
||||
if slot:
|
||||
if slot.status == GateSlot.FILLED:
|
||||
if slot.debited_token_type == Token.COIN:
|
||||
coin = request.user.tokens.filter(
|
||||
token_type=Token.COIN, current_room=room
|
||||
).first()
|
||||
if coin:
|
||||
coin.current_room = None
|
||||
coin.next_ready_at = None
|
||||
coin.save()
|
||||
elif slot.debited_token_type in (Token.FREE, Token.TITHE):
|
||||
Token.objects.create(
|
||||
user=request.user,
|
||||
token_type=slot.debited_token_type,
|
||||
expires_at=slot.debited_token_expires_at,
|
||||
)
|
||||
request.session.pop("kit_token_id", None)
|
||||
slot.gamer = None
|
||||
slot.status = GateSlot.EMPTY
|
||||
slot.reserved_at = None
|
||||
slot.filled_at = None
|
||||
slot.debited_token_type = None
|
||||
slot.debited_token_expires_at = None
|
||||
slot.save()
|
||||
return redirect("epic:gatekeeper", room_id=room_id)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user