rename customer app to customers

customer/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class CustomerConfig(AppConfig):
-    name = 'customer'

customers/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CustomersConfig(AppConfig):
+    name = 'customers'

customers/models.py

@@ -22,3 +22,11 @@ class DeviceManufacturer(Company):
 
     class Meta:
         verbose_name_plural = "Device Manufacturers"
+
+
+class Location(models.Model):
+    name = models.CharField(max_length=50)
+    customer = models.ForeignKey(Customer, on_delete=models.CASCADE)
+
+    def __str__(self):
+        return self.name

device/models.py

@@ -1,3 +1,72 @@
 from django.db import models
+from core.models import Category, Company
+from customer.models import Customer, Owner
+from .location import Location
+from .user import User
+from .net import Net, IpStatus
 
-# Create your models here.
+
+class DeviceManufacturer(Company):
+
+    class Meta:
+        verbose_name_plural = "Device Manufacturers"
+
+
+class DeviceCategory(Category):
+
+    class Meta:
+        verbose_name_plural = "Device Categories"
+
+
+class Device(models.Model):
+    name = models.CharField(max_length=50)
+    description = models.TextField(blank=True)
+    serialnumber = models.CharField(max_length=50, blank=True)
+    category = models.ForeignKey(DeviceCategory, on_delete=models.SET_NULL,
+                                 null=True, blank=True)
+    owner = models.ForeignKey(Owner, on_delete=models.SET_NULL, null=True, blank=True)
+    customer = models.ForeignKey(Customer, on_delete=models.CASCADE)
+    manufacturer = models.ForeignKey(DeviceManufacturer, models.SET_NULL,
+                                     null=True, blank=True)
+    location = models.ForeignKey(Location, models.SET_NULL, null=True,
+                                 blank=True)
+    user = models.ForeignKey(User, models.SET_NULL, null=True, blank=True)
+    installation_date = models.DateField(null=True, blank=True)
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        from django.urls import reverse
+        return reverse('device', args=[str(self.id)])
+
+
+class ConnectedDevice(Device):
+    net = models.ManyToManyField(Net, through='DeviceInNet')
+
+    @property
+    def ips(self):
+        nets = DeviceInNet.objects.filter(device=self.id)
+        ip_addresses = {}
+        for net in nets:
+            ip_addresses[net.net_id] = net.ip
+        return ip_addresses
+
+    class Meta:
+        verbose_name_plural = "Connected Devices"
+
+
+class DeviceInNet(models.Model):
+    device = models.ForeignKey(ConnectedDevice, on_delete=models.CASCADE)
+    net = models.ForeignKey(Net, on_delete=models.CASCADE)
+    ip = models.GenericIPAddressField(verbose_name="IP")
+    nic = models.CharField(max_length=50, blank=True, verbose_name="NIC")
+    mac_address = models.CharField(max_length=50, blank=True, verbose_name="MAC Address")
+    ip_status = models.ForeignKey(IpStatus, models.SET_NULL, null=True,
+                                  blank=True, verbose_name="IP Status")
+
+    def __str__(self):
+        return self.ip
+
+    class Meta:
+        verbose_name_plural = "Devices in Net"

device/tests/test_device_detail_view.py

@@ -17,7 +17,7 @@ def test_device_detail_view(create_admin_user):
     fixture = create_admin_user()
     mixer.blend('inventory.DeviceCategory')
     mixer.blend('customer.Owner')
-    mixer.blend('inventory.Location')
+    mixer.blend('customer.Location')
     device = mixer.blend('inventory.Device',
                          customer=fixture['customer'],
                          owner=mixer.SELECT,

inventory/models/devices.py

@@ -1,72 +0,0 @@
-from django.db import models
-from core.models import Category, Company
-from customer.models import Customer, Owner
-from .location import Location
-from .user import User
-from .net import Net, IpStatus
-
-
-class DeviceManufacturer(Company):
-
-    class Meta:
-        verbose_name_plural = "Device Manufacturers"
-
-
-class DeviceCategory(Category):
-
-    class Meta:
-        verbose_name_plural = "Device Categories"
-
-
-class Device(models.Model):
-    name = models.CharField(max_length=50)
-    description = models.TextField(blank=True)
-    serialnumber = models.CharField(max_length=50, blank=True)
-    category = models.ForeignKey(DeviceCategory, on_delete=models.SET_NULL,
-                                 null=True, blank=True)
-    owner = models.ForeignKey(Owner, on_delete=models.SET_NULL, null=True, blank=True)
-    customer = models.ForeignKey(Customer, on_delete=models.CASCADE)
-    manufacturer = models.ForeignKey(DeviceManufacturer, models.SET_NULL,
-                                     null=True, blank=True)
-    location = models.ForeignKey(Location, models.SET_NULL, null=True,
-                                 blank=True)
-    user = models.ForeignKey(User, models.SET_NULL, null=True, blank=True)
-    installation_date = models.DateField(null=True, blank=True)
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        from django.urls import reverse
-        return reverse('device', args=[str(self.id)])
-
-
-class ConnectedDevice(Device):
-    net = models.ManyToManyField(Net, through='DeviceInNet')
-
-    @property
-    def ips(self):
-        nets = DeviceInNet.objects.filter(device=self.id)
-        ip_addresses = {}
-        for net in nets:
-            ip_addresses[net.net_id] = net.ip
-        return ip_addresses
-
-    class Meta:
-        verbose_name_plural = "Connected Devices"
-
-
-class DeviceInNet(models.Model):
-    device = models.ForeignKey(ConnectedDevice, on_delete=models.CASCADE)
-    net = models.ForeignKey(Net, on_delete=models.CASCADE)
-    ip = models.GenericIPAddressField(verbose_name="IP")
-    nic = models.CharField(max_length=50, blank=True, verbose_name="NIC")
-    mac_address = models.CharField(max_length=50, blank=True, verbose_name="MAC Address")
-    ip_status = models.ForeignKey(IpStatus, models.SET_NULL, null=True,
-                                  blank=True, verbose_name="IP Status")
-
-    def __str__(self):
-        return self.ip
-
-    class Meta:
-        verbose_name_plural = "Devices in Net"