diff --git a/wscacicneo/__init__.py b/wscacicneo/__init__.py index 3a31751..686c748 100644 --- a/wscacicneo/__init__.py +++ b/wscacicneo/__init__.py @@ -46,6 +46,12 @@ def main(global_config, **settings): config.add_route('listorgao', 'orgao/list') config.add_route('delete_orgao', 'delete_orgao') # + + #Usuários + config.add_route('users', 'users') + config.add_route('post_user', 'post_user') + # + config.add_route('list', 'list') config.add_route('gestao', 'gestao') config.add_route('memoria', 'memoria') @@ -54,7 +60,6 @@ def main(global_config, **settings): config.add_route('escritorio', 'escritorio') config.add_route('hd', 'hd') config.add_route('config', 'config') - config.add_route('users', 'users') config.add_route('bot', 'bot') config.add_route('login', 'login') config.add_route('reports', 'reports') diff --git a/wscacicneo/model/user.py b/wscacicneo/model/user.py new file mode 100644 index 0000000..0777787 --- /dev/null +++ b/wscacicneo/model/user.py @@ -0,0 +1,245 @@ +#!/usr/env python +# -*- coding: utf-8 -*- +__author__ = 'adley' + +from requests.exceptions import HTTPError +from wscacicneo import WSCacicNeo +import logging +from liblightbase.lbbase.struct import Base, BaseMetadata +from liblightbase.lbbase.lbstruct.group import * +from liblightbase.lbbase.lbstruct.field import * +from liblightbase.lbbase.content import Content +from liblightbase.lbrest.base import BaseREST +from liblightbase.lbrest.document import DocumentREST +from liblightbase.lbutils import conv +from liblightbase.lbsearch.search import Search, OrderBy + +log = logging.getLogger() + +class UserBase(WSCacicNeo): + """ + Classe para a base de usuários + """ + def __init__(self): + """ + Método construtor + """ + WSCacicNeo.__init__(self) + self.baserest = BaseREST(rest_url=self.rest_url, response_object=True) + self.documentrest = DocumentREST(rest_url=self.rest_url, + base=self.lbbase, response_object=False) + + @property + def lbbase(self): + """ + LB Base de Users + """ + nome = Field(**dict( + name='nome', + description='Nome do Usuário', + alias='nome', + datatype='Text', + indices=['Textual'], + multivalued=False, + required=True + )) + + matricula = Field(**dict( + name='matricula', + alias='matricula', + description='Matricula do Usuário', + datatype='Text', + indices=['Textual'], + multivalued=False, + required=True + )) + + email = Field(**dict( + name='email', + alias='email', + description='E-mail do Usuário', + datatype='Text', + indices=['Textual'], + multivalued=False, + required=True + )) + + telefone = Field(**dict( + name='telefone', + alias='telefone', + description='Telefone do Usuário', + datatype='Text', + indices=['Textual'], + multivalued=False, + required=True + )) + + orgao = Field(**dict( + name='orgao', + alias='orgao', + description='Orgão do Usuário', + datatype='Text', + indices=['Textual'], + multivalued=False, + required=True + )) + + + cargo = Field(**dict( + name='cargo', + alias='cargo', + description='Cargo do Usuário', + datatype='Text', + indices=['Textual'], + multivalued=False, + required=True + )) + + setor = Field(**dict( + name='setor', + alias='setor', + description='Setor do Usuário', + datatype='Text', + indices=['Textual'], + multivalued=False, + required=True + )) + + permissao = Field(**dict( + name='permissao', + alias='permissao', + description='Permissão do Usuário', + datatype='Text', + indices=['Textual'], + multivalued=False, + required=True + )) + + base_metadata = BaseMetadata( + name='users', + ) + + content_list = Content() + content_list.append(nome) + content_list.append(matricula) + content_list.append(email) + content_list.append(telefone) + content_list.append(orgao) + content_list.append(cargo) + content_list.append(setor) + content_list.append(permissao) + + lbbase = Base( + metadata=base_metadata, + content=content_list + ) + + return lbbase + + @property + def metaclass(self): + """ + Retorna metaclass para essa base + """ + return self.lbbase.metaclass() + + def create_base(self): + """ + Cria base no LB + """ + response = self.baserest.create(self.lbbase) + #print(response.status_code) + if response.status_code == 200: + return self.lbbase + else: + return None + + def remove_base(self): + """ + Remove base from Lightbase + :param lbbase: LBBase object instance + :return: True or Error if base was not excluded + """ + response = self.baserest.delete(self.lbbase) + if response.status_code == 200: + return True + else: + raise IOError('Error excluding base from LB') + +user_base = UserBase() + +class User(user_base.metaclass): + """ + Classe genérica de usuários + """ + def __init__(self, **args): + super(User, self).__init__(**args) + self.documentrest = user_base.documentrest + + def user_to_dict(self): + """ + Convert status object to Python dict + :return: + """ + + return conv.document2dict(user_base.lbbase, self) + + def user_to_json(self): + """ + Convert object to json + :return: + """ + + return conv.document2json(user_base.lbbase, self) + + def create_user(self): + """ + Insert document on base + + :return: Document creation ID + """ + + document = self.user_to_json() + try: + result = user_base.documentrest.create(document) + except HTTPError as err: + log.error(err.strerror) + return None + + return result + + def search_user(self, matricula_user): + """ + Busca registro completo do usuário pela matricula + :return: obj collection com os dados da base + """ + search = Search( + literal="document->>'matricula' = '"+matricula_user+"'" + ) + results = self.documentrest.get_collection(search_obj=search) + + return results + + def search_list_users(self): + """ + Retorna todos os docs da base + """ + results = self.documentrest.get_collection(limit=None) + + return results + + def edit_user(self, id, doc): + """ + altera um doc ou path do doc + """ + results = self.documentrest.update(id, doc) + + return results + + def delete_user(self, id): + """ + Deleta o Órgao apartir do ID + """ + results = user_base.documentrest.delete(id) + + return results \ No newline at end of file diff --git a/wscacicneo/model/users.py b/wscacicneo/model/users.py deleted file mode 100644 index 5912c7a..0000000 --- a/wscacicneo/model/users.py +++ /dev/null @@ -1,245 +0,0 @@ -#!/usr/env python -# -*- coding: utf-8 -*- -__author__ = 'adley' - -from requests.exceptions import HTTPError -from wscacicneo import WSCacicNeo -import logging -from liblightbase.lbbase.struct import Base, BaseMetadata -from liblightbase.lbbase.lbstruct.group import * -from liblightbase.lbbase.lbstruct.field import * -from liblightbase.lbbase.content import Content -from liblightbase.lbrest.base import BaseREST -from liblightbase.lbrest.document import DocumentREST -from liblightbase.lbutils import conv -from liblightbase.lbsearch.search import Search, OrderBy - -log = logging.getLogger() - -class UserBase(WSCacicNeo): - """ - Classe para a base de usuários - """ - def __init__(self): - """ - Método construtor - """ - WSCacicNeo.__init__(self) - self.baserest = BaseREST(rest_url=self.rest_url, response_object=True) - self.documentrest = DocumentREST(rest_url=self.rest_url, - base=self.lbbase, response_object=False) - - @property - def lbbase(self): - """ - LB Base do Users - """ - nome = Field(**dict( - name='nome', - description='Nome do Usuário', - alias='nome', - datatype='Text', - indices=['Textual'], - multivalued=False, - required=True - )) - - matricula = Field(**dict( - name='matricula', - alias='matricula', - description='Matricula do Usuário', - datatype='Text', - indices=['Textual'], - multivalued=False, - required=True - )) - - email = Field(**dict( - name='email', - alias='email', - description='E-mail do Usuário', - datatype='Text', - indices=['Textual'], - multivalued=False, - required=True - )) - - telefone = Field(**dict( - name='telefone', - alias='telefone', - description='Telefone do Usuário', - datatype='Text', - indices=['Textual'], - multivalued=False, - required=True - )) - - orgao = Field(**dict( - name='orgao', - alias='orgao', - description='Orgão do Usuário', - datatype='Text', - indices=['Textual'], - multivalued=False, - required=True - )) - - - cargo = Field(**dict( - name='cargo', - alias='cargo', - description='Cargo do Usuário', - datatype='Text', - indices=['Textual'], - multivalued=False, - required=True - )) - - setor = Field(**dict( - name='setor', - alias='setor', - description='Setor do Usuário', - datatype='Text', - indices=['Textual'], - multivalued=False, - required=True - )) - - permissao = Field(**dict( - name='permissao', - alias='permissao', - description='Permissão do Usuário', - datatype='Text', - indices=['Textual'], - multivalued=False, - required=True - )) - - base_metadata = BaseMetadata( - name='users', - ) - - content_list = Content() - content_list.append(nome) - content_list.append(matricula) - content_list.append(email) - content_list.append(telefone) - content_list.append(orgao) - content_list.append(cargo) - content_list.append(setor) - content_list.append(permissao) - - lbbase = Base( - metadata=base_metadata, - content=content_list - ) - - return lbbase - - @property - def metaclass(self): - """ - Retorna metaclass para essa base - """ - return self.lbbase.metaclass() - - def create_base(self): - """ - Cria base no LB - """ - response = self.baserest.create(self.lbbase) - #print(response.status_code) - if response.status_code == 200: - return self.lbbase - else: - return None - - def remove_base(self): - """ - Remove base from Lightbase - :param lbbase: LBBase object instance - :return: True or Error if base was not excluded - """ - response = self.baserest.delete(self.lbbase) - if response.status_code == 200: - return True - else: - raise IOError('Error excluding base from LB') - -user_base = UserBase() - -class User(user.base.metaclass): - """ - Classe genérica de usuários - """ - def __init__(self, **args): - super(Orgao, self).__init__(**args) - self.documentrest = user_base.documentrest - - def user_to_dict(self): - """ - Convert status object to Python dict - :return: - """ - - return conv.document2dict(user_base.lbbase, self) - - def user_to_json(self): - """ - Convert object to json - :return: - """ - - return conv.document2json(user_base.lbbase, self) - - def create_user(self): - """ - Insert document on base - - :return: Document creation ID - """ - - document = self.orgao_to_json() - try: - result = user_base.documentrest.create(document) - except HTTPError as err: - log.error(err.strerror) - return None - - return result - - def search_user(self, matricula_user): - """ - Busca registro completo do usuário pela matricula - :return: obj collection com os dados da base - """ - search = Search( - literal="document->>'matricula' = '"+matricula_user+"'" - ) - results = self.documentrest.get_collection(search_obj=search) - - return results - - def search_list_users(self): - """ - Retorna todos os docs da base - """ - results = self.documentrest.get_collection(limit=None) - - return results - - def edit_user(self, id, doc): - """ - altera um doc ou path do doc - """ - results = self.documentrest.update(id, doc) - - return results - - def delete_user(self, id): - """ - Deleta o Órgao apartir do ID - """ - results = user_base.documentrest.delete(id) - - return results \ No newline at end of file diff --git a/wscacicneo/templates/users.pt b/wscacicneo/templates/users.pt index da7bfa3..6b1b314 100644 --- a/wscacicneo/templates/users.pt +++ b/wscacicneo/templates/users.pt @@ -1,7 +1,91 @@ - - - -
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+
+
+ + + + - diff --git a/wscacicneo/test/test_user_base.py b/wscacicneo/test/test_user_base.py new file mode 100644 index 0000000..6a21a37 --- /dev/null +++ b/wscacicneo/test/test_user_base.py @@ -0,0 +1,38 @@ +#!/usr/env python +# -*- coding: utf-8 -*- +__author__ = 'adley' + +import unittest +from wscacicneo.model import user +from liblightbase.lbbase.struct import Base +from liblightbase.lbutils import conv + +class TestUserBase(unittest.TestCase): + """ + Testa base do órgão no LB + """ + def setUp(self): + """ + Carregando atributos genéricos do teste + """ + pass + + def test_create_base(self): + """ + Testa criação da base no LB + """ + user_base = user.UserBase() + lbbase = user_base.lbbase + self.assertIsInstance(lbbase, Base) + + retorno = user_base.create_base() + self.assertIsInstance(retorno, Base) + + #retorno = user_base.remove_base() + #self.assertTrue(retorno) + + def tearDown(self): + """ + Apaga dados do teste + """ + pass diff --git a/wscacicneo/views.py b/wscacicneo/views.py index 2f8bf19..95e95c7 100644 --- a/wscacicneo/views.py +++ b/wscacicneo/views.py @@ -11,6 +11,8 @@ from .models import ( ) from wscacicneo.model.orgao import Orgao from wscacicneo.model.orgao import OrgaoBase +from wscacicneo.model.user import User +from wscacicneo.model.user import UserBase from liblightbase.lbbase.struct import Base from liblightbase.lbutils import conv from liblightbase.lbrest.document import DocumentREST @@ -275,3 +277,28 @@ def delete_orgao(request): return Response(str(delete)) +#URL Users + +@view_config(route_name='post_user') +def post_user(request): + """ + Post doc users + """ + rest_url = REST_URL + userbase = UserBase().lbbase + doc = request.params + user_obj = User( + nome = doc['nome'], + matricula = doc['matricula'], + email = doc['email'], + orgao = doc['orgao'], + telefone = doc['telefone'], + cargo = doc['cargo'], + setor = doc['setor'], + permissao = doc['permissao'] + ) + + id_doc = user_obj.create_user() + print(id_doc) + + return Response(str(id_doc)) \ No newline at end of file -- libgit2 0.21.2