Commit 9e6028d3 by Bessie Steinberg

revert inital changes for refresh metadata task

parent 081831f8
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2018-03-21 14:53
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('core', '0008_partner_pubs_api_url'),
]
operations = [
migrations.RemoveField(
model_name='partner',
name='pubs_api_url',
),
]
...@@ -67,7 +67,6 @@ class Partner(TimeStampedModel): ...@@ -67,7 +67,6 @@ class Partner(TimeStampedModel):
max_length=8, unique=True, null=False, blank=False, verbose_name=_('Short Code'), max_length=8, unique=True, null=False, blank=False, verbose_name=_('Short Code'),
help_text=_('Convenient code/slug used to identify this Partner (e.g. for management commands.)')) help_text=_('Convenient code/slug used to identify this Partner (e.g. for management commands.)'))
courses_api_url = models.URLField(max_length=255, null=True, blank=True, verbose_name=_('Courses API URL')) courses_api_url = models.URLField(max_length=255, null=True, blank=True, verbose_name=_('Courses API URL'))
pubs_api_url = models.URLField(max_length=255, null=True, blank=True, verbose_name=_('Publications API URL'))
ecommerce_api_url = models.URLField(max_length=255, null=True, blank=True, verbose_name=_('E-Commerce API URL')) ecommerce_api_url = models.URLField(max_length=255, null=True, blank=True, verbose_name=_('E-Commerce API URL'))
organizations_api_url = models.URLField(max_length=255, null=True, blank=True, organizations_api_url = models.URLField(max_length=255, null=True, blank=True,
verbose_name=_('Organizations API URL')) verbose_name=_('Organizations API URL'))
......
...@@ -249,21 +249,6 @@ class CoursesApiDataLoader(AbstractDataLoader): ...@@ -249,21 +249,6 @@ class CoursesApiDataLoader(AbstractDataLoader):
return video return video
class PubApiDataLoader(AbstractDataLoader):
""" Loads publications from the Pubs API """
def ingest(self):
api_url = self.partner.pubs_api_url
count =None
page = 1
logger.info('Refreshing publications from %s...', api_url)
while page:
response = self.api_client.publications.get(page=page, page_size=self.PAGE_SIZE)
#TODO: make publications api
class EcommerceApiDataLoader(AbstractDataLoader): class EcommerceApiDataLoader(AbstractDataLoader):
""" Loads course seats and entitlements from the E-Commerce API. """ """ Loads course seats and entitlements from the E-Commerce API. """
......
...@@ -14,7 +14,7 @@ from edx_rest_api_client.client import EdxRestApiClient ...@@ -14,7 +14,7 @@ from edx_rest_api_client.client import EdxRestApiClient
from course_discovery.apps.api.cache import api_change_receiver, set_api_timestamp from course_discovery.apps.api.cache import api_change_receiver, set_api_timestamp
from course_discovery.apps.core.models import Partner from course_discovery.apps.core.models import Partner
from course_discovery.apps.course_metadata.data_loaders.api import ( from course_discovery.apps.course_metadata.data_loaders.api import (
CoursesApiDataLoader, EcommerceApiDataLoader, OrganizationsApiDataLoader, ProgramsApiDataLoader, PubApiDataLoader CoursesApiDataLoader, EcommerceApiDataLoader, OrganizationsApiDataLoader, ProgramsApiDataLoader
) )
from course_discovery.apps.course_metadata.data_loaders.marketing_site import ( from course_discovery.apps.course_metadata.data_loaders.marketing_site import (
CourseMarketingSiteDataLoader, PersonMarketingSiteDataLoader, SchoolMarketingSiteDataLoader, CourseMarketingSiteDataLoader, PersonMarketingSiteDataLoader, SchoolMarketingSiteDataLoader,
...@@ -137,26 +137,23 @@ class Command(BaseCommand): ...@@ -137,26 +137,23 @@ class Command(BaseCommand):
) )
pipeline = ( pipeline = (
# (
# (SubjectMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
# (SchoolMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
# (SponsorMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
# (PersonMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
# ),
# (
# (CourseMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
# (OrganizationsApiDataLoader, partner.organizations_api_url, max_workers),
# ),
# (
# (CoursesApiDataLoader, partner.courses_api_url, max_workers),
# ),
( (
(PubApiDataLoader, partner.pubs_api_url, max_workers), (SubjectMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
(SchoolMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
(SponsorMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
(PersonMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
),
(
(CourseMarketingSiteDataLoader, partner.marketing_site_url_root, max_workers),
(OrganizationsApiDataLoader, partner.organizations_api_url, max_workers),
),
(
(CoursesApiDataLoader, partner.courses_api_url, max_workers),
),
(
(EcommerceApiDataLoader, partner.ecommerce_api_url, 1),
(ProgramsApiDataLoader, partner.programs_api_url, max_workers),
), ),
# (
# (EcommerceApiDataLoader, partner.ecommerce_api_url, 1),
# (ProgramsApiDataLoader, partner.programs_api_url, max_workers),
# ),
) )
if waffle.switch_is_active('parallel_refresh_pipeline'): if waffle.switch_is_active('parallel_refresh_pipeline'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment