Patch requests now update original credits rather than adding

Author: wtripp180901

coral_credits/api/db_utils.py

@@ -342,11 +342,15 @@ def create_credit_resource_allocations(credit_allocation, resource_allocations):
         car, created = models.CreditAllocationResource.objects.get_or_create(
             allocation=credit_allocation,
             resource_class=resource_class,
-            defaults={"resource_hours": resource_hours},
+            defaults={"resource_hours": resource_hours, "allocated_resource_hours": resource_hours},
         )
         # If exists, update:
         if not created:
-            car.resource_hours += resource_hours
+            newly_allocated_resource_hours = resource_hours
+            car.resource_hours += newly_allocated_resource_hours - car.allocated_resource_hours
+            if car.resource_hours < 0:
+                raise db_exceptions.InsufficientCredits("Cannot set credits to fewer than currently consumed")
+            car.allocated_resource_hours = newly_allocated_resource_hours
             car.save()
 
         # Refresh from db to get the updated resource_hours

coral_credits/api/models.py

@@ -82,6 +82,7 @@ class CreditAllocationResource(models.Model):
         ResourceClass, on_delete=models.DO_NOTHING, related_name="+"
     )
     resource_hours = models.FloatField()
+    allocated_resource_hours = models.FloatField()
     created = models.DateTimeField(auto_now_add=True)
 
     class Meta:

coral_credits/api/serializers.py

@@ -46,7 +46,7 @@ class CreditAllocationResourceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.CreditAllocationResource
-        fields = ["id", "resource_class", "resource_hours"]
+        fields = ["id", "resource_class", "resource_hours","allocated_resource_hours"]
 
     def to_representation(self, instance):
         """Pass the context to the ResourceClassSerializer"""