diff --git a/gracedb/events/migrations/0037_delete_approval_model.py b/gracedb/events/migrations/0037_delete_approval_model.py new file mode 100644 index 0000000000000000000000000000000000000000..09d78fed4192fcae4d279194e72359c464f3c56a --- /dev/null +++ b/gracedb/events/migrations/0037_delete_approval_model.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-06-19 21:45 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0036_populate_voevent_fields'), + ] + + operations = [ + migrations.RemoveField( + model_name='approval', + name='approvedEvent', + ), + migrations.RemoveField( + model_name='approval', + name='approver', + ), + migrations.DeleteModel( + name='Approval', + ), + ] diff --git a/gracedb/events/models.py b/gracedb/events/models.py index 6a357a32bb9414f73830f79dbeee8aacd2a6c46a..df34c492f401526adeed83b7f7e07c6617f0d2f8 100644 --- a/gracedb/events/models.py +++ b/gracedb/events/models.py @@ -263,12 +263,6 @@ class Event(models.Model): else: return 'Production' - def ligoApproved(self): - return self.approval_set.filter(approvingCollaboration='L').count() - - def virgoApproved(self): - return self.approval_set.filter(approvingCollaboration='V').count() - def reportingLatency(self): if self.gpstime: dt = self.created @@ -616,17 +610,7 @@ class Labelling(m2mThroughBase): label=self.label.name) -# XXX Deprecated? Is this used *anywhere*? -# Appears to only be used in models.py. Here and Event class as approval_set -class Approval(models.Model): - COLLABORATION_CHOICES = ( ('L','LIGO'), ('V','Virgo'), ) - approver = models.ForeignKey(UserModel) - created = models.DateTimeField(auto_now_add=True) - approvedEvent = models.ForeignKey(Event, null=False) - approvingCollaboration = models.CharField(max_length=1, choices=COLLABORATION_CHOICES) - ## Analysis Specific Attributes. - class GrbEvent(Event): ivorn = models.CharField(max_length=200, null=True) author_ivorn = models.CharField(max_length=200, null=True)