From b832612b34839bb12da598b45cca389cf2e3bafc Mon Sep 17 00:00:00 2001 From: Antero Asafe Date: Sat, 17 May 2025 19:37:49 -0400 Subject: [PATCH] Models atualizados --- app/models/Usuario.py | 3 +++ app/routes/documentos.py | 6 +++--- app/routes/organizacao.py | 8 ++++---- app/routes/usuario.py | 4 ++-- instance/database.db | Bin 49152 -> 49152 bytes 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/models/Usuario.py b/app/models/Usuario.py index 8d5bc54..2cfeda4 100644 --- a/app/models/Usuario.py +++ b/app/models/Usuario.py @@ -19,3 +19,6 @@ class Usuario(db.Model): organizacao = db.relationship('Organizacao', back_populates='usuarios') documentos = db.relationship('Documento', back_populates='usuario') + + def __repr__(self): + return f'' \ No newline at end of file diff --git a/app/routes/documentos.py b/app/routes/documentos.py index 13492f0..84d233d 100644 --- a/app/routes/documentos.py +++ b/app/routes/documentos.py @@ -1,13 +1,13 @@ from flask import Blueprint, request, jsonify from app.database import db -from app.models import documento +from app.models.documento import Documento documentos_bp = Blueprint('documentos', __name__, url_prefix='/documentos') @documentos_bp.route('/', methods=['GET']) def get_documentos(): - documentos = documento.query.all() + documentos = Documento.query.all() documentos_data = [ { 'id': str(doc.id), @@ -27,7 +27,7 @@ def create_documento(): return jsonify({'error': 'Campos obrigatórios ausentes'}), 400 try: - novo_documento = documento( + novo_documento = Documento( nome_arquivo=data['nome_arquivo'], caminho_arquivo=data['caminho_arquivo'], usuario_id=data['usuario_id'] diff --git a/app/routes/organizacao.py b/app/routes/organizacao.py index 2ec2b21..723ba30 100644 --- a/app/routes/organizacao.py +++ b/app/routes/organizacao.py @@ -1,6 +1,6 @@ from flask import Blueprint, request, jsonify from app.database import db -from app.models import organizacao # ajuste conforme sua estrutura +from app.models.organizacao import Organizacao # ajuste conforme sua estrutura organizacoes_bp = Blueprint( 'organizacoes', __name__, url_prefix='/organizacoes') @@ -8,7 +8,7 @@ organizacoes_bp = Blueprint( @organizacoes_bp.route('/', methods=['GET']) def get_organizacoes(): - organizacoes = organizacao.query.all() + organizacoes = Organizacao.query.all() data = [ { 'id': org.id, @@ -26,11 +26,11 @@ def create_organizacao(): if not data or 'nome' not in data: return jsonify({'error': 'O campo "nome" é obrigatório'}), 400 - if organizacao.query.filter_by(nome=data['nome']).first(): + if Organizacao.query.filter_by(nome=data['nome']).first(): return jsonify({'error': 'Já existe uma organização com este nome'}), 409 try: - nova_org = organizacao(nome=data['nome']) + nova_org = Organizacao(nome=data['nome']) db.session.add(nova_org) db.session.commit() diff --git a/app/routes/usuario.py b/app/routes/usuario.py index 4877ece..9ae5818 100644 --- a/app/routes/usuario.py +++ b/app/routes/usuario.py @@ -1,13 +1,13 @@ from flask import Blueprint, request, jsonify from app.database import db -from app.models import usuario # nome correto do modelo +from app.models.usuario import Usuario # nome correto do modelo usuarios_bp = Blueprint('usuarios', __name__, url_prefix='/usuarios') @usuarios_bp.route('/', methods=['GET']) def get_usuarios(): - usuarios = usuario.query.all() + usuarios = Usuario.query.all() usuarios_data = [ { 'id': usuario.id, diff --git a/instance/database.db b/instance/database.db index 28a9ccee07607c8ec8e59353d694c3a67c54564b..5b79897a094d6db10a00d079611fdb5eb70e3b51 100644 GIT binary patch delta 158 zcmZo@U~Xt&o*>Q0IZ?)$k#l3hl6*Es{sRpB2Q~{DY~%N`W8`2^)|KTnX7I{Cyf|MW zI5Vd#F)KeY-yyXkF}ENmRWCU|w>UK~Bhk>v*vP=hRM)^%*U((S$k@u*+{(y+i-CcG qk^c_^{~w@v@A(CRTxMoYPKfXu2L3ld;Ya);!pypy=%y}mPyhh9RV#r2 delta 28 kcmZo@U~Xt&o*>Q0F;T{ukz-@RlKjOi4hEZ99RA1y0DP|r0RR91