bugfixes and postman collection

Author: JoeVictor22

Makefile

@@ -6,7 +6,7 @@ install:
 	pip install -r requirements.txt
 
 freeze:
-    pip freeze > requirements.txt
+	pip freeze > requirements.txt
 
 create_db:
 	rm -Rf migrations/

app/__init__.py

@@ -47,5 +47,4 @@
 from app.controllers import perfilController
 from app.controllers import cargoController
 from app.controllers import cidadeController
-from app.controllers import cadastroController
 

app/controllers/cadastroController.py

@@ -1,14 +1,17 @@
 from app import app, db, Messages
+from . import resource, paginate
 from flask import request, jsonify
 from flask_jwt_extended import jwt_required, get_jwt_identity
 from sqlalchemy import exc, or_
 from werkzeug.security import generate_password_hash
-from . import resource, paginate
 from app import Usuario, Perfil
-
+from app import fieldsFormatter
 
 from flask_pydantic import validate
 from app import UsuarioAddSchema, UsuarioEditSchema
+from app import CadastroAddSchema
+
+
 
 @app.route("/usuario/all", methods=["GET"])
 @jwt_required
@@ -162,7 +165,7 @@ def usuarioEdit(usuario_id):
             {"message": Messages.ALREADY_EXISTS.format("email"), "error": True}
         )
 
-    # if user is tring to edit itself, let it change password
+    # if user is trying to edit itself, let it change password
     if logged_user.id == usuario.id:
         # check should change password
         if data.get('senha') is not None:
@@ -224,3 +227,71 @@ def usuarioDelete(usuario_id):
         return jsonify(
             {"message": Messages.REGISTER_DELETE_INTEGRITY_ERROR, "error": True}
         )
+
+
+# --------------------------------------------------------------------------------------------------#
+
+@app.route("/usuario/cadastro", methods=["POST"])
+@validate(body=CadastroAddSchema)
+def cadastroAdd():
+    data = request.get_json()
+
+    # if there is already a user with email
+
+    if Usuario.query.filter_by(email=data.get("email").lower()).first():
+        return jsonify(
+            {"message": Messages.ALREADY_EXISTS.format("email"), "error": True}
+        )
+
+    # check if there is already a user with cpf/pis
+    cpf = fieldsFormatter.CpfFormatter().clean(data["cpf"])
+    pis = fieldsFormatter.PisFormatter().clean(data["pis"])
+    perfil = Perfil.query.filter(or_(Perfil.cpf == cpf, Perfil.pis == pis)).first()
+    if perfil is not None:
+        return jsonify(
+            {"message": Messages.ALREADY_EXISTS.format("CPF/PIS"), "error": True}
+        )
+
+    hashed_pass = generate_password_hash(data.get('senha'), method="sha256")
+    email = data.get("email").lower()
+
+    perfil = Perfil(
+        nome=data.get("nome"),
+        pis=fieldsFormatter.PisFormatter().clean(data.get("pis")),
+        cpf=fieldsFormatter.CpfFormatter().clean(data.get("cpf")),
+        cep=fieldsFormatter.CepFormatter().clean(data.get("cep")),
+        rua=data.get("rua"),
+        numero=data.get("numero"),
+        complemento=data.get("complemento"),
+        cidade_id=data.get("cidade_id"),
+    )
+
+    db.session.add(perfil)
+
+    try:
+        db.session.flush()
+
+        usuario = Usuario(
+            email=email,
+            senha=hashed_pass,
+            perfil_id=perfil.id,
+            cargo_id=2,
+        )
+
+        db.session.add(usuario)
+
+        db.session.commit()
+        return jsonify(
+            {
+                "message": Messages.REGISTER_SUCCESS_CREATED.format("Login"),
+                "error": False,
+            }
+        )
+    except exc.IntegrityError:
+        db.session.rollback()
+        return jsonify(
+            {"message": Messages.REGISTER_CREATE_INTEGRITY_ERROR, "error": True}
+        )
+
+
+# --------------------------------------------------------------------------------------------------#

app/controllers/usuarioController.py

@@ -1,10 +1,9 @@
 from typing import Optional
 import re
 from pydantic import BaseModel, validator, constr
-from app import Usuario, Perfil, fieldsFormatter
-
 from validate_docbr import CPF, PIS
 
+
 class CadastroAddSchema(BaseModel):
 
     email: constr(min_length=5, max_length=255)