Merge pull request #167 from cuappdev/master

Merge

.pre-commit-config.yaml

@@ -1,10 +1,22 @@
 repos:
--   repo: https://github.com/ambv/black
-    rev: stable
+  # Using this mirror lets us use mypyc-compiled black, which is about 2x faster
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.8.0
     hooks:
-    - id: black
-      language_version: python3.7
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.2.3
+      - id: black
+        # It is recommended to specify the latest version of Python
+        # supported by your project here, or alternatively use
+        # pre-commit's default_language_version, see
+        # https://pre-commit.com/#top_level-default_language_version
+        language_version: python3.9
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.6.3
     hooks:
-    - id: flake8
+      # Run the linter.
+      - id: ruff
+        args: [--fix]
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.0
+    hooks:
+      - id: bandit

app.py

@@ -1,6 +1,6 @@
 import logging
 import sentry_sdk
-from flask import Flask, render_template, redirect, url_for
+from flask import Flask, render_template
 from flask_apscheduler import APScheduler
 from flask_graphql import GraphQLView
 from graphene import Schema
@@ -16,6 +16,8 @@
 from src.scrapers.activities_scraper import fetch_activity
 from src.utils.utils import create_gym_table
 from src.models.openhours import OpenHours
+from flasgger import Swagger
+
 
 sentry_sdk.init(
     dsn="https://2a96f65cca45d8a7c3ffc3b878d4346b@o4507365244010496.ingest.us.sentry.io/4507850536386560",
@@ -31,6 +33,7 @@
 app = Flask(__name__)
 app.debug = True
 schema = Schema(query=Query, mutation=Mutation)
+swagger = Swagger(app)
 
 # Scheduler
 scheduler = APScheduler()
@@ -81,15 +84,8 @@ def scrape_capacities():
 def scrape_classes():
     logging.info("Scraping classes from group-fitness-classes...")
 
-    fetch_classes(3)
-
-
-# Scrape classes every hour
-@scheduler.task("interval", id="scrape_classes", seconds=3600)
-def scrape_classes():
-    logging.info("Scraping classes from group-fitness-classes...")
 
-    fetch_classes(3)
+    fetch_classes(10)
 
 
 # Create database and fill it with data
@@ -108,4 +104,4 @@ def scrape_classes():
     schema_file.close()
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=5000)
+    app.run(host="127.0.0.1", port=5000)

manager.py

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

requirements.txt

@@ -22,6 +22,8 @@ Flask-GraphQL==2.0.0
 Flask-Migrate==2.4.0
 Flask-Script==2.0.5
 Flask-SQLAlchemy==2.3.1
+Flask-RESTful==0.3.10
+flasgger==0.9.7.1
 google-auth==1.12.0
 graphene==2.1.3
 graphene-sqlalchemy==2.3.0
@@ -38,7 +40,7 @@ itsdangerous==2.0
 jedi==0.18.2
 Jinja2==3.0
 lxml==4.9.2
-Mako==1.0.9
+Mako==1.1.0
 MarkupSafe==2.1.1
 marshmallow==3.0.0rc4
 marshmallow-sqlalchemy==0.16.2
@@ -77,4 +79,4 @@ wasmer-compiler-cranelift==1.1.0
 wcwidth==0.2.6
 Werkzeug==2.2.2
 zipp==3.15.0
-sentry-sdk==2.13.0
+sentry-sdk==2.13.0

schema.graphql

@@ -69,14 +69,24 @@ type CreateGiveaway {
   giveaway: Giveaway
 }
 
+type CreateReport {
+  report: Report
+}
+
 type CreateUser {
   user: User
 }
 
 scalar DateTime
 
-type EnterGiveaway {
-  giveawayInstance: GiveawayInstance
+enum DayOfWeekEnum {
+  MONDAY
+  TUESDAY
+  WEDNESDAY
+  THURSDAY
+  FRIDAY
+  SATURDAY
+  SUNDAY
 }
 
 type Equipment {
@@ -141,12 +151,15 @@ type Gym {
   facilities: [Facility]
   hours: [OpenHours]
   classes: [ClassInstance]
+  reports: [Report]
 }
 
 type Mutation {
-  createGiveaway(name: String!): CreateGiveaway
-  createUser(instagram: String, netId: String!): CreateUser
-  enterGiveaway(giveawayId: Int!, userNetId: String!): EnterGiveaway
+  createGiveaway(name: String!): Giveaway
+  createUser(email: String!, name: String!, netId: String!): User
+  enterGiveaway(giveawayId: Int!, userNetId: String!): GiveawayInstance
+  setWorkoutGoals(userId: Int!, workoutGoal: [String]!): User
+  logWorkout(userId: Int!, workoutTime: DateTime!): Workout
 }
 
 type OpenHours {
@@ -178,12 +191,42 @@ enum PriceType {
 type Query {
   getAllGyms: [Gym]
   getUsersByGiveawayId(id: Int): [User]
+  getWeeklyWorkoutDays(id: Int): [String]
+  getWorkoutsById(id: Int): [Workout]
   activities: [Activity]
 }
 
+type Report {
+  id: ID!
+  createdAt: DateTime!
+  description: String!
+  gymId: Int!
+  issue: ReportType!
+  userId: Int!
+  gym: Gym
+  user: User
+}
+
+enum ReportType {
+  INACCURATE_EQUIPMENT
+  INCORRECT_HOURS
+  INACCURATE_DESCRIPTION
+  WAIT_TIMES_NOT_UPDATED
+  OTHER
+}
+
 type User {
   id: ID!
-  instagram: String
+  email: String!
   netId: String!
+  name: String!
+  workoutGoal: [DayOfWeekEnum]
   giveaways: [Giveaway]
+  reports: [Report]
+}
+
+type Workout {
+  id: ID!
+  workoutTime: DateTime!
+  userId: Int!
 }

src/database.py

@@ -1,4 +1,5 @@
-import logging, os
+import logging
+import os
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker

src/models/classes.py

@@ -1,16 +1,5 @@
-import datetime
 from src.database import Base
-from sqlalchemy import (
-    Table,
-    Column,
-    DateTime,
-    ForeignKey,
-    Integer,
-    Float,
-    String,
-    Boolean,
-    func,
-)
+from sqlalchemy import Table, Column, DateTime, ForeignKey, Integer, String, Boolean
 from sqlalchemy.orm import backref, relationship
 
 classes_to_gyms = Table(
@@ -31,8 +20,8 @@ class Class(Base):
     __tablename__ = "class"
 
     id = Column(Integer, primary_key=True)
-    name = Column(String(), nullable=False)
-    description = Column(String(), nullable=False)
+    name = Column(String, nullable=False)
+    description = Column(String, nullable=False)
     class_instances = relationship("ClassInstance", back_populates="class_")
 
     def __init__(self, **kwargs):
@@ -46,7 +35,7 @@ def serialize(self):
             "name": self.name,
             "description": self.description,
         }
-    
+
 
 class ClassInstance(Base):
     __tablename__ = "class_instance"
@@ -86,5 +75,3 @@ def serialize(self):
             "start_time": self.start_time,
             "end_time": self.end_time,
         }
-
-

src/models/equipment.py

@@ -1,40 +1,39 @@
 import enum
 from sqlalchemy import Column, String, Enum, Integer, ForeignKey
-from sqlalchemy.orm import relationship
 from src.database import Base
 
+
 class EquipmentType(enum.Enum):
 
-  cardio = 0
-  racks_and_benches = 1
-  selectorized = 2
-  multi_cable = 3
-  free_weights = 4
-  miscellaneous = 5
-  plate_loaded = 6
+    cardio = 0
+    racks_and_benches = 1
+    selectorized = 2
+    multi_cable = 3
+    free_weights = 4
+    miscellaneous = 5
+    plate_loaded = 6
 
 
 class AccessibilityType(enum.Enum):
-
-  wheelchair = 0
-
-class Equipment(Base):
 
-  __tablename__ = "equipment"
+    wheelchair = 0
 
-  id = Column(Integer, primary_key=True)
-  name = Column(String, nullable=False)
-  equipment_type = Column(Enum(EquipmentType), nullable=False)
-  facility_id = Column(Integer, ForeignKey("facility.id"), nullable=False)
-  quantity = Column(Integer, nullable=True)
-  accessibility = Column(Enum(AccessibilityType), nullable=True)
-
-  def __init__(self, **kwargs):
-    self.id = kwargs.get("id")
-    self.name = kwargs.get("name")
-    self.equipment_type = kwargs.get("equipment_type")
-    self.facility_id = kwargs.get("facility_id")
-    self.quantity = kwargs.get("quantity")
-    self.accessibility = kwargs.get("accessibility")
 
+class Equipment(Base):
 
+    __tablename__ = "equipment"
+
+    id = Column(Integer, primary_key=True)
+    name = Column(String, nullable=False)
+    equipment_type = Column(Enum(EquipmentType), nullable=False)
+    facility_id = Column(Integer, ForeignKey("facility.id"), nullable=False)
+    quantity = Column(Integer, nullable=True)
+    accessibility = Column(Enum(AccessibilityType), nullable=True)
+
+    def __init__(self, **kwargs):
+        self.id = kwargs.get("id")
+        self.name = kwargs.get("name")
+        self.equipment_type = kwargs.get("equipment_type")
+        self.facility_id = kwargs.get("facility_id")
+        self.quantity = kwargs.get("quantity")
+        self.accessibility = kwargs.get("accessibility")

src/models/facility.py

@@ -2,9 +2,6 @@
 from sqlalchemy import Column, String, Enum, Integer, ForeignKey
 from sqlalchemy.orm import relationship
 from src.database import Base
-from src.models.openhours import OpenHours
-from src.models.equipment import Equipment
-from src.models.capacity import Capacity
 
 
 class FacilityType(enum.Enum):

src/models/giveaway.py

@@ -1,7 +1,6 @@
-from sqlalchemy import Column, Integer, Float, ForeignKey, String
+from sqlalchemy import Column, Integer, ForeignKey, String
 from sqlalchemy.orm import relationship
 from src.database import Base
-from src.models.user import User
 
 
 class Giveaway(Base):

src/models/gym.py

@@ -1,8 +1,6 @@
 from sqlalchemy import Column, Float, String, Integer
 from sqlalchemy.orm import relationship
 from src.database import Base
-from src.models.openhours import OpenHours
-from src.models.classes import ClassInstance, Class
 
 
 class Gym(Base):
@@ -31,6 +29,7 @@ class Gym(Base):
     facilities = relationship("Facility")
     hours = relationship("OpenHours")
     classes = relationship("ClassInstance", back_populates="gym")
+    reports = relationship("Report", back_populates="gym")
     image_url = Column(String, nullable=True)
     latitude = Column(Float, nullable=False)
     longitude = Column(Float, nullable=False)

src/models/openhours.py

@@ -1,5 +1,5 @@
 import enum
-from sqlalchemy import Boolean, Column, Enum, Integer, Float, ForeignKey
+from sqlalchemy import Boolean, Column, Enum, Integer, ForeignKey
 from src.database import Base