migratorapi/api/admin.py

@@ -5,8 +5,8 @@ from .models import Migration
 
 
 class MigrationAdmin(admin.ModelAdmin):
-    list_display = ('ticket_id', 'booked_date' , 'booked_time',
+    list_display = ('migration_status', 'booked_time',
-                    'migration_status', 'domain', 'brand')
+                    'ticket_id', 'domain', 'brand', 'print_missed_migrations')
     search_fields = ['domain', 'booked_time',
                      'username', 'ticket_id', 'migration_status']
 

migratorapi/api/migrations/0012_migration_extra_scripts_run.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.3 on 2020-11-18 01:40
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0011_migration_migration_cmd'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='migration',
-            name='extra_scripts_run',
-            field=models.BooleanField(default=False),
-        ),
-    ]

migratorapi/api/migrations/0013_auto_20201120_1448.py

@@ -1,25 +0,0 @@
-# Generated by Django 3.1.3 on 2020-11-20 03:48
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0012_migration_extra_scripts_run'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='migration',
-            name='booked_date',
-            field=models.DateField(default=django.utils.timezone.now, verbose_name='Migration booked for'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='migration',
-            name='booked_time',
-            field=models.CharField(max_length=200),
-        ),
-    ]

migratorapi/api/models.py

@@ -11,8 +11,7 @@ class Migration(models.Model):
                           default=uuid.uuid4, primary_key=True)
     submit_time = models.DateField('migrtation submitted on')
     domain = models.CharField(max_length=200)
-    booked_date = models.DateField('Migration booked for')
+    booked_time = models.DateTimeField('Migration booked for')
-    booked_time = models.CharField(max_length=200)
     original_server = models.CharField(max_length=200)
     new_server = models.CharField(max_length=200)
     username = models.CharField(max_length=200)
@@ -28,14 +27,14 @@ class Migration(models.Model):
         'Date to be terminated', null=True, blank=True)
     migration_cmd = models.CharField(max_length=200, null=True, blank=True)
     is_urgent = models.BooleanField(default=False)
-    extra_scripts_run = models.BooleanField(default=False)
+    # extra_scripts_run = models.BooleanField(default=False)
 
-    # def print_missed_migrations(self):
+    def print_missed_migrations(self):
-    #     now = timezone.date()
+        now = timezone.now()
-    #     return now >= self.booked_date and self.migration_status == 'Booked'
+        return now >= self.booked_time and self.migration_status == 'Booked'
-    # print_missed_migrations.admin_order_field = 'booked_time'
+    print_missed_migrations.admin_order_field = 'booked_time'
-    # print_missed_migrations.boolean = True
+    print_missed_migrations.boolean = True
-    # print_missed_migrations.short_description = "Was this migration missed?"
+    print_missed_migrations.short_description = "Was this migration missed?"
 
     def __str__(self):
         return self.domain + ' ' + self.ticket_id

migratorapi/api/serializers.py

@@ -6,7 +6,6 @@ class MigrationOverView(serializers.ModelSerializer):
         model = Migration
         fields = ['id',
         'domain',
-        'booked_date',
         'booked_time',
         'migration_status',
         'term_date']
@@ -17,7 +16,6 @@ class MigrationSerializer(serializers.ModelSerializer):
         fields = ['id',
                   'submit_time',
                   'domain',
-                  'booked_date',
                   'booked_time',
                   'original_server',
                   'new_server',
@@ -30,5 +28,4 @@ class MigrationSerializer(serializers.ModelSerializer):
                   'additional_domains',
                   'migration_type',
                   'term_date',
-                  'migration_cmd',
+                  'migration_cmd']
-                  'extra_scripts_run']

migratorapi/api/views.py

@@ -74,7 +74,7 @@ class MigrationsBooked(APIView):
     '''
     def get(self, request, format=None):
         limit = checkLimit(request.GET.get('limit', ''))
-        migrations = MigrationSerializer(Migration.objects.filter(
+        migrations = MigrationOverView(Migration.objects.filter(
             migration_status="Booked",)[:limit], many=True)
         return Response(migrations.data, status=status.HTTP_200_OK)
 

migratorapi/migratorapi/settings.py

@@ -25,7 +25,7 @@ SECRET_KEY = 'cq3daur*kk2+*-)@s%wq1c+pc7xi-c1ig@-%wq)m7pn3+zxbre'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['10.6.9.32', 'benjamyn.love', 'localhost']
+ALLOWED_HOSTS = ['10.6.9.42', 'benjamyn.love', 'localhost']
 
 
 # Application definition
@@ -80,9 +80,9 @@ WSGI_APPLICATION = 'migratorapi.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'newDevAPI',
+        'NAME': 'devmigs',
-        'USER': 'devAPI',
+        'USER': 'devmig',
-        'PASSWORD': 'Pat9Mnug2LO1SZMq',
+        'PASSWORD': 'XXgDh1i6w8rqp4BG',
         'HOST': '127.0.0.1',
         'PORT': '3306',
     }