From 1bff849684ef48864bd2dbb477cae575c5a1a305 Mon Sep 17 00:00:00 2001 From: ka-lucas Date: Tue, 6 May 2025 17:27:02 -0300 Subject: [PATCH] ultima versao api --- app.py | 8 +++---- seeds/holiday_seed.py | 53 ++++++++++++++++++------------------------- seeds/run_seed.py | 16 ++++++------- seeds/users_seed.py | 3 +-- 4 files changed, 34 insertions(+), 46 deletions(-) diff --git a/app.py b/app.py index 26cc37d..9e37855 100644 --- a/app.py +++ b/app.py @@ -153,7 +153,7 @@ def get_database_type(uri): if __name__ == "__main__": app = create_app() - # with app.app_context(): - # db.create_all() # Cria as tabelas - # run_all_seeds() - app.run(debug=True, host="0.0.0.0") + with app.app_context(): + db.create_all() # Cria as tabelas + run_all_seeds() # Executa os seeds + app.run(debug=True, host="0.0.0.0") diff --git a/seeds/holiday_seed.py b/seeds/holiday_seed.py index 8f82b35..a868d0a 100644 --- a/seeds/holiday_seed.py +++ b/seeds/holiday_seed.py @@ -17,38 +17,29 @@ def seed_holiday(): "estado":"Rio de Janeiro", "municipio":"Rio de Janeiro", - }, + } - # Feriado 2 - { - "parent_id": 1, - "service_instance_id":4, - "name": "Dia das crianças", - "date": data_iso2, - "estado":"Rio de Janeiro", - "municipio":"Rio de Janeiro", - }, ] for holiday_data in holidays: - # Verifica se já existe um papel para o service_id e name fornecidos - existing_holiday = db.session.query(Holiday).filter_by( - date=holiday_data["date"], - name=holiday_data["name"] - ).first() - - # Se não existe, cria o novo papel - if not existing_holiday: - holiday = Holiday( + # Verifica se já existe um papel para o service_id e name fornecidos + existing_holiday = db.session.query(Holiday).filter_by( date=holiday_data["date"], - service_instance_id=holiday_data["service_instance_id"], - name=holiday_data["name"], - parent_id=holiday_data["parent_id"], - estado=holiday_data["estado"], - municipio=holiday_data["municipio"] - ) - print("antes do banco") - db.session.add(holiday) - print("adiconei no banco") - - # Commit a transação para salvar os dados no banco - db.session.commit() + name=holiday_data["name"] + ).first() + + # Se não existe, cria o novo papel + if not existing_holiday: + holiday = Holiday( + date=holiday_data["date"], + service_instance_id=holiday_data["service_instance_id"], + name=holiday_data["name"], + parent_id=holiday_data["parent_id"], + estado=holiday_data["estado"], + municipio=holiday_data["municipio"] + ) + print("antes do banco") + db.session.add(holiday) + print("adiconei no banco") + + # Commit a transação para salvar os dados no banco +db.session.commit() \ No newline at end of file diff --git a/seeds/run_seed.py b/seeds/run_seed.py index fe26a91..40a633b 100644 --- a/seeds/run_seed.py +++ b/seeds/run_seed.py @@ -14,7 +14,6 @@ from .camera_seed import seed_cameras from .ambiente_seed import seed_ambiente from .reports_seed import reports_seed from .shifts_times_seed import seed_shifts_and_schedules -from .holiday_seed import seed_holiday from .company_seed import seed_company from .time_schedule import seed_time_schedules from extensions import db @@ -23,14 +22,14 @@ from extensions import db def run_all_seeds(): try: print("Iniciando o processo de seed...") - # seed_services() + seed_services() # seed_holiday() - # seed_service_instances() + seed_service_instances() # seed_company() - # seed_permissions() - # seed_service_roles() - # seed_service_role_permissions() - # seed_users() + seed_permissions() + seed_service_roles() + seed_service_role_permissions() + seed_users() # seed_address_types() # seed_address() #seed_contacts() @@ -39,8 +38,7 @@ def run_all_seeds(): # seed_ambiente() # reports_seed() # seed_cameras() - # seed_shifts_and_schedules() - # seed_holiday() + #seed_shifts_and_schedules() seed_time_schedules() print("Seeds executados com sucesso!") diff --git a/seeds/users_seed.py b/seeds/users_seed.py index 5ba164a..d669a30 100644 --- a/seeds/users_seed.py +++ b/seeds/users_seed.py @@ -66,8 +66,7 @@ def seed_users(): user = User( username=user_data["username"], email=user_data["email"], - phone=user_data["phone"], - service_role_id=user_data["service_role_id"] + service_instance_id=user_data["service_instance_id"] ) user.set_password(user_data["password"]) # Gerar o hash da senha db.session.add(user)