major claude changes
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import logging
|
||||
from flask import jsonify
|
||||
from datetime import date
|
||||
from app.stats import stats
|
||||
@@ -7,6 +8,8 @@ from app.classes.delivery import Delivery_Delivery
|
||||
from app.classes.stats_company import Stats_Company, Stats_Company_schema
|
||||
from app.classes.stats_customer import Stats_Customer, Stats_Customer_schema
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def get_monday_date(date_object):
|
||||
"""Gets the date of the Monday for the given date."""
|
||||
@@ -27,6 +30,7 @@ def get_monday_date(date_object):
|
||||
|
||||
@stats.route("/calls/add", methods=["PUT"])
|
||||
def total_calls_post():
|
||||
logger.info("PUT /stats/calls/add - Incrementing call count")
|
||||
total_calls_today = (db.session
|
||||
.query(Stats_Company)
|
||||
.filter(Stats_Company.expected_delivery_date == date.today())
|
||||
@@ -38,17 +42,18 @@ def total_calls_post():
|
||||
db.session.add(total_calls_today)
|
||||
db.session.commit()
|
||||
|
||||
|
||||
|
||||
return jsonify({"ok": True,}), 200
|
||||
|
||||
|
||||
@stats.route("/calls/count/today", methods=["GET"])
|
||||
def total_calls_today():
|
||||
logger.info("GET /stats/calls/count/today - Getting today's call count")
|
||||
total_calls_today = (db.session
|
||||
.query(Stats_Company)
|
||||
.filter(Stats_Company.expected_delivery_date == date.today())
|
||||
.count())
|
||||
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'data': total_calls_today,
|
||||
}), 200
|
||||
@@ -56,17 +61,18 @@ def total_calls_today():
|
||||
|
||||
@stats.route("/gallons/total/<int:driver_id>", methods=["GET"])
|
||||
def total_gallons_delivered_driver(driver_id):
|
||||
logger.info(f"GET /stats/gallons/total/{driver_id} - Calculating total gallons for driver")
|
||||
gallons_list = []
|
||||
|
||||
|
||||
total_gallons = db.session\
|
||||
.query(Delivery_Delivery)\
|
||||
.filter(Delivery_Delivery.driver_employee_id == driver_id)\
|
||||
.all()
|
||||
|
||||
|
||||
for f in total_gallons:
|
||||
gallons_list.append(f.gallons_delivered)
|
||||
sum_of_gallons = (sum(gallons_list))
|
||||
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'data': sum_of_gallons,
|
||||
}), 200
|
||||
@@ -74,6 +80,7 @@ def total_gallons_delivered_driver(driver_id):
|
||||
|
||||
@stats.route("/delivery/total/<int:driver_id>", methods=["GET"])
|
||||
def total_deliveries_driver(driver_id):
|
||||
logger.info(f"GET /stats/delivery/total/{driver_id} - Counting total deliveries for driver")
|
||||
total_stops = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.driver_employee_id == driver_id)
|
||||
@@ -85,12 +92,13 @@ def total_deliveries_driver(driver_id):
|
||||
|
||||
@stats.route("/primes/total/<int:driver_id>", methods=["GET"])
|
||||
def total_primes_driver(driver_id):
|
||||
logger.info(f"GET /stats/primes/total/{driver_id} - Counting prime deliveries for driver")
|
||||
total_stops = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.driver_employee_id == driver_id)
|
||||
.filter(Delivery_Delivery.prime == 1)
|
||||
.count())
|
||||
|
||||
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'data': total_stops,
|
||||
@@ -98,6 +106,7 @@ def total_primes_driver(driver_id):
|
||||
|
||||
@stats.route("/delivery/count/today", methods=["GET"])
|
||||
def total_deliveries_today():
|
||||
logger.info("GET /stats/delivery/count/today - Counting today's deliveries")
|
||||
total_stops = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.expected_delivery_date == date.today())
|
||||
@@ -109,12 +118,13 @@ def total_deliveries_today():
|
||||
|
||||
@stats.route("/delivery/count/delivered/today", methods=["GET"])
|
||||
def total_deliveries_today_finished():
|
||||
logger.info("GET /stats/delivery/count/delivered/today - Counting completed deliveries today")
|
||||
total_stops = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.expected_delivery_date == date.today())
|
||||
.filter((Delivery_Delivery.delivery_status == 10))
|
||||
.count())
|
||||
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'data': total_stops,
|
||||
}), 200
|
||||
@@ -125,6 +135,7 @@ def get_user_stats(user_id):
|
||||
"""
|
||||
gets stats of user
|
||||
"""
|
||||
logger.info(f"GET /stats/user/{user_id} - Fetching user statistics")
|
||||
get_user = db.session \
|
||||
.query(Stats_Customer) \
|
||||
.filter(Stats_Customer.customer_id == user_id) \
|
||||
@@ -157,6 +168,7 @@ def get_user_last_delivery(user_id):
|
||||
"""
|
||||
gets users last delivery. used on profile page
|
||||
"""
|
||||
logger.info(f"GET /stats/user/lastdelivery/{user_id} - Fetching user's last delivery date")
|
||||
get_delivery= db.session \
|
||||
.query(Delivery_Delivery) \
|
||||
.filter(Delivery_Delivery.customer_id == user_id) \
|
||||
@@ -174,6 +186,7 @@ def get_user_last_delivery(user_id):
|
||||
|
||||
@stats.route("/gallons/week", methods=["GET"])
|
||||
def total_gallons_delivered_this_week():
|
||||
logger.info("GET /stats/gallons/week - Calculating weekly gallons delivered")
|
||||
# Get today's date
|
||||
total_gallons = 0
|
||||
|
||||
@@ -194,6 +207,7 @@ def total_gallons_delivered_this_week():
|
||||
|
||||
@stats.route("/gallons/check/total/<int:user_id>", methods=["GET"])
|
||||
def calculate_gallons_user(user_id):
|
||||
logger.info(f"GET /stats/gallons/check/total/{user_id} - Recalculating user total gallons")
|
||||
# Get today's date
|
||||
total_gallons = 0
|
||||
|
||||
@@ -215,4 +229,3 @@ def calculate_gallons_user(user_id):
|
||||
db.session.commit()
|
||||
return jsonify({"ok": True,
|
||||
}), 200
|
||||
|
||||
|
||||
Reference in New Issue
Block a user