From 1f037470fb999f6799c2db1774bc00b4a205c17f Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Mon, 9 Apr 2018 16:36:13 +1200
Subject: rrs: releases should be unique by plan and name, not just name

I missed changing this constraint when adding the plan field. We want to
be able to have the same named release on another plan.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 rrs/migrations/0011_release_name_unique.py | 23 +++++++++++++++++++++++
 rrs/models.py                              | 14 +++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 rrs/migrations/0011_release_name_unique.py

diff --git a/rrs/migrations/0011_release_name_unique.py b/rrs/migrations/0011_release_name_unique.py
new file mode 100644
index 0000000000..0c2442df08
--- /dev/null
+++ b/rrs/migrations/0011_release_name_unique.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rrs', '0010_recipemaintenancelink'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='release',
+            name='name',
+            field=models.CharField(max_length=100),
+        ),
+        migrations.AlterUniqueTogether(
+            name='release',
+            unique_together=set([('plan', 'name')]),
+        ),
+    ]
diff --git a/rrs/models.py b/rrs/models.py
index 635193cf54..5f70258045 100644
--- a/rrs/models.py
+++ b/rrs/models.py
@@ -47,10 +47,13 @@ class MaintenancePlanLayerBranch(models.Model):
 
 class Release(models.Model):
     plan = models.ForeignKey(MaintenancePlan)
-    name = models.CharField(max_length=100, unique=True)
+    name = models.CharField(max_length=100)
     start_date = models.DateField(db_index=True)
     end_date = models.DateField(db_index=True)
 
+    class Meta:
+        unique_together = ('plan', 'name',)
+
     def get_default_milestone(self):
         return self.milestone_set.last()
 
@@ -69,8 +72,13 @@ class Release(models.Model):
     def get_current(maintplan):
         current = date.today()
         current_release = Release.get_by_date(maintplan, current)
-
-        return current_release or Release.objects.filter(plan=maintplan).order_by('-end_date')[0]
+        if current_release:
+            return current_release
+        else:
+            plan_releases = Release.objects.filter(plan=maintplan).order_by('-end_date')
+            if plan_releases:
+                return plan_releases[0]
+        return None
 
     def __str__(self):
         return '%s' % (self.name)
-- 
cgit 1.2.3-korg