From 2544b3a4cc0d4be0dfc614d06af54aa458c87f27 Mon Sep 17 00:00:00 2001 From: pepper Date: Thu, 19 Nov 2020 23:49:26 -0500 Subject: [PATCH] Updated model to suit @pepper --- .../0012_migration_extra_scripts_run.py | 18 +++++++++++++ .../api/migrations/0013_auto_20201120_1448.py | 25 +++++++++++++++++++ migratorapi/api/models.py | 17 +++++++------ 3 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 migratorapi/api/migrations/0012_migration_extra_scripts_run.py create mode 100644 migratorapi/api/migrations/0013_auto_20201120_1448.py diff --git a/migratorapi/api/migrations/0012_migration_extra_scripts_run.py b/migratorapi/api/migrations/0012_migration_extra_scripts_run.py new file mode 100644 index 0000000..781a6c5 --- /dev/null +++ b/migratorapi/api/migrations/0012_migration_extra_scripts_run.py @@ -0,0 +1,18 @@ +# 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), + ), + ] diff --git a/migratorapi/api/migrations/0013_auto_20201120_1448.py b/migratorapi/api/migrations/0013_auto_20201120_1448.py new file mode 100644 index 0000000..da8e66e --- /dev/null +++ b/migratorapi/api/migrations/0013_auto_20201120_1448.py @@ -0,0 +1,25 @@ +# 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), + ), + ] diff --git a/migratorapi/api/models.py b/migratorapi/api/models.py index ad5521e..a5e9ef0 100644 --- a/migratorapi/api/models.py +++ b/migratorapi/api/models.py @@ -11,7 +11,8 @@ class Migration(models.Model): default=uuid.uuid4, primary_key=True) submit_time = models.DateField('migrtation submitted on') domain = models.CharField(max_length=200) - booked_time = models.DateTimeField('Migration booked for') + booked_date = models.DateField('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) @@ -27,14 +28,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): - now = timezone.now() - return now >= self.booked_time and self.migration_status == 'Booked' - print_missed_migrations.admin_order_field = 'booked_time' - print_missed_migrations.boolean = True - print_missed_migrations.short_description = "Was this migration missed?" + # def print_missed_migrations(self): + # now = timezone.date() + # return now >= self.booked_date and self.migration_status == 'Booked' + # print_missed_migrations.admin_order_field = 'booked_time' + # print_missed_migrations.boolean = True + # print_missed_migrations.short_description = "Was this migration missed?" def __str__(self): return self.domain + ' ' + self.ticket_id