From f35364d02c3ea6998d4f9d55e05775e27cbb4a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Thu, 11 Jan 2018 11:52:15 +0100 Subject: [PATCH 1/3] Update location handling --- ofu_app/apps/donar/models.py | 2 +- .../migrations/0003_auto_20180111_1114.py | 20 +++++++++++++++++++ ofu_app/apps/food/models.py | 6 +++++- ofu_app/apps/food/utils/migrate_data.py | 16 +++++++++++++-- ofu_app/apps/food/views.py | 2 +- 5 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 ofu_app/apps/food/migrations/0003_auto_20180111_1114.py diff --git a/ofu_app/apps/donar/models.py b/ofu_app/apps/donar/models.py index d88ea27..9b94e33 100644 --- a/ofu_app/apps/donar/models.py +++ b/ofu_app/apps/donar/models.py @@ -48,7 +48,7 @@ class Lecture(models.Model): class Lecture_Terms(models.Model): id = models.AutoField(primary_key=True) - starttime = models.TimeField(blank=False, default=timezone.now()) + starttime = models.TimeField(blank=False) room = models.ManyToManyField('Room', blank=True) def __str__(self): diff --git a/ofu_app/apps/food/migrations/0003_auto_20180111_1114.py b/ofu_app/apps/food/migrations/0003_auto_20180111_1114.py new file mode 100644 index 0000000..f7ba76b --- /dev/null +++ b/ofu_app/apps/food/migrations/0003_auto_20180111_1114.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2018-01-11 10:14 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('food', '0002_auto_20180105_1449'), + ] + + operations = [ + migrations.AlterField( + model_name='menu', + name='location', + field=models.CharField(choices=[('ERBA', 'Erba'), ('MARKUSPLATZ', 'Markusplatz'), ('FEKI', 'Feldkirchenstrasse'), ('AUSTRASSE', 'Austrasse')], max_length=60), + ), + ] diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py index 20e2fb0..7f69267 100644 --- a/ofu_app/apps/food/models.py +++ b/ofu_app/apps/food/models.py @@ -11,15 +11,19 @@ from django.core.files.uploadedfile import SimpleUploadedFile from django.db import models from django.utils import timezone from django.utils.encoding import smart_text +from enum import Enum MAX_LENGTH = 60 +LOCATION_CHOICES = ( +('ERBA', 'Erba'), ('MARKUSPLATZ', 'Markusplatz'), ('FEKI', 'Feldkirchenstrasse'), ('AUSTRASSE', 'Austrasse')) + # Create your models here. class Menu(models.Model): id = models.AutoField(primary_key=True) date = models.DateField(default=timezone.now) - location = models.CharField(max_length=MAX_LENGTH) + location = models.CharField(max_length=MAX_LENGTH, choices=LOCATION_CHOICES) menu = models.ManyToManyField("SingleFood", related_name="foods") class Meta: diff --git a/ofu_app/apps/food/utils/migrate_data.py b/ofu_app/apps/food/utils/migrate_data.py index 027e469..a1dffa7 100644 --- a/ofu_app/apps/food/utils/migrate_data.py +++ b/ofu_app/apps/food/utils/migrate_data.py @@ -2,7 +2,7 @@ import json from datetime import datetime from pprint import pprint from django.db.utils import IntegrityError -from apps.food.models import SingleFood, Menu, HappyHour, Allergene +from apps.food.models import SingleFood, Menu, HappyHour, Allergene, LOCATION_CHOICES from apps.food.utils.parser import mensa_page_parser, fekide_happyhour_page_parser, cafete_page_parser # CONFIG SERVICE LINKS @@ -12,12 +12,23 @@ LINK_ERBA_CAFETE = "https://www.studentenwerk-wuerzburg.de/bamberg/essen-trinken LINK_MARKUS_CAFETE = "https://www.studentenwerk-wuerzburg.de/bamberg/essen-trinken/sonderspeiseplaene/cafeteria-markusplatz.html" LINK_FEKIDE_GUIDE = "https://www.feki.de/happyhour" +LOCATION_NAMES = ('erba', 'markusplatz', 'feldkirchenstraße', 'austraße') + def getJsonFromFile(path): with open(path, "r") as file: return json.load(file) +def getLocation(raw_loc): + for choice, name in zip(LOCATION_CHOICES, LOCATION_NAMES): + print(name.upper() in str(raw_loc).upper()) + if (name.upper() in str(raw_loc).upper()): + return choice + + print("LOCATION NOT FOUND") + + def writeStudentenwerkDataInDB(data): data = json.loads(data) pprint(data) @@ -69,8 +80,9 @@ def writeStudentenwerkDataInDB(data): db_single_food.allergens = allergens foodlist.append(db_single_food) try: + date = datetime.strptime(str(menu['date']), "%d.%m.").replace(year=datetime.today().year) - menu = Menu.objects.create(location=data['name'], date=date) + menu = Menu.objects.create(location=getLocation(data['name']), date=date) menu.menu.set(foodlist) menu.save() except IntegrityError as error: diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py index 64f7417..5aa30df 100644 --- a/ofu_app/apps/food/views.py +++ b/ofu_app/apps/food/views.py @@ -17,7 +17,7 @@ from apps.food.models import Menu, HappyHour, SingleFood, UserRating, UserFoodIm def daily_food(request): today = datetime.datetime.now() start_week = today - datetime.timedelta(today.weekday()) - end_week = start_week + datetime.timedelta(20) + end_week = start_week + datetime.timedelta(7) feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last() austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last() From bdc6d36ce4fcadec5479abe6d19c95421ad568b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Fri, 12 Jan 2018 23:13:54 +0100 Subject: [PATCH 2/3] Fix location choices bug --- .../migrations/0003_auto_20180111_1246.py | 20 +++++++++ ofu_app/apps/food/api/serializers.py | 1 + ofu_app/apps/food/api/urls.py | 5 ++- ofu_app/apps/food/api/views.py | 44 +++++++++---------- .../migrations/0004_auto_20180111_1246.py | 40 +++++++++++++++++ ofu_app/apps/food/models.py | 12 +++-- ofu_app/apps/food/utils/migrate_data.py | 4 +- ofu_app/apps/food/views.py | 16 +++---- 8 files changed, 102 insertions(+), 40 deletions(-) create mode 100644 ofu_app/apps/donar/migrations/0003_auto_20180111_1246.py create mode 100644 ofu_app/apps/food/migrations/0004_auto_20180111_1246.py diff --git a/ofu_app/apps/donar/migrations/0003_auto_20180111_1246.py b/ofu_app/apps/donar/migrations/0003_auto_20180111_1246.py new file mode 100644 index 0000000..f54c8f5 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0003_auto_20180111_1246.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2018-01-11 11:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0002_auto_20180105_1449'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(), + ), + ] diff --git a/ofu_app/apps/food/api/serializers.py b/ofu_app/apps/food/api/serializers.py index 958bde6..19cd1c8 100644 --- a/ofu_app/apps/food/api/serializers.py +++ b/ofu_app/apps/food/api/serializers.py @@ -27,6 +27,7 @@ class SingleFoodSerializer(serializers.HyperlinkedModelSerializer): class MenuSerializer(serializers.HyperlinkedModelSerializer): date = serializers.DateField(format='iso-8601') menu = SingleFoodSerializer(many=True, read_only=True) + location = serializers.ChoiceField(choices=Menu.LOCATION_CHOICES) class Meta: model = Menu diff --git a/ofu_app/apps/food/api/urls.py b/ofu_app/apps/food/api/urls.py index 8ed5ff1..5cd1457 100644 --- a/ofu_app/apps/food/api/urls.py +++ b/ofu_app/apps/food/api/urls.py @@ -15,16 +15,17 @@ Including another URLconf """ from django.conf.urls import url from apps.food.api import views as api_views +from apps.food.models import Menu urlpatterns = [ # API Version 1.1 url(r'^food/$', api_views.FoodViewSetV1_1.as_view({'get': 'list'})), - url(r'^food/(?Pfeldkirchenstrasse|markusstrasse|erba|austrasse)/$', + url(r'^food/(?P' + Menu.FEKI + '|' + Menu.MARKUSPLATZ + '|' + Menu.ERBA + '|' + Menu.AUSTRASSE + ')/$', api_views.FoodViewSetV1_1.as_view({'get': 'list'})), url(r'food/(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/$', api_views.FoodViewSetV1_1.as_view({'get': 'list'})), url( - r'food/(?Pfeldkirchenstrasse|markusstrasse|erba|austrasse)/(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/$', + r'food/(?P' + Menu.FEKI + '|' + Menu.MARKUSPLATZ + '|' + Menu.ERBA + '|' + Menu.AUSTRASSE + ')/(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/$', api_views.FoodViewSetV1_1.as_view({'get': 'list'})), url(r'food/today/$', api_views.FoodViewSetV1_1.as_view({'get': 'list'})), url(r'food/week/$', api_views.FoodViewSetV1_1.as_view({'get': 'list'})), diff --git a/ofu_app/apps/food/api/views.py b/ofu_app/apps/food/api/views.py index 93cfa9d..5ec88f1 100644 --- a/ofu_app/apps/food/api/views.py +++ b/ofu_app/apps/food/api/views.py @@ -25,18 +25,17 @@ class FoodViewSet(viewsets.ModelViewSet, ): queryset = Menu.objects.all() location = self.request.query_params.get('location') date = self.request.query_params.get('date') - + print(str(location).upper() == Menu.ERBA.upper()) if location: - locations = ["erba", "feldkirchenstrasse", "austrasse", "markusplatz"] - if locations.__contains__(location): - if location == locations[0]: - queryset = queryset.filter(location__contains="Erba") - elif location == locations[1]: - queryset = queryset.filter(location__contains="Feldkirchen") - elif location == locations[2]: - queryset = queryset.filter(location__contains="austraße") - elif location == locations[3]: - queryset = queryset.filter(location__contains="markusplatz") + print(str(location).upper() == Menu.ERBA.upper()) + if str(location).upper() is Menu.ERBA.upper(): + queryset = queryset.filter(location_contains='Erba') + elif str(location).upper() is Menu.FEKI.upper(): + queryset = queryset.filter(location=Menu.FEKI) + elif str(location).upper() is Menu.AUSTRASSE.upper(): + queryset = queryset.filter(location=Menu.AUSTRASSE) + elif str(location).upper() is Menu.MARKUSPLATZ.upper(): + queryset = queryset.filter(location=Menu.MARKUSPLATZ) if date: if date == "week": today = datetime.now() @@ -82,19 +81,16 @@ class FoodViewSetV1_1(viewsets.ModelViewSet, ): day = self.kwargs['day'] if location: - # TODO better way to get location list - locations = ["erba", "feldkirchenstrasse", "austrasse", "markusstrasse"] - if locations.__contains__(location): - print("Location: " + str(location)) - if location == locations[0]: - queryset = queryset.filter(location__contains="Erba") - elif location == locations[1]: - queryset = queryset.filter(location__contains="Feldkirchen") - elif location == locations[2]: - queryset = queryset.filter(location__contains="Austraße") - elif location == locations[3]: - queryset = queryset.filter(location__contains="Markusplatz") - + if str(location).upper() == Menu.ERBA.upper(): + queryset = queryset.filter(location__contains=Menu.ERBA) + elif str(location).upper() == Menu.FEKI.upper(): + queryset = queryset.filter(location__contains=Menu.FEKI) + elif str(location).upper() == Menu.AUSTRASSE.upper(): + print("Before: " + str(queryset)) + queryset = queryset.filter(location__contains=Menu.AUSTRASSE) + elif str(location).upper() == Menu.MARKUSPLATZ.upper(): + queryset = queryset.filter(location__contains=Menu.MARKUSPLATZ) + print(queryset) if year and month and day: date = '%s-%s-%s' % (year, month, day) queryset = queryset.filter(date=datetime.strptime(date, '%Y-%m-%d')) diff --git a/ofu_app/apps/food/migrations/0004_auto_20180111_1246.py b/ofu_app/apps/food/migrations/0004_auto_20180111_1246.py new file mode 100644 index 0000000..fd91cb6 --- /dev/null +++ b/ofu_app/apps/food/migrations/0004_auto_20180111_1246.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2018-01-11 11:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('food', '0003_auto_20180111_1114'), + ] + + operations = [ + migrations.AlterField( + model_name='allergene', + name='name', + field=models.CharField(max_length=256, unique=True), + ), + migrations.AlterField( + model_name='happyhour', + name='description', + field=models.CharField(max_length=256), + ), + migrations.AlterField( + model_name='happyhour', + name='location', + field=models.CharField(max_length=256), + ), + migrations.AlterField( + model_name='menu', + name='location', + field=models.CharField(choices=[('ERBA', 'Erba'), ('MARKUSPLATZ', 'Markusplatz'), ('FEKI', 'Feldkirchenstrasse'), ('AUSTRASSE', 'Austrasse')], max_length=256), + ), + migrations.AlterField( + model_name='singlefood', + name='name', + field=models.CharField(max_length=256, unique=True), + ), + ] diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py index 7f69267..7e8c1cd 100644 --- a/ofu_app/apps/food/models.py +++ b/ofu_app/apps/food/models.py @@ -13,14 +13,18 @@ from django.utils import timezone from django.utils.encoding import smart_text from enum import Enum -MAX_LENGTH = 60 - -LOCATION_CHOICES = ( -('ERBA', 'Erba'), ('MARKUSPLATZ', 'Markusplatz'), ('FEKI', 'Feldkirchenstrasse'), ('AUSTRASSE', 'Austrasse')) +MAX_LENGTH = 256 # Create your models here. class Menu(models.Model): + ERBA = 'ERBA' + MARKUSPLATZ = 'MARKUSPLATZ' + FEKI = 'FEKI' + AUSTRASSE = 'AUSTRASSE' + + LOCATION_CHOICES = ( + (ERBA, 'Erba'), (MARKUSPLATZ, 'Markusplatz'), (FEKI, 'Feldkirchenstrasse'), (AUSTRASSE, 'Austrasse')) id = models.AutoField(primary_key=True) date = models.DateField(default=timezone.now) location = models.CharField(max_length=MAX_LENGTH, choices=LOCATION_CHOICES) diff --git a/ofu_app/apps/food/utils/migrate_data.py b/ofu_app/apps/food/utils/migrate_data.py index a1dffa7..0b50d69 100644 --- a/ofu_app/apps/food/utils/migrate_data.py +++ b/ofu_app/apps/food/utils/migrate_data.py @@ -2,7 +2,7 @@ import json from datetime import datetime from pprint import pprint from django.db.utils import IntegrityError -from apps.food.models import SingleFood, Menu, HappyHour, Allergene, LOCATION_CHOICES +from apps.food.models import SingleFood, Menu, HappyHour, Allergene from apps.food.utils.parser import mensa_page_parser, fekide_happyhour_page_parser, cafete_page_parser # CONFIG SERVICE LINKS @@ -21,7 +21,7 @@ def getJsonFromFile(path): def getLocation(raw_loc): - for choice, name in zip(LOCATION_CHOICES, LOCATION_NAMES): + for choice, name in zip(Menu.LOCATION_CHOICES, LOCATION_NAMES): print(name.upper() in str(raw_loc).upper()) if (name.upper() in str(raw_loc).upper()): return choice diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py index 5aa30df..566fb6a 100644 --- a/ofu_app/apps/food/views.py +++ b/ofu_app/apps/food/views.py @@ -19,17 +19,17 @@ def daily_food(request): start_week = today - datetime.timedelta(today.weekday()) end_week = start_week + datetime.timedelta(7) - feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last() - austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last() - erba_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="Erba").last() - markus_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="markus").last() + feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains=Menu.FEKI).last() + austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains=Menu.AUSTRASSE).last() + erba_cafete = Menu.objects.filter(date__exact=today).filter(location__contains=Menu.ERBA).last() + markus_cafete = Menu.objects.filter(date__exact=today).filter(location__contains=Menu.MARKUSPLATZ).last() happy_hours = HappyHour.objects.filter(date__exact=today) weekly_menus = Menu.objects.filter(date__gte=start_week, date__lte=end_week) - weekly_feki_menu = weekly_menus.filter(location__contains="Feldkirchenstraße") - weekly_austr_menu = weekly_menus.filter(location__contains="Austraße") - weekly_erba_cafete = weekly_menus.filter(location__contains="Erba") - weekly_markus_cafete = weekly_menus.filter(location__contains="markus") + weekly_feki_menu = weekly_menus.filter(location__contains=Menu.FEKI) + weekly_austr_menu = weekly_menus.filter(location__contains=Menu.AUSTRASSE) + weekly_erba_cafete = weekly_menus.filter(location__contains=Menu.ERBA) + weekly_markus_cafete = weekly_menus.filter(location__contains=Menu.MARKUSPLATZ) return render(request, "food/daily_food.jinja", { 'day': today, From a93859167ab6d0cc00b8d7a2b017e0b8aa12e14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Fri, 12 Jan 2018 23:24:27 +0100 Subject: [PATCH 3/3] Update picture upload --- ofu_app/apps/food/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py index 7e8c1cd..2cd872c 100644 --- a/ofu_app/apps/food/models.py +++ b/ofu_app/apps/food/models.py @@ -10,7 +10,7 @@ from django.contrib.auth.models import User from django.core.files.uploadedfile import SimpleUploadedFile from django.db import models from django.utils import timezone -from django.utils.encoding import smart_text +from django.utils.encoding import smart_str from enum import Enum MAX_LENGTH = 256 @@ -114,7 +114,7 @@ class UserFoodImage(models.Model): suf = SimpleUploadedFile(os.path.split(self.image.name)[-1], temp_handle.read(), content_type='image/jpg') - str_food = smart_text(self.food.name, encoding='utf-8') + str_food = smart_str(self.food.name, encoding='utf-8') self.thumb.save('%s_%s_thumbnail.%s' % (str_food, self.user.username, 'jpg'), suf, save=False) # save the image object self.image.name = "%s_%s_original.%s" % (str_food, self.user.username, 'jpg')