update establishment model, migrations

This commit is contained in:
evgeniy-st 2019-08-27 14:23:11 +03:00
parent c942f00bd6
commit 910027d10f
4 changed files with 13 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# Generated by Django 2.2.4 on 2019-08-27 09:29
# Generated by Django 2.2.4 on 2019-08-27 11:22
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
@ -56,6 +56,7 @@ class Migration(migrations.Migration):
('description', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=None, help_text='{"en":"some text"}', null=True, verbose_name='Description')),
('public_mark', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Public mark')),
('toque_number', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Toque number')),
('price_level', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Price level')),
('address', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='location.Address', verbose_name='Address')),
('establishment_subtypes', models.ManyToManyField(related_name='subtype_establishment', to='establishment.EstablishmentSubType', verbose_name='Subtype')),
('establishment_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='establishment', to='establishment.EstablishmentType', verbose_name='Type')),

View File

@ -88,6 +88,9 @@ class Establishment(ProjectBaseMixin, ImageMixin):
address = models.ForeignKey(Address, blank=True, null=True, default=None,
on_delete=models.PROTECT,
verbose_name=_('Address'))
price_level = models.PositiveIntegerField(blank=True, null=True,
default=None,
verbose_name=_('Price level'))
objects = EstablishmentManager()
@ -104,7 +107,7 @@ class Establishment(ProjectBaseMixin, ImageMixin):
@property
def subtypes(self):
return EstablishmentSubType.objects.filter(
establishments=self,
subtype_establishment=self,
establishment_type=self.establishment_type,
establishment_type__use_subtypes=True)

View File

@ -1,6 +1,7 @@
"""Establishment serializers."""
from rest_framework import serializers
from establishment import models
from location.serializers import AddressSerializer
class EstablishmentTypeSerializer(serializers.ModelSerializer):
@ -10,7 +11,7 @@ class EstablishmentTypeSerializer(serializers.ModelSerializer):
"""Meta class."""
model = models.EstablishmentType
fields = ('id', 'name', 'use_subtypes')
fields = ('id', 'name',)
class EstablishmentSubTypeSerializer(serializers.ModelSerializer):
@ -30,6 +31,7 @@ class EstablishmentSerializer(serializers.ModelSerializer):
description_trans = serializers.CharField()
type = EstablishmentTypeSerializer(source='establishment_type')
subtypes = EstablishmentSubTypeSerializer(many=True)
address = AddressSerializer()
class Meta:
"""Meta class."""
@ -40,7 +42,9 @@ class EstablishmentSerializer(serializers.ModelSerializer):
'name_trans',
'description_trans',
'public_mark',
'price_level',
'type',
'subtypes',
'image',
'address',
)

View File

@ -88,6 +88,8 @@ class Address(models.Model):
_('Coordinates'), blank=True, null=True, default=None)
class Meta:
"""Meta class."""
verbose_name_plural = _('Address')
verbose_name = _('Address')