Merge pull request #71 from 18F/consolidate-buy-models

Consolidate buy models

acquisitions/settings.py

@@ -55,7 +55,6 @@
     'markdown_deux',
     'floppyforms',
     'rest_framework_docs',
-    'drf_multiple_model',
 )
 
 MIDDLEWARE_CLASSES = (

nda/tests/test_buy_nda.py

@@ -1,6 +1,6 @@
 import pytest
 from django.contrib.auth.models import User, Group
-from projects.factories import AgileBPAFactory
+from projects.factories import BuyFactory
 from acquisitions.factories import UserFactory
 
 
@@ -16,7 +16,7 @@ def user(self):
     @pytest.fixture
     @pytest.mark.django_db
     def buy(self):
-        buy = AgileBPAFactory()
+        buy = BuyFactory()
         return buy
 
     @pytest.mark.django_db

projects/admin.py

@@ -7,13 +7,12 @@
 from projects.models import (
     Agency,
     AgencyOffice,
-    AgileBPA,
+    Buy,
     ContractingOffice,
     ContractingOfficer,
     ContractingOfficerRepresentative,
     ContractingSpecialist,
     IAA,
-    Micropurchase,
     Project,
 )
 from projects.widgets import DurationMultiWidget
@@ -29,7 +28,6 @@
     ContractingOfficerRepresentative,
     Agency,
     AgencyOffice,
-    Micropurchase,
 )
 class WorkAdmin(admin.ModelAdmin):
     pass
@@ -52,9 +50,9 @@ def get_readonly_fields(self, request, obj=None):
             return []
 
 
-class AgileBPAForm(forms.ModelForm):
+class BuyForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
-        super(AgileBPAForm, self).__init__(*args, **kwargs)
+        super(BuyForm, self).__init__(*args, **kwargs)
 
         # Limit the queryset for the technical evaluation panel to team members
         # for this project
@@ -94,17 +92,17 @@ def __init__(self, *args, **kwargs):
     )
 
     class Meta:
-        model = AgileBPA
+        model = Buy
         exclude = ('nda_signed',)
         widgets = {
             'base_period_length': DurationMultiWidget(),
             'option_period_length': DurationMultiWidget(),
         }
 
 
-@admin.register(AgileBPA)
-class AgileBPAAdmin(admin.ModelAdmin):
-    form = AgileBPAForm
+@admin.register(Buy)
+class BuyAdmin(admin.ModelAdmin):
+    form = BuyForm
     filter_horizontal = ('technical_evaluation_panel',)
     fieldsets = (
         (None, {

projects/factories.py

@@ -6,8 +6,7 @@
 from projects.models import (
     IAA,
     Project,
-    AgileBPA,
-    Micropurchase,
+    Buy,
     ContractingOffice,
     ContractingSpecialist,
     ContractingOfficer,
@@ -119,48 +118,30 @@ class Meta:
         ContractingOfficeFactory
     )
 
+procurement_methods = [x[0] for x in Buy.PROCUREMENT_METHOD_CHOICES]
+def generate_procurement_method():
+    return random.choice(procurement_methods)
 
-class AgileBPAFactory(factory.django.DjangoModelFactory):
+class BuyFactory(factory.django.DjangoModelFactory):
     class Meta:
-        model = AgileBPA
-
-    project = factory.SubFactory(
-        ProjectFactory,
-        public=factory.SelfAttribute('..public')
-    )
-    description = factory.Faker('paragraph')
-    name = factory.Faker('catch_phrase')
-    public = factory.Faker('boolean')
-
-    @factory.lazy_attribute
-    def dollars(self):
-        min = 500
-        max = self.project.dollars
-        return random.randint(min, max)
-
-
-class AddAgileBPAFactory(AgileBPAFactory):
-    project = factory.Iterator(Project.objects.all())
+        model = Buy
 
 
-class MicropurchaseFactory(factory.django.DjangoModelFactory):
-    class Meta:
-        model = Micropurchase
-
     project = factory.SubFactory(
         ProjectFactory,
         public=factory.SelfAttribute('..public')
     )
+    procurement_method = factory.LazyFunction(generate_procurement_method)
     description = factory.Faker('paragraph')
     name = factory.Faker('catch_phrase')
     public = factory.Faker('boolean')
 
     @factory.lazy_attribute
     def dollars(self):
         min = 500
-        max = 3500
+        max = self.project.dollars
         return random.randint(min, max)
 
 
-class AddMicropurchaseFactory(MicropurchaseFactory):
+class AddBuyFactory(BuyFactory):
     project = factory.Iterator(Project.objects.all())

projects/filters.py

@@ -1,20 +1,12 @@
 import django_filters
-from projects.models import IAA, Project, AgileBPA, Micropurchase
+from projects.models import IAA, Project, Buy
 
 
-class AgileBPAFilter(django_filters.rest_framework.FilterSet):
+class BuyFilter(django_filters.rest_framework.FilterSet):
     project_id = django_filters.CharFilter(name="project__id")
 
     class Meta:
-        model = AgileBPA
-        fields = ['id', 'name', 'project_id']
-
-
-class MicropurchaseFilter(django_filters.rest_framework.FilterSet):
-    project_id = django_filters.CharFilter(name="project__id")
-
-    class Meta:
-        model = Micropurchase
+        model = Buy
         fields = ['id', 'name', 'project_id']
 
 

projects/management/commands/create_buys.py

@@ -1,10 +1,8 @@
 #! /usr/bin/env python3
 from django.core.management.base import BaseCommand, CommandError
 from projects.factories import (
-    AgileBPAFactory,
-    AddAgileBPAFactory,
-    MicropurchaseFactory,
-    AddMicropurchaseFactory,
+    BuyFactory,
+    AddBuyFactory,
 )
 
 
@@ -29,8 +27,6 @@ def handle(self, *args, **options):
         number = int(options['number'])
 
         if options['add']:
-            AddAgileBPAFactory.create_batch(number)
-            AddMicropurchaseFactory.create_batch(number)
+            AddBuyFactory.create_batch(number)
         else:
-            AgileBPAFactory.create_batch(number)
-            MicropurchaseFactory.create_batch(number)
+            BuyFactory.create_batch(number)