Make consumer owner a required column.

5 files changed, 16 insertions, 10 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
index 5d44d9e..6bc0019 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
@@ -66,6 +66,7 @@ public class Consumer {
     
     @ManyToOne
     @ForeignKey(name="fk_consumer_owner")
+    @JoinColumn(nullable=false)
     private Owner owner;
     
     // Consumer hierarchy it meant to be useful to represent the relationship between 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java
index ddb5976..143f5d9 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 /**
  * Represents the type of consumer.
  * 
- * TODO: Examples?
+ * See ProductFactory for some examples.
  */
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.PROPERTY)
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
index ca949c9..589cdd0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
@@ -131,7 +131,7 @@ public class ProductFactory extends ObjectFactory {
     }
 
     /**
-     * Lookup a ConsumerTYpe by name
+     * Lookup a ConsumerType by name
      * @param labelIn to lookup by
      * @return ConsumerType found
      */
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
index 609717a..591a053 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
@@ -21,8 +21,10 @@ import org.fedoraproject.candlepin.model.ConsumerInfo;
 import org.fedoraproject.candlepin.model.ConsumerRepository;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.ConsumerTypeRepository;
+import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.resource.ConsumerResource;
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
+import org.fedoraproject.candlepin.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -54,9 +56,12 @@ public class ConsumerResourceTest extends DatabaseTestFixture {
         ConsumerInfo ci = new ConsumerInfo();
         ci.setMetadataField("name", newname);
         
-        Consumer c = new Consumer();
-        c.setName(ci.getMetadataField("name"));
-        c.setType(standardSystemType);
+        Owner owner = TestUtil.createOwner();
+        beginTransaction();
+        em.persist(owner);
+        commitTransaction();
+
+        Consumer c = new Consumer(ci.getMetadataField("name"), owner, standardSystemType);
         c.setInfo(ci);
         
         Consumer saved = consumerRepository.create(c);
diff --git a/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java b/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
index d3ff05d..79b5593 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
@@ -73,16 +73,16 @@ public class DatabaseTestFixture {
             em.remove(p);
         }
         
-        List<Owner> owners = em.createQuery("from Owner o").getResultList();
-        for (Owner o : owners) {
-            em.remove(o);
-        }
-        
         List<Consumer> consumers = em.createQuery("from Consumer c").getResultList();
         for (Consumer c : consumers) {
             em.remove(c);
         }
 
+        List<Owner> owners = em.createQuery("from Owner o").getResultList();
+        for (Owner o : owners) {
+            em.remove(o);
+        }
+
 //        List<ConsumerInfo> consumerInfos = em.createQuery("from ConsumerInfo c").getResultList();
 //        for (ConsumerInfo c : consumerInfos) {
 //            em.remove(c);