Get accomplissement v2

BACKEND/package.json

@@ -47,6 +47,7 @@
     "rxjs": "^7.6.0",
     "swagger-ui-express": "^4.6.0",
     "typeorm": "^0.3.11",
+    "webpack": "^5.75.0",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {

BACKEND/src/accomplissements/accomplissements.controller.spec.ts

@@ -0,0 +1,30 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { AccomplissementsController } from './accomplissements.controller';
+import { AccomplissementsService } from './accomplissements.service';
+
+describe('AccomplissementsController', () => {
+  let controller: AccomplissementsController;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [AccomplissementsController],
+      providers: [AccomplissementsService],
+    }).compile();
+
+    controller = module.get<AccomplissementsController>(
+      AccomplissementsController,
+    );
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+});
+function beforeEach(arg0: () => Promise<void>) {
+  throw new Error('Function not implemented.');
+}
+
+function expect(controller: AccomplissementsController) {
+  throw new Error('Function not implemented.');
+}
+

BACKEND/src/accomplissements/accomplissements.controller.ts

@@ -0,0 +1,47 @@
+import {
+  Controller,
+  Get,
+  Post,
+  Body,
+  Patch,
+  Param,
+  Delete,
+} from '@nestjs/common';
+import { AccomplissementsService } from './accomplissements.service';
+import { CreateAccomplissementDto } from './dto/create-accomplissement.dto';
+import { UpdateAccomplissementDto } from './dto/update-accomplissement.dto';
+
+@Controller('accomplissements')
+export class AccomplissementsController {
+  constructor(
+    private readonly accomplissementsService: AccomplissementsService,
+  ) {}
+
+  @Post()
+  create(@Body() createAccomplissementDto: CreateAccomplissementDto) {
+    return this.accomplissementsService.create(createAccomplissementDto);
+  }
+
+  @Get()
+  findAll() {
+    return this.accomplissementsService.findAll();
+  }
+
+  @Get(':id')
+  findOne(@Param('id') id: string) {
+    return this.accomplissementsService.findOne(+id);
+  }
+
+  @Patch(':id')
+  update(
+    @Param('id') id: string,
+    @Body() updateAccomplissementDto: UpdateAccomplissementDto,
+  ) {
+    return this.accomplissementsService.update(+id, updateAccomplissementDto);
+  }
+
+  @Delete(':id')
+  remove(@Param('id') id: string) {
+    return this.accomplissementsService.remove(+id);
+  }
+}

BACKEND/src/accomplissements/accomplissements.module.ts

@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { AccomplissementsService } from './accomplissements.service';
+import { AccomplissementsController } from './accomplissements.controller';
+import { Accomplissements } from './entities/accomplissement.entity';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([Accomplissements])],
+  controllers: [AccomplissementsController],
+  providers: [AccomplissementsService],
+})
+export class AccomplissementsModule {}

BACKEND/src/accomplissements/accomplissements.service.spec.ts

@@ -0,0 +1,18 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { AccomplissementsService } from './accomplissements.service';
+
+describe('AccomplissementsService', () => {
+  let service: AccomplissementsService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [AccomplissementsService],
+    }).compile();
+
+    service = module.get<AccomplissementsService>(AccomplissementsService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});

BACKEND/src/accomplissements/accomplissements.service.ts

@@ -0,0 +1,36 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { CreateAccomplissementDto } from './dto/create-accomplissement.dto';
+import { UpdateAccomplissementDto } from './dto/update-accomplissement.dto';
+import { Accomplissements } from './entities/accomplissement.entity';
+
+@Injectable()
+export class AccomplissementsService {
+
+  constructor(
+    @InjectRepository(Accomplissements)
+    private accomplissementRepository: Repository<Accomplissements>,
+  ) {}
+  create(createAccomplissementDto: CreateAccomplissementDto) {
+    return 'This action adds a new accomplissement';
+  }
+
+  async findAll() {
+    const accomplissements = await this.accomplissementRepository.find();
+
+    return accomplissements;
+  }
+
+  findOne(id: number) {
+    return `This action returns a #${id} accomplissement`;
+  }
+
+  update(id: number, updateAccomplissementDto: UpdateAccomplissementDto) {
+    return `This action updates a #${id} accomplissement`;
+  }
+
+  remove(id: number) {
+    return `This action removes a #${id} accomplissement`;
+  }
+}

BACKEND/src/accomplissements/dto/create-accomplissement.dto.ts

@@ -0,0 +1 @@
+export class CreateAccomplissementDto {}

BACKEND/src/accomplissements/dto/update-accomplissement.dto.ts

@@ -0,0 +1,4 @@
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateAccomplissementDto } from './create-accomplissement.dto';
+
+export class UpdateAccomplissementDto extends PartialType(CreateAccomplissementDto) {}

BACKEND/src/accomplissements/entities/accomplissement.entity.ts

@@ -0,0 +1,22 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity()
+export class Accomplissements {
+  @PrimaryGeneratedColumn('increment')
+  id: number;
+
+  @Column()
+  Target: string;
+
+  @Column()
+  Titre: string;
+
+  @Column()
+  Description: string;
+
+  @Column()
+  Resultat: number;
+
+  @Column({ nullable: true })
+  image: string;
+}

BACKEND/src/app.module.ts

@@ -22,6 +22,7 @@ import { DragModule } from './drag_and_drop/drag_and_drop.module';
 import { CardsThemeModule } from './cards_theme/cards_theme.module';
 import { LevelMapModule } from './level_map/level_map.module';
 import { LevelDifficultyModule } from './level_difficulty/level_difficulty.module';
+import { AccomplissementsModule } from './accomplissements/accomplissements.module';
 
 @Module({
   imports: [
@@ -62,6 +63,7 @@ import { LevelDifficultyModule } from './level_difficulty/level_difficulty.modul
     DragModule,
     LevelMapModule,
     UserResponseModule,
+    AccomplissementsModule,
   ],
   controllers: [AppController],
   providers: [AppService],

BACKEND/src/schoolclass/schoolclass.service.ts

@@ -1,10 +1,10 @@
-import { School } from './../school/entities/school.entity';
-import { Schoolclass } from './entities/schoolclass.entity';
-import { Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
+import { School } from 'src/school/entities/school.entity';
+import { Repository } from 'typeorm';
 import { CreateSchoolclassDto } from './dto/create-schoolclass.dto';
 import { UpdateSchoolclassDto } from './dto/update-schoolclass.dto';
+import { Schoolclass } from './entities/schoolclass.entity';
 
 @Injectable()
 export class SchoolclassService {

BACKEND/src/types/index.ts

@@ -7,6 +7,7 @@ export interface UserData {
   schoolClass: string[];
   school: string;
   sex: string;
+  infos: object;
 }
 export interface Card {
   id: number;

BACKEND/src/user_response/user_response.module.ts

@@ -1,3 +1,4 @@
+
 import { Module } from '@nestjs/common';
 import { UserResponseService } from './user_response.service';
 import { UserResponseController } from './user_response.controller';

BACKEND/src/users/entities/users.entity.ts

@@ -4,11 +4,14 @@ import {
   JoinTable,
   ManyToMany,
   ManyToOne,
+  OneToMany,
+  OneToOne,
   PrimaryGeneratedColumn,
 } from 'typeorm';
 import { Role } from '../../role/entities/role.entity';
 import { Schoolclass } from '../../schoolclass/entities/schoolclass.entity';
 import { Lang } from '../../lang/entities/lang.entity';
+
 @Entity()
 export class Users {
   @PrimaryGeneratedColumn('increment')
@@ -35,6 +38,9 @@ export class Users {
   @Column()
   sex: string;
 
+  @Column('jsonb', { nullable: true })
+  infos: object[];
+
   @ManyToMany(() => Role)
   @JoinTable()
   role: Role[];

BACKEND/src/users/users.controller.ts

@@ -14,7 +14,6 @@ import {
 import { ApiParam } from '@nestjs/swagger';
 import { Param } from '@nestjs/common';
 
-
 @Controller('users')
 export class UsersController {
   constructor(private readonly usersService: UsersService) {}
@@ -65,5 +64,4 @@ export class UsersController {
   findActivePlayersCount(@Param('id_user') id_user: number) {
     return this.usersService.findActivePlayersCount(+id_user);
   }
-
 }

BACKEND/src/users/users.module.ts

@@ -6,6 +6,7 @@ import { Schoolclass } from '../schoolclass/entities/schoolclass.entity';
 import { Users } from './entities/users.entity';
 import { Module } from '@nestjs/common';
 import { UsersService } from './users.service';
+
 import { SchoolModule } from '../school/school.module';
 import { SchoolclassModule } from '../schoolclass/schoolclass.module';
 import { RoleModule } from '../role/role.module';

BACKEND/src/users/users.service.ts

@@ -81,6 +81,7 @@ export class UsersService {
               }),
               school: user.schoolclass[0].school.name, //Lutilisateur ne fréquente qu'une seule école
               sex: user.sex,
+              infos: user.infos,
             };
           })
           .catch((err) => {
@@ -111,6 +112,7 @@ export class UsersService {
               schoolClass: [],
               school: 'Institut Saint Joseph',
               sex: 'M',
+              infos: user.infos,
             };
           })
           .catch((err) => {
@@ -268,9 +270,9 @@ export class UsersService {
   async findSubscriptionStats(userId: number): Promise<Users | undefined> {
     const subscriptionStats = this.userRepository.query(
       `select school.name || ' - ' ||schoolclass."name" as SchoolClass_name,count(*) from schoolclass
-      join users_school_class_schoolclass on schoolclass.id=users_school_class_schoolclass."schoolclassId"
+      join users_schoolclass_schoolclass on schoolclass.id=users_schoolclass_schoolclass."schoolclassId"
       join school on school.id = schoolclass."schoolId"
-      where school.id in (select schoolclass."schoolId" from schoolclass where schoolclass.id in (select users_school_class_schoolclass."schoolclassId" from users_school_class_schoolclass where users_school_class_schoolclass."usersId"=${userId}))
+      where school.id in (select schoolclass."schoolId" from schoolclass where schoolclass.id in (select users_schoolclass_schoolclass."schoolclassId" from users_schoolclass_schoolclass where users_schoolclass_schoolclass."usersId"=${userId}))
       group by school.name,schoolclass.name;`,
     );
     return await subscriptionStats;
@@ -280,10 +282,10 @@ export class UsersService {
     const subscriptionStats = this.userRepository.query(
       `select A.name,count(*) from
       (select  distinct user_response."userId", schoolclass."name" as name from user_response
-            left join users_school_class_schoolclass on user_response."userId"=users_school_class_schoolclass."usersId"
-          left join schoolclass on schoolclass.id=users_school_class_schoolclass."schoolclassId"
+            left join users_schoolclass_schoolclass on user_response."userId"=users_schoolclass_schoolclass."usersId"
+          left join schoolclass on schoolclass.id=users_schoolclass_schoolclass."schoolclassId"
             left join school on school.id = schoolclass."schoolId"
-            where school.id in (select schoolclass."schoolId" from schoolclass where schoolclass.id in (select users_school_class_schoolclass."schoolclassId" from users_school_class_schoolclass where users_school_class_schoolclass."usersId"=${userId}))  
+            where school.id in (select schoolclass."schoolId" from schoolclass where schoolclass.id in (select users_schoolclass_schoolclass."schoolclassId" from users_schoolclass_schoolclass where users_schoolclass_schoolclass."usersId"=${userId}))  
         group by user_response."userId",schoolclass.name) as A
         group by A.name`,
     );