Commit 1dad549f by Renzo Lucioni

Remove unnecessary comments and make method names more verbose

parent 0898292c
...@@ -65,13 +65,13 @@ class CoursesApiDataLoader(AbstractDataLoader): ...@@ -65,13 +65,13 @@ class CoursesApiDataLoader(AbstractDataLoader):
logger.info('Refreshing Courses and CourseRuns from %s...', self.partner.courses_api_url) logger.info('Refreshing Courses and CourseRuns from %s...', self.partner.courses_api_url)
initial_page = 1 initial_page = 1
response = self._request(initial_page) response = self._make_request(initial_page)
count = response['pagination']['count'] count = response['pagination']['count']
pages = response['pagination']['num_pages'] pages = response['pagination']['num_pages']
self._process_response(response) self._process_response(response)
with concurrent.futures.ThreadPoolExecutor(max_workers=self.max_workers) as executor: with concurrent.futures.ThreadPoolExecutor(max_workers=self.max_workers) as executor:
futures = [executor.submit(self._request, page) for page in range(initial_page + 1, pages + 1)] futures = [executor.submit(self._make_request, page) for page in range(initial_page + 1, pages + 1)]
for future in futures: # pragma: no cover for future in futures: # pragma: no cover
response = future.result() response = future.result()
...@@ -81,12 +81,10 @@ class CoursesApiDataLoader(AbstractDataLoader): ...@@ -81,12 +81,10 @@ class CoursesApiDataLoader(AbstractDataLoader):
self.delete_orphans() self.delete_orphans()
def _request(self, page): def _make_request(self, page):
"""Make a request."""
return self.api_client.courses().get(page=page, page_size=self.PAGE_SIZE) return self.api_client.courses().get(page=page, page_size=self.PAGE_SIZE)
def _process_response(self, response): def _process_response(self, response):
"""Process a response."""
results = response['results'] results = response['results']
logger.info('Retrieved %d course runs...', len(results)) logger.info('Retrieved %d course runs...', len(results))
...@@ -181,13 +179,14 @@ class EcommerceApiDataLoader(AbstractDataLoader): ...@@ -181,13 +179,14 @@ class EcommerceApiDataLoader(AbstractDataLoader):
def ingest(self): def ingest(self):
logger.info('Refreshing course seats from %s...', self.partner.ecommerce_api_url) logger.info('Refreshing course seats from %s...', self.partner.ecommerce_api_url)
response = self._request(1) initial_page = 1
response = self._make_request(initial_page)
count = response['count'] count = response['count']
pages = math.ceil(count / self.PAGE_SIZE) pages = math.ceil(count / self.PAGE_SIZE)
self._process_response(response) self._process_response(response)
with concurrent.futures.ThreadPoolExecutor(max_workers=self.max_workers) as executor: with concurrent.futures.ThreadPoolExecutor(max_workers=self.max_workers) as executor:
futures = [executor.submit(self._request, page) for page in range(2, pages + 1)] futures = [executor.submit(self._make_request, page) for page in range(initial_page + 1, pages + 1)]
for future in futures: # pragma: no cover for future in futures: # pragma: no cover
response = future.result() response = future.result()
...@@ -197,12 +196,10 @@ class EcommerceApiDataLoader(AbstractDataLoader): ...@@ -197,12 +196,10 @@ class EcommerceApiDataLoader(AbstractDataLoader):
self.delete_orphans() self.delete_orphans()
def _request(self, page): def _make_request(self, page):
"""Make a request."""
return self.api_client.courses().get(page=page, page_size=self.PAGE_SIZE, include_products=True) return self.api_client.courses().get(page=page, page_size=self.PAGE_SIZE, include_products=True)
def _process_response(self, response): def _process_response(self, response):
"""Process a response."""
results = response['results'] results = response['results']
logger.info('Retrieved %d course seats...', len(results)) logger.info('Retrieved %d course seats...', len(results))
...@@ -271,8 +268,8 @@ class ProgramsApiDataLoader(AbstractDataLoader): ...@@ -271,8 +268,8 @@ class ProgramsApiDataLoader(AbstractDataLoader):
image_height = 480 image_height = 480
XSERIES = None XSERIES = None
def __init__(self, partner, api_url, access_token=None, token_type=None): def __init__(self, partner, api_url, access_token=None, token_type=None, max_workers=None):
super(ProgramsApiDataLoader, self).__init__(partner, api_url, access_token, token_type) super(ProgramsApiDataLoader, self).__init__(partner, api_url, access_token, token_type, max_workers)
self.XSERIES = ProgramType.objects.get(name='XSeries') self.XSERIES = ProgramType.objects.get(name='XSeries')
def ingest(self): def ingest(self):
......
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