Merge pull request #241 from UnitapApp/fix/prizetap

Fix/prizetap
UnitapApp · Jan 3, 2024 · 33b87d5 · 33b87d5
2 parents 7aa64b2 + 28c85d9
commit 33b87d5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/prizetap/admin.py b/prizetap/admin.py
@@ -7,6 +7,7 @@
 
 class RaffleAdmin(admin.ModelAdmin):
     list_display = ["pk", "name", "creator_name", "status"]
+    readonly_fields = ["vrf_tx_hash"]
 
 
 class RaffleٍEntryAdmin(admin.ModelAdmin):

diff --git a/prizetap/serializers.py b/prizetap/serializers.py
@@ -173,7 +173,7 @@ class RaffleSerializer(serializers.ModelSerializer):
     chain = ChainSerializer()
     winner_entries = WinnerEntrySerializer(many=True, read_only=True)
     user_entry = serializers.SerializerMethodField()
-    constraints = ConstraintSerializer(many=True, read_only=True)
+    constraints = serializers.SerializerMethodField()
     creator_profile = SimpleProfilerSerializer()
 
     class Meta:
@@ -205,7 +205,6 @@ class Meta:
             "raffleId",
             "constraints",
             "constraint_params",
-            "reversed_constraints",
             "created_at",
             "start_at",
             "deadline",
@@ -224,6 +223,20 @@ class Meta:
             "winners_count",
         ]
 
+    def get_constraints(self, raffle: Raffle):
+        reversed_constraints = (
+            raffle.reversed_constraints.split(",")
+            if raffle.reversed_constraints
+            else []
+        )
+        return [
+            {
+                **ConstraintSerializer(c).data,
+                "is_reversed": True if c.pk in reversed_constraints else False,
+            }
+            for c in raffle.constraints.all()
+        ]
+
     def get_user_entry(self, raffle: Raffle):
         try:
             return RaffleEntrySerializer(

diff --git a/prizetap/tasks.py b/prizetap/tasks.py
@@ -25,6 +25,7 @@ def set_raffle_random_words(self):
             Raffle.objects.filter(deadline__lt=timezone.now())
             .filter(status=Raffle.Status.VERIFIED)
             .filter(vrf_tx_hash__isnull=False)
+            .exclude(vrf_tx_hash__exact="")
             .first()
         )
 
@@ -33,8 +34,9 @@ def set_raffle_random_words(self):
             vrf_client = VRFClientContractClient(raffle.chain)
             last_request = vrf_client.get_last_request()
             expiration_time = last_request[0]
+            num_words = last_request[1]
             now = int(time.time())
-            if now < expiration_time:
+            if now < expiration_time and num_words == raffle.winners_count:
                 set_random_words(raffle)
             else:
                 print("Random words have expired")