Merge branch 'main' into 155analysis

.github/workflows/.deploy.yml

@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize
-        uses: bcgov-nr/action-deployer-openshift@v3.1.0
+        uses: bcgov-nr/action-deployer-openshift@v3.2.0
         with:
           oc_namespace: ${{ secrets.OC_NAMESPACE }}
           oc_server: ${{ vars.OC_SERVER }}
@@ -88,7 +88,7 @@ jobs:
             parameters:
               -p CPU_REQUEST=${{ inputs.frontend-cpu-request }}
     steps:
-      - uses: bcgov-nr/action-deployer-openshift@v3.1.0
+      - uses: bcgov-nr/action-deployer-openshift@v3.2.0
         with:
           file: ${{ matrix.name }}/openshift.deploy.yml
           oc_namespace: ${{ secrets.OC_NAMESPACE }}

backend/apps/animals/admin.py

@@ -3,3 +3,4 @@
 
 admin.site.register(Animals)
 admin.site.register(AnimalSubtype)
+admin.site.register(Breed)

backend/apps/animals/models.py

@@ -24,3 +24,13 @@ class AnimalSubtype(models.Model):
     class Meta:
         managed = False
         db_table = 'animal_subtype'
+
+class Breed(models.Model):
+    id = models.IntegerField(primary_key=True)
+    breedname = models.CharField(max_length=100)
+    animalid = models.IntegerField()
+    breedmanurefactor = models.FloatField()
+
+    class Meta:
+        managed = False
+        db_table = 'breed'

backend/apps/animals/serializers.py

@@ -10,3 +10,8 @@ class AnimalSubtypeSerializer(serializers.ModelSerializer):
     class Meta:
         model = AnimalSubtype
         fields = '__all__'
+
+class BreedSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Breed
+        fields = '__all__'

backend/apps/animals/urls.py

@@ -6,4 +6,5 @@
     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'})),
+    path('breeds/', AnimalsViewset.as_view({'get': 'breeds'})),
 ]

backend/apps/animals/views.py

@@ -21,3 +21,9 @@ def animalSubtypes(self, request, animalId=None):
             animals = AnimalSubtype.objects.filter(animalid=animalId)
         serializer = AnimalSubtypeSerializer(animals, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
+
+    @action(detail=True, methods=['get'])
+    def breeds(self, request):
+        breeds = Breed.objects.all()
+        serializer = BreedSerializer(breeds, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)

backend/apps/manure/models.py

@@ -0,0 +1,23 @@
+from django.db import models
+
+class SolidMaterialsConversionFactors(models.Model):
+    id = models.IntegerField(primary_key=True)
+    inputunit = models.IntegerField()
+    inputunitname = models.CharField(max_length=100)
+    cubicyardsoutput = models.CharField(max_length=100)
+    cubicmetersoutput = models.CharField(max_length=100)
+    metrictonsoutput = models.CharField(max_length=100)
+
+    class Meta:
+        managed = False
+        db_table = 'solid_materials_conversion_factors'
+
+class LiquidMaterialsConversionFactors(models.Model):
+    id = models.IntegerField(primary_key=True)
+    inputunit = models.IntegerField()
+    inputunitname = models.CharField(max_length=100)
+    usgallonsoutput = models.CharField(max_length=100)
+
+    class Meta:
+        managed = False
+        db_table = 'liquid_materials_conversion_factors'

backend/apps/manure/serializers.py

@@ -0,0 +1,12 @@
+from rest_framework import serializers
+from .models import *
+
+class SolidMaterialsConversionFactorsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = SolidMaterialsConversionFactors
+        fields = '__all__'
+
+class LiquidMaterialsConversionFactorsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = LiquidMaterialsConversionFactors
+        fields = '__all__'

backend/apps/manure/urls.py

@@ -0,0 +1,8 @@
+from django.urls import path
+from rest_framework import routers
+from .views import SolidMaterialsConversionFactorsViewset
+
+urlpatterns = [
+    path('solidmaterialsconversionfactors/', SolidMaterialsConversionFactorsViewset.as_view({'get': 'solidMaterialsConversionFactors'})),
+    path('liquidmaterialsconversionfactors/', SolidMaterialsConversionFactorsViewset.as_view({'get': 'liquidMaterialsConversionFactors'})),
+]

backend/apps/manure/views.py

@@ -0,0 +1,19 @@
+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 SolidMaterialsConversionFactorsViewset(viewsets.ViewSet):
+    @action(detail=True, methods=['get'])
+    def solidMaterialsConversionFactors(self, request):
+        solid_materials_conversion_factors = SolidMaterialsConversionFactors.objects.all()
+        serializer = SolidMaterialsConversionFactorsSerializer(solid_materials_conversion_factors, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    @action(detail=True, methods=['get'])
+    def liquidMaterialsConversionFactors(self, request):
+        liquid_materials_conversion_factors = LiquidMaterialsConversionFactors.objects.all()
+        serializer = LiquidMaterialsConversionFactorsSerializer(liquid_materials_conversion_factors, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+

backend/config/settings.py

@@ -61,6 +61,7 @@
     'apps.crops',
     'apps.animals',
     'apps.shared',
+    'apps.manure',
     'apps.fertilizers',
     'apps.manures',
 ]

backend/config/urls.py

@@ -29,6 +29,7 @@
     path('api/', include('apps.animals.urls')),
     path('api/', include('apps.crops.urls')),
     path('api/', include('apps.shared.urls')),
+    path('api/', include('apps.manure.urls')),
     path('api/', include('apps.fertilizers.urls')),
     path('api/', include('apps.manures.urls')),
 ]

database/db/seed_tables/_Breed/_Breed__20241212.csv

@@ -0,0 +1,44 @@
+Id,BreedName,AnimalId,BreedManureFactor,StaticDataVersionId
+1,Holstein,2,1,1
+2,Guernsey,2,0.68,1
+3,Brown Swiss,2,0.765,1
+1,Holstein,2,1,2
+2,Guernsey,2,0.68,2
+3,Brown Swiss,2,0.765,2
+1,Holstein,2,1,3
+2,Guernsey,2,0.68,3
+3,Brown Swiss,2,0.765,3
+1,Holstein,2,1,4
+2,Guernsey,2,0.68,4
+3,Brown Swiss,2,0.765,4
+1,Holstein,2,1,5
+3,Brown Swiss,2,0.765,5
+4,Ayrshire,2,0.791,5
+5,Jersey,2,0.68,5
+2,Guernsey,2,0.717,5
+4,Ayrshire,2,0.791,6
+5,Jersey,2,0.68,6
+2,Guernsey,2,0.717,6
+1,Holstein,2,1,6
+3,Brown Swiss,2,0.765,6
+1,Holstein,2,1,7
+2,Guernsey,2,0.68,7
+3,Brown Swiss,2,0.765,7
+3,Brown Swiss,2,0.765,8
+1,Holstein,2,1,8
+2,Guernsey,2,0.68,8
+2,Guernsey,2,0.68,9
+1,Holstein,2,1,9
+3,Brown Swiss,2,0.765,9
+2,Guernsey,2,0.68,10
+3,Brown Swiss,2,0.765,10
+1,Holstein,2,1,10
+1,Holstein,2,1,12
+2,Guernsey,2,0.68,12
+3,Brown Swiss,2,0.765,12
+1,Holstein,2,1,13
+2,Guernsey,2,0.68,13
+3,Brown Swiss,2,0.765,13
+1,Holstein,2,1,14
+2,Guernsey,2,0.68,14
+3,Brown Swiss,2,0.765,14

database/db/seed_tables/_Breed/init_breed.sql

@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS temp_breed (
+  Id INT NOT NULL,
+  BreedName VARCHAR(100) NOT NULL,
+  AnimalId INT NOT NULL,
+  BreedManureFactor FLOAT NOT NULL,
+  StaticDataVersionId INT NOT NULL,
+  PRIMARY KEY (Id, StaticDataVersionId)
+);
+\copy temp_breed (Id, BreedName, AnimalId, BreedManureFactor, StaticDataVersionId) from 'docker-entrypoint-initdb.d/_Breed__20241212.csv' with header delimiter ',' CSV ;
+SELECT * INTO breed
+FROM temp_breed
+WHERE StaticDataVersionId=14;
+ALTER TABLE breed
+DROP COLUMN StaticDataVersionId;

database/db/seed_tables/_CropTypes/init_crop_types.sql

@@ -9,8 +9,8 @@ CREATE TABLE IF NOT EXISTS temp_crop_types (
   PRIMARY KEY (Id, StaticDataVersionId)
 );
 \copy temp_crop_types (Id, Name, CoverCrop, CrudeProteinRequired, CustomCrop, ModifyNitrogen, StaticDataVersionId) from 'docker-entrypoint-initdb.d/_CropTypes__20241212.csv' with header delimiter ',' CSV ;
-SELECT * INTO crops_types
+SELECT * INTO crop_types
 FROM temp_crop_types
 WHERE StaticDataVersionId=14;
-ALTER TABLE crops_types
+ALTER TABLE crop_types
 DROP COLUMN StaticDataVersionId;

database/db/seed_tables/_LiquidMaterialsConversionFactors/_LiquidMaterialsConversionFactors__20241212(in).csv

@@ -0,0 +1,40 @@
+Id,InputUnit,InputUnitName,USGallonsOutput,StaticDataVersionId
+3,3,US gallons,1,1
+2,2,cubic meters,264.172,1
+1,1,Imp. gallons,1.20095,1
+3,3,US gallons,1,2
+2,2,cubic meters,264.172,2
+1,1,Imp. gallons,1.20095,2
+3,3,US gallons,1,3
+2,2,cubic meters,264.172,3
+1,1,Imp. gallons,1.20095,3
+3,3,US gallons,1,4
+2,2,cubic meters,264.172,4
+1,1,Imp. gallons,1.20095,4
+3,3,US gallons,1,5
+2,2,cubic meters,264.172,5
+1,1,Imp. gallons,1.20095,5
+3,3,US gallons,1,6
+2,2,cubic meters,264.172,6
+1,1,Imp. gallons,1.20095,6
+3,3,US gallons,1,7
+2,2,cubic meters,264.172,7
+1,1,Imp. gallons,1.20095,7
+3,3,US gallons,1,8
+2,2,cubic meters,264.172,8
+1,1,Imp. gallons,1.20095,8
+3,3,US gallons,1,9
+2,2,cubic meters,264.172,9
+1,1,Imp. gallons,1.20095,9
+3,3,US gallons,1,10
+2,2,cubic meters,264.172,10
+1,1,Imp. gallons,1.20095,10
+1,1,Imp. gallons,1.20095,12
+2,2,cubic meters,264.172,12
+3,3,US gallons,1,12
+1,1,Imp. gallons,1.20095,13
+2,2,cubic meters,264.172,13
+3,3,US gallons,1,13
+1,1,Imp. gallons,1.20095,14
+2,2,cubic meters,264.172,14
+3,3,US gallons,1,14

database/db/seed_tables/_LiquidMaterialsConversionFactors/init_liquid_materials_conversion_factors.sql

@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS temp_liquid_materials_conversion_factors (
+  Id INT NOT NULL,
+  InputUnit INT NOT NULL,
+  InputUnitName VARCHAR(100) NOT NULL,
+  USGallonsOutput VARCHAR(100) NOT NULL,
+  StaticDataVersionId INT NOT NULL,
+  PRIMARY KEY (Id, StaticDataVersionId)
+);
+\copy temp_liquid_materials_conversion_factors (Id, InputUnit, InputUnitName, USGallonsOutput, StaticDataVersionId ) from 'docker-entrypoint-initdb.d/_LiquidMaterialsConversionFactors__20241212(in).csv' with header delimiter ',' CSV ;
+SELECT * INTO liquid_materials_conversion_factors
+FROM temp_liquid_materials_conversion_factors
+WHERE StaticDataVersionId=14;
+ALTER TABLE liquid_materials_conversion_factors
+DROP COLUMN StaticDataVersionId;

database/db/seed_tables/_SolidMaterialsConversionFactors/_SolidMaterialsConversionFactors__20241212(in).csv

@@ -0,0 +1,53 @@
+Id,InputUnit,InputUnitName,CubicYardsOutput,CubicMetersOutput,MetricTonsOutput,StaticDataVersionId
+4,6,cubic yards,1,0.764555,1*density,1
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,1
+2,4,tons,1/density,(1/density)*0.764555,1,1
+1,2,cubic meters,1.30795,1,1.30795*density,1
+4,6,cubic yards,1,0.764555,1*density,2
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,2
+2,4,tons,1/density,(1/density)*0.764555,1,2
+1,2,cubic meters,1.30795,1,1.30795*density,2
+4,6,cubic yards,1,0.764555,1*density,3
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,3
+2,4,tons,1/density,(1/density)*0.764555,1,3
+1,2,cubic meters,1.30795,1,1.30795*density,3
+4,6,cubic yards,1,0.764555,1*density,4
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,4
+2,4,tons,1/density,(1/density)*0.764555,1,4
+1,2,cubic meters,1.30795,1,1.30795*density,4
+4,6,cubic yards,1,0.764555,1*density,5
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,5
+2,4,tons,1/density,(1/density)*0.764555,1,5
+1,2,cubic meters,1.30795,1,1.30795*density,5
+4,6,cubic yards,1,0.764555,1*density,6
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,6
+2,4,tons,1/density,(1/density)*0.764555,1,6
+1,2,cubic meters,1.30795,1,1.30795*density,6
+4,6,cubic yards,1,0.764555,1*density,7
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,7
+2,4,tons,1/density,(1/density)*0.764555,1,7
+1,2,cubic meters,1.30795,1,1.30795*density,7
+4,6,cubic yards,1,0.764555,1*density,8
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,8
+2,4,tons,1/density,(1/density)*0.764555,1,8
+1,2,cubic meters,1.30795,1,1.30795*density,8
+4,6,cubic yards,1,0.764555,1*density,9
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,9
+2,4,tons,1/density,(1/density)*0.764555,1,9
+1,2,cubic meters,1.30795,1,1.30795*density,9
+4,6,cubic yards,1,0.764555,1*density,10
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,10
+2,4,tons,1/density,(1/density)*0.764555,1,10
+1,2,cubic meters,1.30795,1,1.30795*density,10
+1,2,cubic meters,1.30795,1,1.30795*density,12
+2,4,tons,1/density,(1/density)*0.764555,1,12
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,12
+4,6,cubic yards,1,0.764555,1*density,12
+1,2,cubic meters,1.30795,1,1.30795*density,13
+2,4,tons,1/density,(1/density)*0.764555,1,13
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,13
+4,6,cubic yards,1,0.764555,1*density,13
+1,2,cubic meters,1.30795,1,1.30795*density,14
+2,4,tons,1/density,(1/density)*0.764555,1,14
+3,5,tonnes,1.10231/density,(1.10231/density)*0.764555,1.10231,14
+4,6,cubic yards,1,0.764555,1*density,14

database/db/seed_tables/_SolidMaterialsConversionFactors/init_solid_materials_conversion_factors.sql

@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS temp_solid_materials_conversion_factors (
+  Id INT NOT NULL,
+  InputUnit INT NOT NULL,
+  InputUnitName VARCHAR(100) NOT NULL,
+  CubicYardsOutput VARCHAR(100) NOT NULL,
+  CubicMetersOutput VARCHAR(100) NOT NULL,
+  MetricTonsOutput VARCHAR(100) NOT NULL,
+  StaticDataVersionId INT NOT NULL,
+  PRIMARY KEY (Id, StaticDataVersionId)
+);
+\copy temp_solid_materials_conversion_factors (Id, InputUnit, InputUnitName, CubicYardsOutput, CubicMetersOutput, MetricTonsOutput, StaticDataVersionId) from 'docker-entrypoint-initdb.d/_SolidMaterialsConversionFactors__20241212(in).csv' with header delimiter ',' CSV ;
+SELECT * INTO solid_materials_conversion_factors
+FROM temp_solid_materials_conversion_factors
+WHERE StaticDataVersionId=14;
+ALTER TABLE solid_materials_conversion_factors
+DROP COLUMN StaticDataVersionId;

database/db/trimmed_tables/_Breed/_Breed_202502180812.csv

@@ -0,0 +1,4 @@
+"id","breedname","animalid","breedmanurefactor"
+1,Holstein,2,1.0
+2,Guernsey,2,0.68
+3,Brown Swiss,2,0.765

database/db/trimmed_tables/_Breed/init_breed.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS breed (
+  Id INT PRIMARY KEY,
+  BreedName VARCHAR(100) NOT NULL,
+  AnimalId INT NOT NULL,
+  BreedManureFactor FLOAT NOT NULL
+);
+\copy breed (Id, BreedName, AnimalId, BreedManureFactor) from 'docker-entrypoint-initdb.d/_Breed_202502180812.csv' with header delimiter ',' CSV ;

database/db/trimmed_tables/_LiquidMaterialsConversionFactors/init_liquid_materials_conversion_factors.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS liquid_materials_conversion_factors (
+  Id INT PRIMARY KEY,
+  InputUnit INT NOT NULL,
+  InputUnitName VARCHAR(100) NOT NULL,
+  USGallonsOutput VARCHAR(100) NOT NULL
+);
+\copy liquid_materials_conversion_factors (Id, InputUnit, InputUnitName, USGallonsOutput) from 'docker-entrypoint-initdb.d/liquid_materials_conversion_factors_202502211207.csv' with header delimiter ',' CSV ;

database/db/trimmed_tables/_LiquidMaterialsConversionFactors/liquid_materials_conversion_factors_202502211207.csv

@@ -0,0 +1,4 @@
+"id","inputunit","inputunitname","usgallonsoutput"
+1,1,Imp. gallons,"1.20095"
+2,2,cubic meters,"264.172"
+3,3,US gallons,"1"

database/db/trimmed_tables/_SolidMaterialsConversionFactors/init_solid_materials_conversion_factors.sql

@@ -0,0 +1,9 @@
+CREATE TABLE IF NOT EXISTS solid_materials_conversion_factors (
+  Id INT PRIMARY KEY,
+  InputUnit INT NOT NULL,
+  InputUnitName VARCHAR(100) NOT NULL,
+  CubicYardsOutput VARCHAR(100) NOT NULL,
+  CubicMetersOutput VARCHAR(100) NOT NULL,
+  MetricTonsOutput VARCHAR(100) NOT NULL
+);
+\copy solid_materials_conversion_factors (Id, InputUnit, InputUnitName, CubicYardsOutput, CubicMetersOutput, MetricTonsOutput) from 'docker-entrypoint-initdb.d/solid_materials_conversion_factors_202502211120.csv' with header delimiter ',' CSV ;

database/db/trimmed_tables/_SolidMaterialsConversionFactors/solid_materials_conversion_factors_202502211120.csv

@@ -0,0 +1,5 @@
+"id","inputunit","inputunitname","cubicyardsoutput","cubicmetersoutput","metrictonsoutput"
+1,2,cubic meters,"1.30795","1","1.30795*density"
+2,4,tons,"1/density",(1/density)*0.764555,"1"
+3,5,tonnes,"1.10231/density",(1.10231/density)*0.764555,"1.10231"
+4,6,cubic yards,"1","0.764555","1*density"