Merge pull request #4 from thestd/fix_teacher_schedule

Fixed `README.md`and teacher schedule

Author: Serhii Khortiuk

README.md

@@ -49,8 +49,8 @@ A scrapper that works as a server with open api which parse the site of the
         ```
       - examples:
         - `yourdomain.com/api/schedule?query=ПІ-4&type=group`
-        - `yourdomain.com/api/schedule?query=ПІ-4&type=froup&date_from=
-           08.04.2019&date_to=09.04.2019`
+        - `yourdomain.com/api/schedule?query=Козленко Микола Іванович&q_type=teacher&date_from=07.05.2019`
+        - `yourdomain.com/api/schedule?query=ПІ-4&type=group&date_from=08.04.2019&date_to=09.04.2019`
       - response example:
         ```json
          {

app/api/handlers.py

@@ -23,14 +23,16 @@ async def options(self):
 
 class ScheduleApiHandler(BaseHandler):
     async def prepare(self):
-        group = self.get_query_argument('group')
+        query = self.get_query_argument('query')
+        q_type = self.get_query_argument('q_type', 'group')
         faculty = self.get_query_argument('faculty', '0')
         date_from = self.get_query_argument('date_from', '')
         date_to = self.get_query_argument('date_to', '')
 
         # TODO: date validation
 
-        self._params = dict(group=group,
+        self._params = dict(query=query,
+                            q_type=q_type,
                             faculty=faculty,
                             date_from=date_from,
                             date_to=date_to
@@ -39,7 +41,8 @@ async def prepare(self):
     async def get(self):
         body = await load_schedule(**self._params)
         schedule = parse_schedule(body)
-        schedule_json = serialize_schedule(group=self._params['group'],
+        schedule_json = serialize_schedule(query=self._params['query'],
+                                           q_type=self._params['q_type'],
                                            schedule=schedule)
         self.set_status(200)
         self.write(schedule_json)

app/scraper/serializers.py

@@ -4,10 +4,10 @@
 __all__ = ["serialize_schedule", "serialize_list", ]
 
 
-def serialize_schedule(group, schedule):
+def serialize_schedule(query, q_type, schedule):
     # Todo: provide docstring
     to_serialize = {
-        'group': group,
+        q_type: query,
         'schedule': schedule
     }
     schedule_json = json.dumps(to_serialize, ensure_ascii=False)

app/scraper/utils.py

@@ -32,16 +32,15 @@ def prepare_post_data(**kwargs):
         dict: dict, prepared to use as body in POST request.
 
     """
-    group = kwargs.get('group', '')
+    query = kwargs.get('query', '')
+    q_type = kwargs.get('q_type', '')
     faculty = kwargs.get('faculty', '')
-    teacher = kwargs.get('teacher', '')
     sdate = kwargs.get('date_from', '')
     edate = kwargs.get('date_to', '')
 
     post_data = {
         'faculty': faculty,
-        'teacher': teacher.encode(options.base_encoding),
-        'group': group.encode(options.base_encoding),
+        q_type: query.encode(options.base_encoding),
         'sdate': sdate.encode(options.base_encoding),
         'edate': edate.encode(options.base_encoding),
         'n': 700