Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cascade data deletion activated #156

Merged
merged 3 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/database/entities/applications.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ export class ApplicationEntity {
@PrimaryGeneratedColumn('uuid')
id: string;

@ManyToOne(() => JobsEntity)
@ManyToOne(() => JobsEntity, { onDelete: "CASCADE"})
@JoinColumn({ name: 'job_id' })
job: JobsEntity;

@Column()
job_id: string;

@ManyToOne(() => UsersEntity)
@ManyToOne(() => UsersEntity, { onDelete: "CASCADE"})
@JoinColumn({ name: 'user_id' })
user: UsersEntity;

@Column()
user_id: string;

@ManyToOne(() => CurriculumEntity)
@ManyToOne(() => CurriculumEntity, { onDelete: "CASCADE"})
@JoinColumn({ name: 'curriculum_id' })
curriculum: CurriculumEntity;

Expand Down
4 changes: 2 additions & 2 deletions src/database/entities/comments.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ export class CommentsEntity {
@Column({ length: 500 })
comment: string;

@ManyToOne(() => UsersEntity)
@ManyToOne(() => UsersEntity, { onDelete: "CASCADE"})
@JoinColumn({ name: 'user_id' })
user: UsersEntity;

@Column()
user_id: string;

@ManyToOne(() => JobsEntity, (job) => job.comments)
@ManyToOne(() => JobsEntity, (job) => job.comments, { onDelete: "CASCADE"})
@JoinColumn({ name: 'job_id' })
job: JobsEntity;

Expand Down
2 changes: 1 addition & 1 deletion src/database/entities/curriculum.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class CurriculumEntity {
@Column()
user_id: string;

@ManyToOne(() => UsersEntity)
@ManyToOne(() => UsersEntity, {onDelete: "CASCADE"})
@JoinColumn({ name: 'user_id' })
user: UsersEntity;

Expand Down
2 changes: 1 addition & 1 deletion src/database/entities/jobs.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export class JobsEntity {
})
affirmativeType: string;

@ManyToOne(() => CompaniesEntity)
@ManyToOne(() => CompaniesEntity, { onDelete: "CASCADE"})
@JoinColumn({ name: 'company_id' })
company: CompaniesEntity;

Expand Down
2 changes: 1 addition & 1 deletion src/database/entities/users.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class UsersEntity {
@JoinColumn()
personalData: PersonalDataEntity;

@OneToMany(() => CurriculumEntity, (curriculum) => curriculum.user)
@OneToMany(() => CurriculumEntity, (curriculum) => curriculum.user,)
curriculums: CurriculumEntity[];

@OneToMany(() => ApplicationEntity, (application) => application.user)
Expand Down
3 changes: 2 additions & 1 deletion src/modules/curriculum/curriculum.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import { FileUploadService } from '../upload/upload.service';
import { CurriculumController } from './curriculum.controller';
import { CurriculumService } from './curriculum.service';
import { CurriculumRepository } from './repository/curriculum-repository';
import { UserRepository } from '../user/repository/user.repository';

@Module({
imports: [
TypeOrmModule.forFeature([CurriculumRepository]),
TypeOrmModule.forFeature([CurriculumRepository, UserRepository]),
PassportModule.register({ defaultStrategy: 'jwt' }),
],
controllers: [CurriculumController],
Expand Down
4 changes: 4 additions & 0 deletions src/modules/curriculum/repository/curriculum-repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ export class CurriculumRepository extends Repository<CurriculumEntity> {
return this.save(data).catch(handleError);
}

async findOneByUserId(userId: string): Promise<CurriculumEntity> {
return this.findOne({ where: { user_id: userId } }).catch(handleError);
}

async findAllCurriculum(id: string): Promise<CurriculumEntity[]> {
return this.find({ where: { user_id: id } }).catch(handleError);
}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/user/repository/user.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class UserRepository extends Repository<UsersEntity> {
return;
}

async deleteUserById(id: string): Promise<object> {
async deleteUserById(id: string) {
await this.delete(id).catch(handleError);

return;
Expand Down
4 changes: 3 additions & 1 deletion src/modules/user/services/delete-user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import { UserRepository } from '../repository/user.repository';

@Injectable()
export class DeleteUserService {
constructor(private userRepository: UserRepository) {}
constructor(
private userRepository: UserRepository,
) {}

async execute(id: string) {
await this.userRepository.deleteUserById(id);
Expand Down
6 changes: 3 additions & 3 deletions src/modules/user/user.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@ export class UserController {
return this.updateUserService.execute(user, data, file);
}

@Delete(':id')
@Delete()
@SwaggerDeleteUser()
@UseGuards(AuthGuard())
@ApiBearerAuth()
async deleteUser(@Param('id') id: string, @LoggedUser() user: UsersEntity) {
return this.deleteUserService.execute(id);
async deleteUser( @LoggedUser() user: UsersEntity) {
return this.deleteUserService.execute(user.id);
}

@Patch('recovery_password')
Expand Down
3 changes: 2 additions & 1 deletion src/modules/user/user.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ import { UserController } from './user.controller';
import { UploadModule } from '../upload/upload.module';
import { UpdatePasswordService } from './services/update-password.service';
import { CompanyRepository } from '../company/repository/company-repository';
import { CurriculumRepository } from '../curriculum/repository/curriculum-repository';

@Module({
imports: [
TypeOrmModule.forFeature([UserRepository, CompanyRepository]),
TypeOrmModule.forFeature([UserRepository, CompanyRepository, CurriculumRepository]),
PassportModule.register({ defaultStrategy: 'jwt' }),
MailModule,
UploadModule,
Expand Down