Commit eee5b6cd authored by deepdey's avatar deepdey

chore: update user schema and orm

parent 7f84ab96
...@@ -15,17 +15,20 @@ class User(db.Model, CustomSerializerMixin): ...@@ -15,17 +15,20 @@ class User(db.Model, CustomSerializerMixin):
) )
username = db.Column(db.String(80), nullable=False) username = db.Column(db.String(80), nullable=False)
first_name = db.Column(db.String(80), nullable=False) name = db.Column(db.String(255), nullable=False)
last_name = db.Column(db.String(80), nullable=False)
password = db.Column(db.String(80), nullable=False) password = db.Column(db.String(80), nullable=False)
phone = db.Column(db.String(20), nullable=False) organization = db.Column(db.String(255), nullable=False)
gstin = db.Column(db.String(50), nullable=False)
email = db.Column(db.String(120), nullable=False) email = db.Column(db.String(120), nullable=False)
gender = db.Column(db.String(20), nullable=False) phone_number = db.Column(db.String(20), nullable=False)
active = db.Column(db.Boolean, default=True, nullable=False) email_verified = db.Column(db.Boolean, default=False, nullable=False)
date_of_join = db.Column(db.BigInteger, nullable=False) phone_verified = db.Column(db.Boolean, default=False, nullable=False)
status = db.Column(db.String(20), nullable=False)
created_at = db.Column(db.DATETIME, default=datetime.now) created_at = db.Column(db.DATETIME, default=datetime.now)
updated_at = db.Column(db.DATETIME, onupdate=datetime.now) updated_at = db.Column(db.DATETIME, onupdate=datetime.now)
created_by = db.Column(db.BigInteger, db.ForeignKey('webomagic_user.id'))
updated_by = db.Column(db.BigInteger, db.ForeignKey('webomagic_user.id'))
is_deleted = db.Column(db.Boolean, default=False) is_deleted = db.Column(db.Boolean, default=False)
user_roles = db.relationship('UserRoleMap') user_roles = db.relationship('UserRoleMap')
......
...@@ -10,18 +10,21 @@ USER_RESPONSE_MODEL: any = api.model( ...@@ -10,18 +10,21 @@ USER_RESPONSE_MODEL: any = api.model(
{ {
'id': fields.Integer, 'id': fields.Integer,
'username': fields.String, 'username': fields.String,
'first_name': fields.String, 'name': fields.String,
'last_name': fields.String, 'organization': fields.String,
'phone': fields.String, 'gstin': fields.String,
'email': fields.String, 'email': fields.String,
'gender': fields.String, 'phone_number': fields.String,
'active': fields.Boolean, 'email_verified': fields.Boolean,
'date_of_join': fields.DateTime, 'phone_verified': fields.Boolean,
'status': fields.String,
'user_roles': fields.List( 'user_roles': fields.List(
fields.String(default='{}', description='user roles object in json') fields.String(default='{}', description='user roles object in json')
), ),
'created_at': fields.DateTime, 'created_at': fields.DateTime,
'created_by': fields.Integer,
'updated_at': fields.DateTime, 'updated_at': fields.DateTime,
'updated_by': fields.Integer,
'is_deleted': fields.Boolean, 'is_deleted': fields.Boolean,
}, },
) )
......
INSERT INTO INSERT INTO
public.webomagic_user ( public.webomagic_user (
username, username,
first_name, name,
last_name, password,
"password", organization,
phone,
email, email,
gender, phone_number,
active, status
date_of_join
) )
VALUES VALUES (
(
'deepdey', 'deepdey',
'Deep', 'Deep Dey',
'Dey',
'$2b$12$du0B3AlnD5wOYxt.ADYPwuaCFqF7R3XrLHDiNca4FvVtTGPIQVEu2', '$2b$12$du0B3AlnD5wOYxt.ADYPwuaCFqF7R3XrLHDiNca4FvVtTGPIQVEu2',
'8697448896', 'WebsoftTechs',
'deep.websofttechs@gmail.com', 'deep.websofttechs@gmail.com',
'UNDEFINED', '8697448896',
true, 'IN_ACTIVE'
0
); );
INSERT INTO INSERT INTO
public.role_type (role_name, is_deleted) public.role_type (role_name, is_deleted)
VALUES VALUES ('SUPER_ADMIN', false),
('SUPER_ADMIN', false),
('PROJECT_ADMIN', false), ('PROJECT_ADMIN', false),
('PROJECT_STAFF', false), ('PROJECT_STAFF', false),
('PROJECT_USER', false); ('PROJECT_USER', false);
INSERT INTO INSERT INTO
public.role (role_type_id, role_name, project_id, is_deleted) public.role (
VALUES role_type_id,
(1, 'PROJECT_ADMIN', 1, false), role_name,
(3, 'PRODUCT_MANAGER', 1, false); project_id,
is_deleted
)
VALUES (1, 'PROJECT_ADMIN', 1, false),
(
3,
'PRODUCT_MANAGER',
1,
false
);
INSERT INTO INSERT INTO
public.webomagic_api (endpoint, method, tag) public.webomagic_api (endpoint, method, tag)
VALUES VALUES (
('/webomagic-user/v1/profile', 'GET', 'RA'); '/webomagic-user/v1/profile',
'GET',
'RA'
);
\ No newline at end of file
...@@ -33,17 +33,22 @@ CREATE TABLE ...@@ -33,17 +33,22 @@ CREATE TABLE
IF NOT EXISTS webomagic_user ( IF NOT EXISTS webomagic_user (
id BIGSERIAL PRIMARY KEY NOT NULL, id BIGSERIAL PRIMARY KEY NOT NULL,
username VARCHAR(80) UNIQUE NOT NULL, username VARCHAR(80) UNIQUE NOT NULL,
first_name VARCHAR(80) NOT NULL, name VARCHAR(255) NOT NULL,
last_name VARCHAR(80) NOT NULL,
password VARCHAR(80) NOT NULL, password VARCHAR(80) NOT NULL,
phone VARCHAR(20) UNIQUE NOT NULL, organization VARCHAR(255),
gstin VARCHAR(50),
email VARCHAR(120) UNIQUE NOT NULL, email VARCHAR(120) UNIQUE NOT NULL,
gender VARCHAR(20) NOT NULL, phone_number VARCHAR(20) UNIQUE NOT NULL,
active BOOLEAN DEFAULT true, phone_verified BOOLEAN DEFAULT false,
date_of_join BIGINT NOT NULL, email_verified BOOLEAN DEFAULT false,
status VARCHAR(20) NOT NULL,
is_deleted BOOLEAN DEFAULT false, is_deleted BOOLEAN DEFAULT false,
created_at TIMESTAMP NOT NULL DEFAULT now (), created_at TIMESTAMP NOT NULL DEFAULT now (),
updated_at TIMESTAMP created_by BIGINT,
updated_at TIMESTAMP,
updated_by BIGINT,
FOREIGN KEY (created_by) REFERENCES webomagic_user(id),
FOREIGN KEY (updated_by) REFERENCES webomagic_user(id)
); );
CREATE TABLE CREATE TABLE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment