Created Gym Scraper And Made Bug Fixes on Classes Scraper (#116)

* Created activity model and many to many relationship with gym model; added activity and gym rresolvers to the schema

* added activity model to import statements on init_db()

* deleted testing objects in init_db()

* deleted duplicate code

* Implemented PR edits in activity.py

* Implemented PR edits in gym.py

* Implemented PR changes in schema.py and added Price and Amenity class and price resolver in Activity class

* Populated models to test

* Cleaning up some merge conflicts

* almost implementing Facilities

* Activity model and some changes to gym

* Created some of gym scraper

* wrote some of gym hour scraper

* Implement scraper for fitness center hours

* changed some of activities

* bug fixes on the scraper

---------

Co-authored-by: Isabella Hoie <iah27@cornell.edu>

Author: isabellahoie

Dockerfile

@@ -5,4 +5,7 @@ WORKDIR /usr/src/app
 
 COPY . .
 
+ENV MAX_CONCURRENT_PIP=4
+
+RUN pip install --upgrade pip
 RUN pip install -r requirements.txt

T

@@ -5,6 +5,8 @@
 from src.database import db_session, init_db
 from src.schema import Query
 from src.constants import create_gym_table
+from src.scrapers.scraper import scrape_classes
+from src.scrapers.gym_scraper import scrape_times
 from src.scrapers.scraper import scrape_classes, scrape_pool_hours
 
 
@@ -30,6 +32,7 @@ def shutdown_session(exception=None):
 # Create database and fill it with constants
 init_db()
 create_gym_table()
+scrape_times()
 scrape_classes(3)
 scrape_pool_hours()
 

app.py

@@ -1,10 +1,10 @@
 import os
 from flask_script import Manager
 from flask_migrate import Migrate, MigrateCommand
-from app import app, db
+from app import app#, db
 
 # Build manager
-migrate = Migrate(app, db)
+#migrate = Migrate(app, db)
 manager = Manager(app)
 manager.add_command("db", MigrateCommand)
 

manager.py

@@ -25,8 +25,8 @@ type ClassInstance {
   instructor: String!
   isCanceled: Boolean!
   isVirtual: Boolean!
-  startTime: DateTime!
-  endTime: DateTime!
+  startTime: DateTime
+  endTime: DateTime
   class_: Class
   gym: Gym
 }
@@ -64,8 +64,8 @@ type OpenHours {
   id: ID!
   facilityId: Int!
   day: Int!
-  startTime: String!
-  endTime: String!
+  startTime: String
+  endTime: String
 }
 
 type Query {

schema.graphql

@@ -63,12 +63,12 @@
       "image_url": "gyms/teagle.jpg",
       "facilities": [
         {
-          "name": "Teagle Up",
+          "name": "Teagle Upstairs",
           "type": "fitness",
           "hours": []
         },
         {
-          "name": "Teagle Down",
+          "name": "Teagle Downstairs",
           "type": "fitness",
           "hours": []
         },
@@ -80,4 +80,4 @@
       ]
     }
   ]
-}
+}

src/constants.json

@@ -49,6 +49,4 @@ def create_gym_table():
         db_session.merge(gym)
     for facility in facilities:
         db_session.merge(facility)
-    for hours in fitness_hours:
-        db_session.merge(hours)
     db_session.commit()

src/constants.py

@@ -0,0 +1,33 @@
+from sqlalchemy import Column, Float, String, Integer, ForeignKey, Table
+from sqlalchemy.orm import relationship
+from src.database import Base
+
+def Activity(Base):
+    __tablename__ = 'activity'
+
+    id = Column(Integer, primary_key = True)
+    name = Column(String, nullable=False)
+    activity_type = Column(Integer, ForeignKey('activitytype.id'), nullable=False)
+    facility_id = Column(Integer, ForeignKey('facility.id'), nullable=False)
+    prices = relationship('Price')
+    image_url = Column(String(), nullable=False)
+
+    def __init__(self, **kwargs):
+        self.id = kwargs.get('id')
+        self.name = kwargs.get('name')
+        self.activity_type = kwargs.get('activity_type')
+        self.facility_id = kwargs.get('facility_id')
+        self.image_url = kwargs.get('image_url')
+
+
+def ActivityType(Base):
+    __tablename__ = 'activitytype'
+
+    id = Column(Integer, primary_key=True)
+    name = Column(String, nullable=False)
+
+    def __init__(self, **kwargs):
+        self.id = kwargs.get('id')
+        self.name = kwargs.get('name')
+
+  

src/models/activity.py

@@ -1,3 +1,4 @@
+
 from sqlalchemy import Column, ForeignKey, Integer, DateTime, Float
 from sqlalchemy.orm import backref, relationship
 from src.database import Base 

src/models/capacity.py

@@ -43,8 +43,8 @@ class ClassInstance(Base):
     instructor = Column(String(), nullable=False)
     isCanceled = Column(Boolean(), nullable=False, default=False)
     isVirtual = Column(Boolean(), nullable=False, default=False)
-    start_time = Column(DateTime(), nullable=False)
-    end_time = Column(DateTime(), nullable=False)
+    start_time = Column(DateTime(), nullable=True)
+    end_time = Column(DateTime(), nullable=True)
 
     class_ = relationship("Class", back_populates="gyms")
     gym = relationship("Gym", back_populates="classes")