From 00f64129dfa598ac4aa63467e9514638daa3e3b9 Mon Sep 17 00:00:00 2001
From: John-Paul Navarro <navarro@anl.gov>
Date: Sun, 24 Jul 2022 07:31:30 -0500
Subject: [PATCH] Fix Outages indexes (remove Subject and Content; add SiteID
 ad ResourceID)

---
 CHANGELOG                                     |  3 ++
 .../migrations/0004_auto_20220724_1228.py     | 33 +++++++++++++++++++
 django_xsede_warehouse/outages/models.py      |  8 ++---
 3 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 django_xsede_warehouse/outages/migrations/0004_auto_20220724_1228.py

diff --git a/CHANGELOG b/CHANGELOG
index 7663b97..c444614 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+tag-2.4-2022072$
+  - Fix Outages indexes (remove Subject and Content; add SiteID ad ResourceID)
+
 tag-2.4-20220723
   - Expand Outages Content from 4000 to 8000 characters needed to merge Outage update text
 
diff --git a/django_xsede_warehouse/outages/migrations/0004_auto_20220724_1228.py b/django_xsede_warehouse/outages/migrations/0004_auto_20220724_1228.py
new file mode 100644
index 0000000..6d7ec49
--- /dev/null
+++ b/django_xsede_warehouse/outages/migrations/0004_auto_20220724_1228.py
@@ -0,0 +1,33 @@
+# Generated by Django 2.2.24 on 2022-07-24 12:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('outages', '0003_auto_20220723_1243'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='outages',
+            name='Content',
+            field=models.CharField(max_length=8000),
+        ),
+        migrations.AlterField(
+            model_name='outages',
+            name='OutageID',
+            field=models.IntegerField(db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='outages',
+            name='ResourceID',
+            field=models.CharField(db_index=True, max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='outages',
+            name='Subject',
+            field=models.CharField(max_length=120),
+        ),
+    ]
diff --git a/django_xsede_warehouse/outages/models.py b/django_xsede_warehouse/outages/models.py
index 2406186..c6649be 100644
--- a/django_xsede_warehouse/outages/models.py
+++ b/django_xsede_warehouse/outages/models.py
@@ -8,11 +8,11 @@ class Outages(models.Model):
     #id = models.AutoField(primary_key=True, null=False)
     #OutageID,ResourceID,WebURL,Subject,Content,OutageStart,OutageEnd,SiteID
     ID = models.CharField(primary_key=True, max_length=128, null=False)
-    OutageID = models.IntegerField(null=False)
-    ResourceID = models.CharField(max_length=64)
+    OutageID = models.IntegerField(db_index=True, null=False)
+    ResourceID = models.CharField(db_index=True, max_length=64)
     WebURL = models.CharField(max_length=320)
-    Subject = models.CharField(db_index=True, max_length=120)
-    Content = models.CharField(db_index=True, max_length=8000)
+    Subject = models.CharField(max_length=120, null=False)
+    Content = models.CharField(max_length=8000)
     OutageStart = models.DateTimeField(null=True)
     OutageEnd = models.DateTimeField(null=True)
     SiteID = models.CharField(db_index=True, max_length=40)