Merge pull request #10 from LucasWerey/merging_branch

LucasWerey · web-flow · commit 310e6aa6f26e · 2024-01-14T19:10:00.000+01:00
Merging branch
diff --git a/Api/Readme.md b/Api/Readme.md
@@ -54,7 +54,23 @@ pub struct User {
 }
 ```
 
-## User Endpoints
+## Student Model
+
+The `Student` model represents a user in the system. Here's the structure of the `Student` model:
+
+```rust
+pub struct Students {
+    pub user_id: Option<ObjectId>, // The student id linked to user ID
+    pub duree: i32,                // The duration of the stage/internship
+    pub niveau: String,            // The graduation level
+    pub type_contrat: String,      // Type of contract
+    pub date_debut: BsonDateTime,  // Date of start
+    pub lieu: String,              // Place of stage
+    pub recherche: bool,           // Currently looking for ?
+}
+```
+
+## Endpoints
 
 ### Create User - `POST /user`
 
@@ -71,43 +87,51 @@ curl -X POST -H "Content-Type: application/json" -d '{
 }' http://127.0.0.1:8000/user
 ```
 
-curl -X POST -H "Content-Type: application/json" -d '{
-"duree":5,
-"niveau": "BAC+5",
-"type_contrat": "alternance",
-"date_debut": {
-"$date": {"$numberLong": "1644566400000"}
-},
-"lieu": "Paris",
-"recherche": true
-
-}' http://127.0.0.1:8000/student
+> To create a student statut must be set to "student"
 
-### Get All Users - `GET /users`
+### Get queries
 
 Returns a list of all users in the system. No request body is required for this endpoint.
 
-Example:
+Examples:
+
+#### Get All Users - `GET /users`
 
 ```bash
 curl -X GET http://127.0.0.1:8000/users
 ```
 
-### Get User - `GET /user/<id>`
+#### Get All Students - `GET /students`
+
+```bash
+curl -X GET http://127.0.0.1:8000/students
+```
+
+### Get queries
 
 Returns the details of a specific user. Replace `<id>` with the ID of the user you want to retrieve. No request body is required for this endpoint.
 
-Example:
+Examples:
+
+#### Get User - `GET /user/<id>`
 
 ```bash
 curl -X GET http://127.0.0.1:8000/user/<id>
 ```
 
-### Update User - `PUT /user/<id>`
+#### Get Student - `GET /student/<id>`
+
+```bash
+curl -X GET http://127.0.0.1:8000/student/<id>
+```
+
+### Update queries
 
 Updates the details of a specific user. Replace `<id>` with the ID of the user you want to update. The request body should be a JSON object with the fields to update.
 
-Example:
+Examples:
+
+#### Update User - `PUT /user/<id>`
 
 ```bash
 curl -X PUT -H "Content-Type: application/json" -d '{
@@ -119,6 +143,9 @@ curl -X PUT -H "Content-Type: application/json" -d '{
 }' http://127.0.0.1:8000/user/<id>
 ```
 
+#### Update Student - `PUT /student/<id>`
+
+```bash
 curl -X PUT -H "Content-Type: application/json" -d '{
 "duree":4,
 "niveau": "BAC+4",
@@ -131,18 +158,27 @@ curl -X PUT -H "Content-Type: application/json" -d '{
 "lieu": "Paris",
 "recherche": false
 
-}' http://127.0.0.1:8000/student/65a17960c47012ed8f140bfe
+}' http://127.0.0.1:8000/student/65a2c1f81cb256b4957fee3c
+```
 
-### Delete User - `DELETE /user/<id>`
+### Delete queries
 
 Deletes a specific user. Replace `<id>` with the ID of the user you want to delete. No request body is required for this endpoint.
 
-Example:
+Examples:
+
+#### Delete User - `DELETE /user/<id>`
 
 ```bash
 curl -X DELETE http://127.0.0.1:8000/user/<id>
 ```
 
+#### Delete Student - `DELETE /student/<id>`
+
+```bash
+curl -X DELETE http://127.0.0.1:8000/student/<id>
+```
+
 ### Login - `POST /login`
 
 Logs in a user. The request body should be a JSON object with the following properties:
diff --git a/Api/src/api/students_api.rs b/Api/src/api/students_api.rs
@@ -1,31 +1,22 @@
-use crate::{models::students_model::Students, models::user_model::User, repository::mongodb_repo::MongoRepo};
+use crate::{models::students_model::Students,  repository::mongodb_repo::MongoRepo};
 use mongodb::{bson::oid::ObjectId, results::InsertOneResult};
 use rocket::{http::Status, serde::json::Json, State};
-use bcrypt::{hash, DEFAULT_COST};
-use bcrypt::verify;
-use jsonwebtoken::{encode, EncodingKey, Header, Algorithm};
-use std::collections::BTreeMap;
-use rocket::serde::Serialize;
-use rocket::serde::Deserialize;
-use chrono::{Utc, Duration};
-use std::env;
-use dotenv::dotenv;
-use mongodb::bson::DateTime as BsonDateTime;
+
 
 #[post("/student", data = "<new_students>")]
 pub fn create_students(
     db: &State<MongoRepo>,
     new_students: Json<Students>,
 ) -> Result<Json<InsertOneResult>, Status> {
     let data = Students {
-        id: None,
+        user_id: new_students.user_id,
         duree: new_students.duree,
         niveau: new_students.niveau.to_owned(),
         type_contrat: new_students.type_contrat.to_owned(),
         date_debut: new_students.date_debut,
         lieu: new_students.lieu.to_owned(),
         recherche: new_students.recherche,
-        
+
     };
     let students_detail = db.create_students(data);
     match students_detail {
@@ -59,7 +50,7 @@ pub fn update_students(
         return Err(Status::BadRequest);
     };
     let data = Students {
-        id: Some(ObjectId::parse_str(&id).unwrap()),
+        user_id: Some(ObjectId::parse_str(&id).unwrap()),
         duree: new_students.duree,
         niveau: new_students.niveau.to_owned(),
         type_contrat: new_students.type_contrat.to_owned(),
diff --git a/Api/src/api/user_api.rs b/Api/src/api/user_api.rs
@@ -37,22 +37,21 @@ pub fn create_user(
         statut: new_user.statut.to_owned(),
         date: Some(BsonDateTime::from_millis(Utc::now().timestamp_millis())),
     };
-    let user_clone = data.clone(); 
+    let user_clone = data.clone();
     let user_detail = db.create_user(user_clone);
     match user_detail {
         Ok(user) =>{
             if data.statut == "student" {
                 let student_data = Students {
-                    id: data.id.as_ref().map(|id| id).copied(), // Utilisez le même ID que l'utilisateur
-                    duree: 0, // Vous devez définir une valeur par défaut ou récupérer cette information ailleurs
+                    user_id: Some(user.inserted_id.as_object_id().unwrap().clone()), // Use the same ID as the user
+                    duree: 0, // You need to set a default value or get this information from somewhere else
                     niveau: String::new(),
                     type_contrat: String::new(),
                     date_debut: BsonDateTime::now(),
                     lieu: String::new(),
                     recherche: false,
                 };
-                
-                // Créez l'étudiant
+
                 let _ = db.create_students(student_data);
             }
         Ok(Json(user))
diff --git a/Api/src/models/students_model.rs b/Api/src/models/students_model.rs
@@ -7,13 +7,13 @@ use mongodb::bson::DateTime as BsonDateTime;
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Students {
     #[serde(rename = "_id", skip_serializing_if = "Option::is_none")]
-    pub id: Option<ObjectId>,
+    pub user_id: Option<ObjectId>,
     pub duree: i32,
     pub niveau: String,
     pub type_contrat: String,
     pub date_debut: BsonDateTime,
     pub lieu: String,
-    pub recherche: bool, 
+    pub recherche: bool,
 }
 
 
diff --git a/Api/src/repository/mongodb_repo.rs b/Api/src/repository/mongodb_repo.rs
@@ -115,14 +115,14 @@ pub struct MongoRepo {
 
         pub fn create_students(&self, new_students: Students) -> Result<InsertOneResult, Error> {
             let new_doc = Students {
-                id: None,
+                user_id: new_students.user_id,
                 duree: new_students.duree,
                 niveau: new_students.niveau,
                 type_contrat: new_students.type_contrat,
                 date_debut: new_students.date_debut,
                 lieu: new_students.lieu,
                 recherche: new_students.recherche
-                
+
             };
             let students = self
                 .col2
diff --git a/Front/src/auto-imports.d.ts b/Front/src/auto-imports.d.ts
@@ -39,6 +39,7 @@ declare global {
   const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
   const createReusableTemplate: typeof import('@vueuse/core')['createReusableTemplate']
   const createSharedComposable: typeof import('@vueuse/core')['createSharedComposable']
+  const createStudent: typeof import('./utils/studentApiUtils')['createStudent']
   const createTemplatePromise: typeof import('@vueuse/core')['createTemplatePromise']
   const createUnrefFn: typeof import('@vueuse/core')['createUnrefFn']
   const createUser: typeof import('./utils/userApiUtils')['createUser']
@@ -48,6 +49,7 @@ declare global {
   const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
   const defineComponent: typeof import('vue')['defineComponent']
   const defineStore: typeof import('pinia')['defineStore']
+  const deleteStudent: typeof import('./utils/studentApiUtils')['deleteStudent']
   const deleteUser: typeof import('./utils/userApiUtils')['deleteUser']
   const describe: typeof import('vitest')['describe']
   const difference: typeof import('./utils/arrayUtils')['difference']
@@ -57,12 +59,14 @@ declare global {
   const expect: typeof import('vitest')['expect']
   const extendRef: typeof import('@vueuse/core')['extendRef']
   const getActivePinia: typeof import('pinia')['getActivePinia']
+  const getAllStudents: typeof import('./utils/studentApiUtils')['getAllStudents']
   const getAllUsers: typeof import('./utils/userApiUtils')['getAllUsers']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
   const getCurrentScope: typeof import('vue')['getCurrentScope']
   const getLocalStorage: typeof import('./utils/storageUtils')['getLocalStorage']
   const getQueryParameter: typeof import('./utils/getQueryRouteUtils')['getQueryParameter']
   const getSessionStorage: typeof import('./utils/storageUtils')['getSessionStorage']
+  const getStudent: typeof import('./utils/studentApiUtils')['getStudent']
   const getUser: typeof import('./utils/userApiUtils')['getUser']
   const h: typeof import('vue')['h']
   const handleApiError: typeof import('./utils/apiErrorUtils')['handleApiError']
@@ -167,6 +171,7 @@ declare global {
   const unref: typeof import('vue')['unref']
   const unrefElement: typeof import('@vueuse/core')['unrefElement']
   const until: typeof import('@vueuse/core')['until']
+  const updateStudent: typeof import('./utils/studentApiUtils')['updateStudent']
   const updateUser: typeof import('./utils/userApiUtils')['updateUser']
   const useActiveElement: typeof import('@vueuse/core')['useActiveElement']
   const useAnimate: typeof import('@vueuse/core')['useAnimate']
@@ -395,6 +400,7 @@ declare module 'vue' {
     readonly createReactiveFn: UnwrapRef<typeof import('@vueuse/core')['createReactiveFn']>
     readonly createReusableTemplate: UnwrapRef<typeof import('@vueuse/core')['createReusableTemplate']>
     readonly createSharedComposable: UnwrapRef<typeof import('@vueuse/core')['createSharedComposable']>
+    readonly createStudent: UnwrapRef<typeof import('./utils/studentApiUtils')['createStudent']>
     readonly createTemplatePromise: UnwrapRef<typeof import('@vueuse/core')['createTemplatePromise']>
     readonly createUnrefFn: UnwrapRef<typeof import('@vueuse/core')['createUnrefFn']>
     readonly createUser: UnwrapRef<typeof import('./utils/userApiUtils')['createUser']>
@@ -404,6 +410,7 @@ declare module 'vue' {
     readonly defineAsyncComponent: UnwrapRef<typeof import('vue')['defineAsyncComponent']>
     readonly defineComponent: UnwrapRef<typeof import('vue')['defineComponent']>
     readonly defineStore: UnwrapRef<typeof import('pinia')['defineStore']>
+    readonly deleteStudent: UnwrapRef<typeof import('./utils/studentApiUtils')['deleteStudent']>
     readonly deleteUser: UnwrapRef<typeof import('./utils/userApiUtils')['deleteUser']>
     readonly describe: UnwrapRef<typeof import('vitest')['describe']>
     readonly difference: UnwrapRef<typeof import('./utils/arrayUtils')['difference']>
@@ -413,12 +420,14 @@ declare module 'vue' {
     readonly expect: UnwrapRef<typeof import('vitest')['expect']>
     readonly extendRef: UnwrapRef<typeof import('@vueuse/core')['extendRef']>
     readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
+    readonly getAllStudents: UnwrapRef<typeof import('./utils/studentApiUtils')['getAllStudents']>
     readonly getAllUsers: UnwrapRef<typeof import('./utils/userApiUtils')['getAllUsers']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
     readonly getLocalStorage: UnwrapRef<typeof import('./utils/storageUtils')['getLocalStorage']>
     readonly getQueryParameter: UnwrapRef<typeof import('./utils/getQueryRouteUtils')['getQueryParameter']>
     readonly getSessionStorage: UnwrapRef<typeof import('./utils/storageUtils')['getSessionStorage']>
+    readonly getStudent: UnwrapRef<typeof import('./utils/studentApiUtils')['getStudent']>
     readonly getUser: UnwrapRef<typeof import('./utils/userApiUtils')['getUser']>
     readonly h: UnwrapRef<typeof import('vue')['h']>
     readonly handleApiError: UnwrapRef<typeof import('./utils/apiErrorUtils')['handleApiError']>
@@ -519,6 +528,7 @@ declare module 'vue' {
     readonly unref: UnwrapRef<typeof import('vue')['unref']>
     readonly unrefElement: UnwrapRef<typeof import('@vueuse/core')['unrefElement']>
     readonly until: UnwrapRef<typeof import('@vueuse/core')['until']>
+    readonly updateStudent: UnwrapRef<typeof import('./utils/studentApiUtils')['updateStudent']>
     readonly updateUser: UnwrapRef<typeof import('./utils/userApiUtils')['updateUser']>
     readonly useActiveElement: UnwrapRef<typeof import('@vueuse/core')['useActiveElement']>
     readonly useAnimate: UnwrapRef<typeof import('@vueuse/core')['useAnimate']>
@@ -739,6 +749,7 @@ declare module '@vue/runtime-core' {
     readonly createReactiveFn: UnwrapRef<typeof import('@vueuse/core')['createReactiveFn']>
     readonly createReusableTemplate: UnwrapRef<typeof import('@vueuse/core')['createReusableTemplate']>
     readonly createSharedComposable: UnwrapRef<typeof import('@vueuse/core')['createSharedComposable']>
+    readonly createStudent: UnwrapRef<typeof import('./utils/studentApiUtils')['createStudent']>
     readonly createTemplatePromise: UnwrapRef<typeof import('@vueuse/core')['createTemplatePromise']>
     readonly createUnrefFn: UnwrapRef<typeof import('@vueuse/core')['createUnrefFn']>
     readonly createUser: UnwrapRef<typeof import('./utils/userApiUtils')['createUser']>
@@ -748,6 +759,7 @@ declare module '@vue/runtime-core' {
     readonly defineAsyncComponent: UnwrapRef<typeof import('vue')['defineAsyncComponent']>
     readonly defineComponent: UnwrapRef<typeof import('vue')['defineComponent']>
     readonly defineStore: UnwrapRef<typeof import('pinia')['defineStore']>
+    readonly deleteStudent: UnwrapRef<typeof import('./utils/studentApiUtils')['deleteStudent']>
     readonly deleteUser: UnwrapRef<typeof import('./utils/userApiUtils')['deleteUser']>
     readonly describe: UnwrapRef<typeof import('vitest')['describe']>
     readonly difference: UnwrapRef<typeof import('./utils/arrayUtils')['difference']>
@@ -757,12 +769,14 @@ declare module '@vue/runtime-core' {
     readonly expect: UnwrapRef<typeof import('vitest')['expect']>
     readonly extendRef: UnwrapRef<typeof import('@vueuse/core')['extendRef']>
     readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
+    readonly getAllStudents: UnwrapRef<typeof import('./utils/studentApiUtils')['getAllStudents']>
     readonly getAllUsers: UnwrapRef<typeof import('./utils/userApiUtils')['getAllUsers']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
     readonly getLocalStorage: UnwrapRef<typeof import('./utils/storageUtils')['getLocalStorage']>
     readonly getQueryParameter: UnwrapRef<typeof import('./utils/getQueryRouteUtils')['getQueryParameter']>
     readonly getSessionStorage: UnwrapRef<typeof import('./utils/storageUtils')['getSessionStorage']>
+    readonly getStudent: UnwrapRef<typeof import('./utils/studentApiUtils')['getStudent']>
     readonly getUser: UnwrapRef<typeof import('./utils/userApiUtils')['getUser']>
     readonly h: UnwrapRef<typeof import('vue')['h']>
     readonly handleApiError: UnwrapRef<typeof import('./utils/apiErrorUtils')['handleApiError']>
@@ -863,6 +877,7 @@ declare module '@vue/runtime-core' {
     readonly unref: UnwrapRef<typeof import('vue')['unref']>
     readonly unrefElement: UnwrapRef<typeof import('@vueuse/core')['unrefElement']>
     readonly until: UnwrapRef<typeof import('@vueuse/core')['until']>
+    readonly updateStudent: UnwrapRef<typeof import('./utils/studentApiUtils')['updateStudent']>
     readonly updateUser: UnwrapRef<typeof import('./utils/userApiUtils')['updateUser']>
     readonly useActiveElement: UnwrapRef<typeof import('@vueuse/core')['useActiveElement']>
     readonly useAnimate: UnwrapRef<typeof import('@vueuse/core')['useAnimate']>
diff --git a/Front/src/components/signUp/StudentSignup.vue b/Front/src/components/signUp/StudentSignup.vue
@@ -48,6 +48,23 @@ const handleSubmit = () => {
   }
 }
 
+const response = ref(null)
+onMounted(async () => {
+  try {
+    response.value = await createUser({
+      firstname: 'Firezazaezaest Student',
+      lastname: 'Last Student',
+      email: 'user@example.com',
+      password: 'password',
+      statut: 'student'
+    })
+    console.log(response.value)
+  } catch (error) {
+    const apiError = handleApiError(error)
+    console.log(apiError)
+  }
+})
+
 const goBack = () => {
   if (store.step === 1) router.push('/')
   if (store.step > 1) store.prevStep()
diff --git a/Front/src/stores/studentRegistration.ts b/Front/src/stores/studentRegistration.ts
@@ -7,14 +7,15 @@ export const useRegistrationStore = defineStore({
     form1: {
       email: '',
       password: '',
-      keepLogged: false
+      keepLogged: false,
+      userType: 'Student'
     },
     form2: {
       name: '',
       firstname: '',
       schoolGrade: '',
       contractType: 'stage',
-      duration: '',
+      duration: 0,
       start: new Date(),
       location: '',
       actualLookingFor: false
diff --git a/Front/src/stores/types/studentRegistrationTypes.ts b/Front/src/stores/types/studentRegistrationTypes.ts
diff --git a/Front/src/utils/studentApiUtils.ts b/Front/src/utils/studentApiUtils.ts
diff --git a/Front/src/utils/userApiUtils.ts b/Front/src/utils/userApiUtils.ts
diff --git a/Front/vitest.config.ts b/Front/vitest.config.ts
