Merge branch 'bugfixing' into 'staging'

Bugfixing

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!103

api/migrations/0002_programprogress.py → api/migrations/0002_auto_20201220_1630.py

-# Generated by Django 3.0.7 on 2020-10-26 09:14
+# Generated by Django 3.0.7 on 2020-12-20 09:30
 
 import api.utils
+from decimal import Decimal
 import django.contrib.postgres.fields.citext
+import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 import uuid
@@ -14,6 +16,21 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='product',
+            name='modal',
+            field=models.DecimalField(decimal_places=2, default=Decimal('0'), max_digits=12, validators=[django.core.validators.MinValueValidator(Decimal('0.01'))], verbose_name='modal'),
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='profit',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True, validators=[django.core.validators.MinValueValidator(Decimal('0.01'))], verbose_name='profit'),
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='total_profit',
+            field=models.DecimalField(blank=True, decimal_places=2, default=Decimal('0'), max_digits=12, null=True, validators=[django.core.validators.MinValueValidator(Decimal('0.01'))], verbose_name='total profit'),
+        ),
         migrations.CreateModel(
             name='ProgramProgress',
             fields=[

api/migrations/0003_auto_20201124_1931.py

-# Generated by Django 3.0.7 on 2020-11-24 12:31
-
-from decimal import Decimal
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0002_programprogress'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='product',
-            name='modal',
-            field=models.DecimalField(decimal_places=2, default=Decimal('0'), max_digits=12, validators=[django.core.validators.MinValueValidator(Decimal('0.01'))], verbose_name='modal'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='profit',
-            field=models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True, validators=[django.core.validators.MinValueValidator(Decimal('0.01'))], verbose_name='profit'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='total_profit',
-            field=models.DecimalField(blank=True, decimal_places=2, default=Decimal('0'), max_digits=12, null=True, validators=[django.core.validators.MinValueValidator(Decimal('0.01'))], verbose_name='total profit'),
-        ),
-    ]

api/migrations/0004_auto_20201218_1532.py

-# Generated by Django 3.0.7 on 2020-12-18 08:32
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0003_auto_20201124_1931'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='product',
-            name='pre_order',
-        ),
-        migrations.RemoveField(
-            model_name='transactionitem',
-            name='product_pre_order',
-        ),
-    ]

api/models.py

@@ -133,6 +133,7 @@ class Product(db_models.Model):
         verbose_name=_('price')
     )
     stock = db_models.PositiveIntegerField(blank=True, null=True, verbose_name=_('stock'))
+    pre_order = db_models.BooleanField(default=False, verbose_name=_('pre-order'))
     modal = db_models.DecimalField(
         decimal_places=2,
         default=decimal.Decimal('0'),
@@ -140,6 +141,7 @@ class Product(db_models.Model):
         validators=[validators.MinValueValidator(decimal.Decimal('0.01'))],
         verbose_name=_('modal')
     )
+    
     profit= db_models.DecimalField(
         blank=True,
         null=True,
@@ -168,6 +170,11 @@ class Product(db_models.Model):
         verbose_name = _('product')
         verbose_name_plural = _('products')
 
+    def save(self, *args, **kwargs): # pylint: disable=arguments-differ
+        if (self.pre_order) and (self.stock is not None):
+            self.stock = None
+        super().save(*args, **kwargs)
+
     def __str__(self):
         return self.code
 
@@ -369,6 +376,7 @@ class TransactionItem(db_models.Model):
         validators=[validators.MinValueValidator(decimal.Decimal('0.01'))],
         verbose_name=_('product price')
     )
+    product_pre_order = db_models.BooleanField(verbose_name=_('product pre-order'))
     quantity = db_models.PositiveIntegerField(verbose_name=_('quantity'))
 
     class Meta:

api/reports_writer.py

@@ -246,6 +246,7 @@ def create_transaction_report(filter_params): # pylint: disable=too-many-locals
         (transaction_item_transaction_transaction_number_with_hyperlink, _('Transaction Number')),
         ('product_name', _('Product Name')),
         ('product_price', _('Product Price')),
+        ('product_pre_order', _('Product Pre-Order')),
         ('quantity', _('Quantity')),
     ]
     write_queryset_data_to_worksheet(

api/serializers.py

@@ -261,6 +261,7 @@ class ProductSerializer(serializers.ModelSerializer):
             'description',
             'price',
             'stock',
+            'pre_order',
             'modal',
             'profit',
             'image',
@@ -269,6 +270,17 @@ class ProductSerializer(serializers.ModelSerializer):
         model = models.Product
         read_only_fields = ['id', 'code']
 
+    def validate(self, attrs):
+        instance = self.instance
+        stock = attrs.get('stock', getattr(instance, 'stock', None))
+        pre_order = attrs.get('pre_order', getattr(instance, 'pre_order', None))
+        errors = {}
+        if (stock is None) and (not pre_order):
+            errors['stock'] = _('Stock cannot be empty if it is not a pre-order.')
+        if errors:
+            raise serializers.ValidationError(errors)
+        return super().validate(attrs)
+
 
 class CartItemSerializer(serializers.ModelSerializer):
     product = ProductSerializer(read_only=True)
@@ -306,6 +318,7 @@ class TransactionItemSerializer(serializers.ModelSerializer):
             'product_code',
             'product_name',
             'product_price',
+            'product_pre_order',
             'quantity',
         ]
         model = models.TransactionItem
@@ -314,6 +327,7 @@ class TransactionItemSerializer(serializers.ModelSerializer):
             'product',
             'product_name',
             'product_price',
+            'product_pre_order',
             'quantity',
         ]
 

api/signals.py

@@ -71,10 +71,12 @@ def fill_dependent_transaction_item_fields(sender, instance, **_kwargs):
         if instance.product is None:
             instance.product_name = None
             instance.product_price = None
+            instance.product_pre_order = None
             
         else:
             instance.product_name = instance.product.name
             instance.product_price = instance.product.price
+            instance.product_pre_order = instance.product.pre_order
             
 
 

api/tests.py

@@ -1168,6 +1168,7 @@ class ProductTest(rest_framework_test.APITestCase):
 
     def test_create_product_success(self):
         data = seeds.PRODUCT_DATA
+        data['pre_order'] = True
         data['subcategory']= self.subcategory.id
         
         response = request(
@@ -1183,7 +1184,7 @@ class ProductTest(rest_framework_test.APITestCase):
 
     def test_create_product_fail(self):
         data = dict(seeds.PRODUCT_DATA, subcategory=self.subcategory.id)
-        data['name'] = None
+        data['stock'] = None
         response = request(
             'POST',
             'product-list',