[NR-NMP-149] Added regions and subregions

backend/apps/animals/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
-from .models import Animals
+from .models import *
 
 admin.site.register(Animals)
+admin.site.register(AnimalSubtype)

backend/apps/animals/models.py

@@ -7,4 +7,20 @@ class Animals(models.Model):
 
     class Meta:
         managed = False
-        db_table = 'animals'
+        db_table = 'animals'
+
+class AnimalSubtype(models.Model):
+    id = models.IntegerField(primary_key=True)
+    name = models.CharField(max_length=100)
+    liquidpergalperanimalperday = models.FloatField()
+    solidpergalperanimalperday = models.FloatField()
+    solidperpoundperanimalperday = models.FloatField()
+    solidliquidseparationpercentage = models.IntegerField()
+    washwater = models.FloatField()
+    milkproduction = models.FloatField()
+    animalid = models.IntegerField()
+    sortorder = models.IntegerField()
+
+    class Meta:
+        managed = False
+        db_table = 'animal_subtype'

backend/apps/animals/serializers.py

@@ -1,7 +1,12 @@
 from rest_framework import serializers
-from .models import Animals
+from .models import *
 
 class AnimalsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Animals
         fields = '__all__'
+
+class AnimalSubtypeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AnimalSubtype
+        fields = '__all__'

backend/apps/animals/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+from rest_framework import routers
+from .views import AnimalsViewset
+
+urlpatterns = [
+    path('animals/', AnimalsViewset.as_view({'get': 'animals'})),
+    path('animal_subtypes/', AnimalsViewset.as_view({'get': 'animalSubtypes'})),
+    path('animal_subtypes/<int:animalId>/', AnimalsViewset.as_view({'get': 'animalSubtypes'})),
+]

backend/apps/api/views.py → backend/apps/animals/views.py

@@ -1,21 +1,23 @@
 from rest_framework import status, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
-from apps.crops.models import CropTypes
-from apps.crops.serializers import CropTypesSerializer
-from apps.animals.models import *
-from apps.animals.serializers import *
+from .models import *
+from .serializers import *
 
-class APIViewSet(viewsets.ViewSet):
+class AnimalsViewset(viewsets.ViewSet):
 
     @action(detail=True, methods=['get'])
-    def cropTypes(self, request, pk=None):
-        crop_types = CropTypes.objects.all()
-        serializer = CropTypesSerializer(crop_types, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-    @action(detail=True, methods=['get'])
-    def animals(self, request, pk=None):
+    def animals(self, request):
         animals = Animals.objects.all()
         serializer = AnimalsSerializer(animals, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
+
+    @action(detail=True, methods=['get'])
+    def animalSubtypes(self, request, animalId=None):
+        animals = None
+        if animalId == None:
+            animals = AnimalSubtype.objects.all()
+        else:
+            animals = AnimalSubtype.objects.filter(animalid=animalId)
+        serializer = AnimalSubtypeSerializer(animals, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)

backend/apps/crops/urls.py

@@ -0,0 +1,7 @@
+from django.urls import path
+from rest_framework import routers
+from .views import CropsViewset
+
+urlpatterns = [
+    path('croptypes/', CropsViewset.as_view({'get': 'cropTypes'})),
+]

backend/apps/crops/views.py

@@ -0,0 +1,13 @@
+from rest_framework import status, viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from .models import *
+from .serializers import *
+
+class CropsViewset(viewsets.ViewSet):
+
+    @action(detail=True, methods=['get'])
+    def cropTypes(self, request):
+        crop_types = CropTypes.objects.all()
+        serializer = CropTypesSerializer(crop_types, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)

backend/apps/shared/models.py

@@ -0,0 +1,24 @@
+from django.db import models
+
+class Regions(models.Model):
+    id = models.IntegerField(primary_key=True)
+    name = models.CharField(max_length=100)
+    soiltestphosphorousregioncd = models.IntegerField()
+    soiltestpotassiumregioncd = models.IntegerField()
+    locationid = models.IntegerField()
+    sortorder = models.IntegerField()
+
+    class Meta:
+        managed = False
+        db_table = 'regions'
+
+class Subregion(models.Model):
+    id = models.IntegerField(primary_key=True)
+    name = models.CharField(max_length=100)
+    annualprecipitation = models.IntegerField()
+    annualprecipitationocttomar = models.IntegerField()
+    regionid = models.IntegerField()
+
+    class Meta:
+        managed = False
+        db_table = 'subregion'

backend/apps/shared/serializers.py

@@ -0,0 +1,12 @@
+from rest_framework import serializers
+from .models import *
+
+class RegionsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Regions
+        fields = '__all__'
+
+class SubregionSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Subregion
+        fields = '__all__'

backend/apps/shared/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+from rest_framework import routers
+from .views import SharedViewset
+
+urlpatterns = [
+    path('regions/', SharedViewset.as_view({'get': 'regions'})),
+    path('subregions/', SharedViewset.as_view({'get': 'subregions'})),
+    path('subregions/<int:regionId>/', SharedViewset.as_view({'get': 'subregions'})),
+]

backend/apps/shared/views.py

@@ -0,0 +1,23 @@
+from rest_framework import status, viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from .models import *
+from .serializers import *
+
+class SharedViewset(viewsets.ViewSet):
+
+    @action(detail=True, methods=['get'])
+    def regions(self, request):
+        regions = Regions.objects.all()
+        serializer = RegionsSerializer(regions, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    @action(detail=True, methods=['get'])
+    def subregions(self, request, regionId=None):
+        subregions = None
+        if regionId == None:
+            subregions = Subregion.objects.all()
+        else:
+            subregions = Subregion.objects.filter(regionid=regionId)
+        serializer = SubregionSerializer(subregions, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)

backend/config/settings.py

@@ -58,9 +58,9 @@
     'rest_framework',
 
     # Apps for this project
-    'apps.api',
     'apps.crops',
     'apps.animals',
+    'apps.shared',
 ]
 
 MIDDLEWARE = [

backend/config/urls.py

@@ -25,6 +25,8 @@
     path('admin/', admin.site.urls),
     # TODO: make a better accounts/login page
     path('accounts/', include('allauth.urls')),
-    path('healthcheck/', health_check, name='health_check'),
-    path('api/', include('apps.api.urls')),
+    path('healthcheck/', health_check),
+    path('api/', include('apps.animals.urls')),
+    path('api/', include('apps.crops.urls')),
+    path('api/', include('apps.shared.urls')),
 ]