Updated claude big changes
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
import logging
|
||||
from flask import jsonify
|
||||
from datetime import date
|
||||
from app.stats import stats
|
||||
import datetime
|
||||
from app import db
|
||||
from app.common.responses import success_response
|
||||
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
|
||||
@@ -42,8 +42,7 @@ def total_calls_post():
|
||||
db.session.add(total_calls_today)
|
||||
db.session.commit()
|
||||
|
||||
|
||||
return jsonify({"ok": True,}), 200
|
||||
return success_response()
|
||||
|
||||
|
||||
@stats.route("/calls/count/today", methods=["GET"])
|
||||
@@ -54,9 +53,7 @@ def total_calls_today():
|
||||
.filter(Stats_Company.expected_delivery_date == date.today())
|
||||
.count())
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'data': total_calls_today,
|
||||
}), 200
|
||||
return success_response({'data': total_calls_today})
|
||||
|
||||
|
||||
@stats.route("/gallons/total/<int:driver_id>", methods=["GET"])
|
||||
@@ -73,9 +70,7 @@ def total_gallons_delivered_driver(driver_id):
|
||||
gallons_list.append(f.gallons_delivered)
|
||||
sum_of_gallons = (sum(gallons_list))
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'data': sum_of_gallons,
|
||||
}), 200
|
||||
return success_response({'data': sum_of_gallons})
|
||||
|
||||
|
||||
@stats.route("/delivery/total/<int:driver_id>", methods=["GET"])
|
||||
@@ -85,9 +80,7 @@ def total_deliveries_driver(driver_id):
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.driver_employee_id == driver_id)
|
||||
.count())
|
||||
return jsonify({"ok": True,
|
||||
'data': total_stops,
|
||||
}), 200
|
||||
return success_response({'data': total_stops})
|
||||
|
||||
|
||||
@stats.route("/primes/total/<int:driver_id>", methods=["GET"])
|
||||
@@ -99,10 +92,7 @@ def total_primes_driver(driver_id):
|
||||
.filter(Delivery_Delivery.prime == 1)
|
||||
.count())
|
||||
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'data': total_stops,
|
||||
}), 200
|
||||
return success_response({'data': total_stops})
|
||||
|
||||
@stats.route("/delivery/count/today", methods=["GET"])
|
||||
def total_deliveries_today():
|
||||
@@ -111,9 +101,7 @@ def total_deliveries_today():
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.expected_delivery_date == date.today())
|
||||
.count())
|
||||
return jsonify({"ok": True,
|
||||
'data': total_stops,
|
||||
}), 200
|
||||
return success_response({'data': total_stops})
|
||||
|
||||
|
||||
@stats.route("/delivery/count/delivered/today", methods=["GET"])
|
||||
@@ -125,9 +113,7 @@ def total_deliveries_today_finished():
|
||||
.filter((Delivery_Delivery.delivery_status == 10))
|
||||
.count())
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'data': total_stops,
|
||||
}), 200
|
||||
return success_response({'data': total_stops})
|
||||
|
||||
|
||||
@stats.route("/user/<int:user_id>", methods=["GET"])
|
||||
@@ -160,7 +146,7 @@ def get_user_stats(user_id):
|
||||
.first()
|
||||
|
||||
user_schema = Stats_Customer_schema(many=False)
|
||||
return jsonify(user_schema.dump(get_user))
|
||||
return success_response({"user_stats": user_schema.dump(get_user)})
|
||||
|
||||
|
||||
@stats.route("/user/lastdelivery/<int:user_id>", methods=["GET"])
|
||||
@@ -179,9 +165,7 @@ def get_user_last_delivery(user_id):
|
||||
date_delivered = get_delivery.when_delivered
|
||||
else:
|
||||
date_delivered = "no deliveries on record"
|
||||
return jsonify({"ok": True,
|
||||
'date': str(date_delivered),
|
||||
}), 200
|
||||
return success_response({'date': str(date_delivered)})
|
||||
|
||||
|
||||
@stats.route("/gallons/week", methods=["GET"])
|
||||
@@ -201,9 +185,7 @@ def total_gallons_delivered_this_week():
|
||||
.all())
|
||||
for f in get_total:
|
||||
total_gallons = total_gallons + f.gallons_delivered
|
||||
return jsonify({"ok": True,
|
||||
'total': total_gallons,
|
||||
}), 200
|
||||
return success_response({'total': total_gallons})
|
||||
|
||||
@stats.route("/gallons/check/total/<int:user_id>", methods=["GET"])
|
||||
def calculate_gallons_user(user_id):
|
||||
@@ -227,5 +209,4 @@ def calculate_gallons_user(user_id):
|
||||
get_user.oil_total_gallons = total_gallons
|
||||
db.session.add(get_user)
|
||||
db.session.commit()
|
||||
return jsonify({"ok": True,
|
||||
}), 200
|
||||
return success_response()
|
||||
|
||||
Reference in New Issue
Block a user