tanner/spaceport
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix usages bug when member's not a Spaceport user

Browse Source
This commit is contained in:
Tanner Collin 2021-04-16 01:14:01 +00:00
parent 74dfdc6c06
commit a0c9c52475
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apiserver/apiserver/api/models.py
View File

@ -157,9 +157,11 @@ class StatsSpaceActivity(models.Model):
class UsageTrack(models.Model): class UsageTrack(models.Model):
user = models.ForeignKey(User, related_name='usages', blank=True, null=True, on_delete=models.SET_NULL) user = models.ForeignKey(User, related_name='usages', blank=True, null=True, on_delete=models.SET_NULL)
username = models.CharField(max_length=64)
devicename = models.CharField(max_length=64)
# member_id = models.IntegerField(blank=True, null=True) # restrict to current users for now
username = models.CharField(max_length=64) # allows us to match non-Spaceport users later
devicename = models.CharField(max_length=64)
start_time = models.DateTimeField(auto_now_add=True) start_time = models.DateTimeField(auto_now_add=True)
num_seconds = models.IntegerField() num_seconds = models.IntegerField()

3
apiserver/apiserver/api/serializers.py
View File

@ -303,7 +303,10 @@ class AdminSearchSerializer(serializers.Serializer):
return serializer.data return serializer.data
def get_usages(self, obj): def get_usages(self, obj):
if obj.user:
queryset = obj.user.usages.order_by('-start_time') queryset = obj.user.usages.order_by('-start_time')
else:
queryset = []
serializer = UsageSerializer(data=queryset, many=True) serializer = UsageSerializer(data=queryset, many=True)
serializer.is_valid() serializer.is_valid()
return serializer.data return serializer.data