Updated claude big changes
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
import logging
|
||||
from flask import request, jsonify
|
||||
from flask import request
|
||||
|
||||
from sqlalchemy import or_
|
||||
|
||||
from flask_login import login_required
|
||||
from app.employees import employees
|
||||
from app import db
|
||||
from app.common.responses import success_response
|
||||
from app.classes.employee import Employee_Employee, Employee_Employee_schema
|
||||
from app.classes.auth import Auth_User
|
||||
from app.classes.stats_employee import Stats_Employee_Oil, Stats_Employee_Office
|
||||
@@ -29,7 +30,7 @@ def get_specific_employee(userid):
|
||||
employee_data = employee_schema.dump(employee)
|
||||
employee_data['active'] = active_status
|
||||
|
||||
return jsonify(employee_data)
|
||||
return success_response({"employee": employee_data})
|
||||
|
||||
|
||||
@employees.route("/byid/<int:employee_id>", methods=["GET"])
|
||||
@@ -41,7 +42,7 @@ def get_employee_by_id(employee_id):
|
||||
.filter(Employee_Employee.id == employee_id) \
|
||||
.first()
|
||||
employee_schema = Employee_Employee_schema(many=False)
|
||||
return jsonify(employee_schema.dump(employee))
|
||||
return success_response({"employee": employee_schema.dump(employee)})
|
||||
|
||||
|
||||
@employees.route("/userid/<int:userid>", methods=["GET"])
|
||||
@@ -53,7 +54,7 @@ def get_specific_employee_user_id(userid):
|
||||
.filter(Employee_Employee.user_id == userid) \
|
||||
.first()
|
||||
employee_schema = Employee_Employee_schema(many=False)
|
||||
return jsonify(employee_schema.dump(employee))
|
||||
return success_response({"employee": employee_schema.dump(employee)})
|
||||
|
||||
|
||||
@employees.route("/all/<int:page>", methods=["GET"])
|
||||
@@ -76,7 +77,7 @@ def all_employees_paginated(page):
|
||||
.limit(per_page_amount).offset(offset_limit))
|
||||
|
||||
employee_schema = Employee_Employee_schema(many=True)
|
||||
return jsonify(employee_schema.dump(employee_list))
|
||||
return success_response({"employees": employee_schema.dump(employee_list)})
|
||||
|
||||
|
||||
@employees.route("/all", methods=["GET"])
|
||||
@@ -87,7 +88,7 @@ def all_employees():
|
||||
.query(Employee_Employee) \
|
||||
.all()
|
||||
customer_schema = Employee_Employee_schema(many=True)
|
||||
return jsonify(customer_schema.dump(employee_list))
|
||||
return success_response({"employees": customer_schema.dump(employee_list)})
|
||||
|
||||
|
||||
@employees.route("/drivers", methods=["GET"])
|
||||
@@ -101,7 +102,7 @@ def all_employees_drivers():
|
||||
.all()
|
||||
|
||||
customer_schema = Employee_Employee_schema(many=True)
|
||||
return jsonify(customer_schema.dump(employee_list))
|
||||
return success_response({"drivers": customer_schema.dump(employee_list)})
|
||||
|
||||
|
||||
@employees.route("/techs", methods=["GET"])
|
||||
@@ -117,7 +118,7 @@ def all_employees_techs():
|
||||
)) \
|
||||
.all()
|
||||
customer_schema = Employee_Employee_schema(many=True)
|
||||
return jsonify(customer_schema.dump(employee_list))
|
||||
return success_response({"techs": customer_schema.dump(employee_list)})
|
||||
|
||||
|
||||
@employees.route("/create", methods=["POST"])
|
||||
@@ -181,9 +182,7 @@ def employee_create():
|
||||
)
|
||||
db.session.add(new_stats_oil)
|
||||
|
||||
return jsonify({"ok": True,
|
||||
'user_id': new_employee.id,
|
||||
}), 200
|
||||
return success_response({'user_id': new_employee.id})
|
||||
|
||||
|
||||
@employees.route("/edit/<int:employee_id>", methods=["POST"])
|
||||
@@ -228,4 +227,4 @@ def employee_edit(employee_id):
|
||||
db.session.add(get_employee)
|
||||
db.session.commit()
|
||||
|
||||
return jsonify({"ok": True}), 200
|
||||
return success_response()
|
||||
|
||||
Reference in New Issue
Block a user