Merge pull request #2 from Hzin/bugfix/data-nascimento

Ajustes em data
This commit is contained in:
CloudAlb
2022-08-22 19:39:33 -03:00
committed by GitHub
5 changed files with 41 additions and 14 deletions

View File

@@ -0,0 +1,28 @@
import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
export class AlterUsersTableEditBirthDateFieldTypeToString1661199963221 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.dropColumn('users', 'birth_date')
await queryRunner.addColumn('users', new TableColumn(
{
name: 'birth_date',
type: 'varchar',
isNullable: true
},
))
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.dropColumn('users', 'birth_date')
await queryRunner.addColumn('users', new TableColumn(
{
name: 'birth_date',
type: 'date',
isNullable: true
},
))
}
}

View File

@@ -21,12 +21,12 @@ class User {
@Column() @Column()
email: string; email: string;
@Column() @Column()
phone_number: string; phone_number: string;
@Column() @Column()
birth_date: Date; birth_date: string;
@Column() @Column()
password: string; password: string;
@@ -36,7 +36,7 @@ class User {
@Column() @Column()
bio: string; bio: string;
@Column() @Column()
star_rating: number; star_rating: number;

View File

@@ -49,14 +49,14 @@ usersRouter.get('/:id', ensureAuthenticated, async (request, response) => {
const user = await findUserService.execute(id); const user = await findUserService.execute(id);
// converting ISO 8601 date to normal date // // converting ISO 8601 date to normal date
let birth_date = new Date(user.birth_date); // let birth_date = new Date(user.birth_date);
let year = birth_date.getFullYear(); // let year = birth_date.getFullYear();
let month = birth_date.getMonth() + 1; // let month = birth_date.getMonth() + 1;
let date = birth_date.getDate(); // let date = birth_date.getDate();
const finalDate = `${date}/${month}/${year}`; // const newBirthDate = `${date}/${month}/${year}`;
const userWithoutPassword = { const userWithoutPassword = {
id_user: user.id_user, id_user: user.id_user,
@@ -64,7 +64,7 @@ usersRouter.get('/:id', ensureAuthenticated, async (request, response) => {
lastname: user.lastname, lastname: user.lastname,
email: user.email, email: user.email,
phone_number: user.phone_number, phone_number: user.phone_number,
birth_date: finalDate, birth_date: user.birth_date,
avatar_image: user.avatar_image, avatar_image: user.avatar_image,
bio: user.bio, bio: user.bio,
document_type: user.document_type, document_type: user.document_type,

View File

@@ -18,7 +18,7 @@ interface Request {
class CreateUserService { class CreateUserService {
public async execute({ name, lastname, email, birth_date, password }: Request): Promise<User> { public async execute({ name, lastname, email, birth_date, password }: Request): Promise<User> {
const usersRepository = getRepository(User); const usersRepository = getRepository(User);
const socialInformationRepository = getRepository(Social); // const socialInformationRepository = getRepository(Social);
const checkUserEmailExists = await usersRepository.findOne({ const checkUserEmailExists = await usersRepository.findOne({
where: { email }, where: { email },

View File

@@ -34,6 +34,7 @@ class UpdateUserService {
if (lastname) user.lastname = lastname if (lastname) user.lastname = lastname
if (bio) user.bio = bio if (bio) user.bio = bio
if (email) user.email = email if (email) user.email = email
if (birth_date) user.birth_date = birth_date
if (phone_number) { if (phone_number) {
const phoneAlreadyExists = await usersRepository.findOne({ const phoneAlreadyExists = await usersRepository.findOne({
@@ -44,13 +45,11 @@ class UpdateUserService {
throw new AppError('O telefone informado já está em uso por outra conta!', 409); throw new AppError('O telefone informado já está em uso por outra conta!', 409);
} }
} }
user.phone_number = phone_number user.phone_number = phone_number
if (document_type) user.document_type = document_type if (document_type) user.document_type = document_type
if (document) user.document = document if (document) user.document = document
// user.birth_date = new Date(birth_date); // TODO, funciona?
await usersRepository.save(user); await usersRepository.save(user);