From e30af924f0c5be34e3c2f9b8c53af66bc87d9782 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 4 Feb 2021 11:22:25 +0000 Subject: [PATCH] added missing history field to Company --- companies/models.py | 3 ++- core/views.py | 5 +++++ history/models.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/companies/models.py b/companies/models.py index 3fb2ab7..73fe716 100644 --- a/companies/models.py +++ b/companies/models.py @@ -44,7 +44,8 @@ class Company(models.Model): # internal created = models.DateTimeField('date of creation', auto_now_add=True) updated = models.DateTimeField('date last update', auto_now=True) - creator = models.ForeignKey('core.CustomUser', on_delete=models.DO_NOTHING, null=True, related_name='creator') + creator = models.ForeignKey('core.CustomUser', on_delete=models.DO_NOTHING, null=True, related_name='company_creator') + history = models.ForeignKey('history.HistorySync', on_delete=models.DO_NOTHING, null=True, related_name='company_history') def __str__(self): return self.company_name diff --git a/core/views.py b/core/views.py index fbe1bc4..b54d267 100644 --- a/core/views.py +++ b/core/views.py @@ -17,6 +17,7 @@ from rest_framework.generics import UpdateAPIView from rest_framework.decorators import api_view, permission_classes from companies.models import Company +from history.models import HistorySync from . import models from . import serializers as core_serializers @@ -109,6 +110,9 @@ def load_coop_managers(request): logging.info(f"Reading contents of {csv_file.name}") decoded_file = csv_file.read().decode('utf-8').splitlines() csv_reader = csv.DictReader(decoded_file, delimiter=',') + # create historysync instance + history = HistorySync.objects.create(sync_date=datetime.datetime.now(), quantity=len(decoded_file)) + coop_counter = 0 user_counter = 0 for row in csv_reader: @@ -122,6 +126,7 @@ def load_coop_managers(request): 'short_name': row['nombre-corto'].strip(), 'shop': bool(row['es-tienda'].strip()), 'shop_link': row['url'].strip(), + 'history': history, } coop = Company.objects.create(**coop_data) logging.info(f"Created Coop: {coop_data}") diff --git a/history/models.py b/history/models.py index e102cb0..0cd313e 100644 --- a/history/models.py +++ b/history/models.py @@ -7,7 +7,7 @@ class HistorySync(models.Model): Keeps an historic record of the importation of products for a company """ - company = models.ForeignKey('companies.Company', on_delete=models.DO_NOTHING, null=True) + company = models.ForeignKey('companies.Company', on_delete=models.DO_NOTHING, null=True, related_name='history_company') rss_url = models.URLField('URL del feed', null=True, blank=True) sync_date = models.DateTimeField('Fecha de lanzamiento', null=True) result = models.TextField('Resultado', null=True, blank=True)