Commit 9c27c40f authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch pueblosmagicosconia:main into main

parents c5f1d77d befe7055

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ 
/mobile/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver

/mobile/assets/audio_prueba.mp3

.vscode/settings.json

web/.env

backend/src/admin/admin.module.ts

+2 −1
Original line number Diff line number Diff line
@@ -7,11 +7,12 @@ import { Town } from 'src/town/entities/town.entity'; 
import { AuthAdminService } from 'src/auth/admin/authAdmin.service';

import { JwtService } from '@nestjs/jwt';

import { EncryptionService } from 'src/auth/encryption/encryption.service';

import { AdminResetCode } from 'src/auth/admin/entitites/admin-reset-code.entity';



@Module({

  controllers: [AdminController],

  providers: [AdminService, AuthAdminService, JwtService, EncryptionService],

  imports: [TypeOrmModule.forFeature([Admin, Town])],

  imports: [TypeOrmModule.forFeature([Admin, Town, AdminResetCode])],

  exports: [AdminService],

})

export class AdminModule {}

backend/src/admin/admin.service.ts

+9 −3
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ export class AdminService { 
    }

  }



  async adminExists(email: string): Promise<boolean> {

    const admin = await this.adminRepository.findOneBy({ email });

    if (admin) return true;

    else return false;

  }



  async updatePassword(email: string, password: string) {

    await this.adminRepository.update({ email }, { password });

  }
@@ -45,7 +51,7 @@ export class AdminService { 
        idTown: admin.idTown.townId,

        name: admin.name,

        lastName: admin.lastName,

        status: admin.status

        status: admin.status,

      };

    });

    return admins;

backend/src/admin/entities/admin.entity.ts

+5 −1
Original line number Diff line number Diff line 
import { AdminResetCode } from 'src/auth/admin/entitites/admin-reset-code.entity';

import { ADMIN_ROLE } from 'src/shared/enum/admin-role.enum';

import { UserStatus } from 'src/shared/enum/user-status.enum';

import { Town } from 'src/town/entities/town.entity';

import { Entity, Column, PrimaryColumn, JoinColumn, ManyToOne } from 'typeorm';

import { Entity, Column, PrimaryColumn, JoinColumn, ManyToOne, OneToMany } from 'typeorm';



@Entity()

export class Admin {
@@ -34,4 +35,7 @@ export class Admin { 
    default: 'active',

  })

  status: UserStatus = UserStatus.ACTIVE;



  @OneToMany(() => AdminResetCode, (resetCode) => resetCode.admin)

  resetCodes: AdminResetCode[];

}

backend/src/app.module.ts

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import { EmailService } from './email/email.service'; 
import { UserResetCode } from './auth/user/entities/user-reset-code.entity';

import { MailerModule } from '@nestjs-modules/mailer';

import { MailConstants } from './constants/mail.constants';

import { AdminResetCode } from './auth/admin/entitites/admin-reset-code.entity';

import { UserConfirmCode } from './auth/user/entities/user-confirm-code.entity';



@Module({
@@ -63,6 +64,7 @@ import { UserConfirmCode } from './auth/user/entities/user-confirm-code.entity'; 
        TravelPlace,

        Visited,

        UserResetCode,

        AdminResetCode,

        UserConfirmCode,

      ],

      synchronize: DbConstants.DB_SYNC,