Maxime/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

je sais vraiment pas ce que j'ai ajouté mais amélioration jt'e jure

Browse Source
This commit is contained in:
Debucquoy Anthony
2024-04-21 17:42:29 +02:00
parent 70bec1a934
commit f14d41f04d
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/ovh/herisson/Clyde/EndPoints/Msg/ForumController.java
View File

@ -80,7 +80,7 @@ public class ForumController {
public ResponseEntity<Topic> postTopicToForum(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody Topic data){ public ResponseEntity<Topic> postTopicToForum(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody Topic data){
User u = authServ.getUserFromToken(token); User u = authServ.getUserFromToken(token);
Forum f = forumRepo.findById(id).orElse(null); Forum f = forumRepo.findById(id).orElse(null);
if(!(f.getWriters().contains(u) || u.getRole() == Role.Admin)){ if(!(f.getWriters().contains(u) || f.getCourse().getOwner().equals(u) || u.getRole() == Role.Admin)){
return new UnauthorizedResponse<>(null); return new UnauthorizedResponse<>(null);
} }
forumServ.createTopic(f, data); forumServ.createTopic(f, data);

3
backend/src/main/java/ovh/herisson/Clyde/Tables/Course.java
View File

@ -28,10 +28,11 @@ public class Course {
private User owner; private User owner;
//// Extension Messagerie ///// //// Extension Messagerie /////
@OneToMany(cascade = CascadeType.ALL) @OneToMany(mappedBy = "course", cascade = CascadeType.ALL)
private List<Forum> forums; private List<Forum> forums;
public void addForum(Forum f){ public void addForum(Forum f){
f.setCourse(this);
forums.add(f); forums.add(f);
} }
/////////////////////////////// ///////////////////////////////

3
backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/Forum.java
View File

@ -2,6 +2,8 @@ package ovh.herisson.Clyde.Tables.Msg;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.Data; import lombok.Data;
import ovh.herisson.Clyde.Tables.Course; import ovh.herisson.Clyde.Tables.Course;
@ -16,6 +18,7 @@ public class Forum {
private int id; private int id;
@ManyToOne @ManyToOne
@JsonIgnore
private Course course; private Course course;
private String name; private String name;

2
frontend/src/App.vue
View File

@ -15,7 +15,7 @@ window.onhashchange = function() {
} }
const Logged = ref(isLogged()); const Logged = ref(isLogged());
if(Logged){ if(Logged.value){
fetchNotifications(); fetchNotifications();
} }

2
frontend/src/Apps/Forums.vue
View File

@ -15,7 +15,7 @@ import { fetchedPost, fetchPost, sendAnswer } from '@/rest/forum.js'
import { getSelf } from '@/rest/Users.js' import { getSelf } from '@/rest/Users.js'
const Role = (await getSelf()).role; const Role = (await getSelf()).role;
const courses = Role === 'Admin' || Role === 'Secretary' ? await reactive(getCourses()) : await reactive(getUserActualCourses()); const courses = Role === 'Admin' || Role === 'Secretary' || Role === 'Teacher' ? await reactive(getCourses(Role)) : await reactive(getUserActualCourses());
const selectedCourse = ref(); const selectedCourse = ref();
const selectedForum = ref(); const selectedForum = ref();

2
frontend/src/rest/courses.js
View File

@ -8,8 +8,6 @@ import { restGet, restPost, restDelete, restPatch } from './restConsumer.js'
* Create a new course * Create a new course
*/ */
export async function createCourse(name, credits, owner){ export async function createCourse(name, credits, owner){
console.log(owner);
return restPost("/course", {title: name, credits: credits, owner} ) return restPost("/course", {title: name, credits: credits, owner} )
} }

2
frontend/src/rest/notifications.js
View File

@ -1,7 +1,7 @@
import { ref } from 'vue' import { ref } from 'vue'
import { restGet, restPost } from '@/rest/restConsumer.js' import { restGet, restPost } from '@/rest/restConsumer.js'
export const notifications = ref({}); export const notifications = ref([]);
export function fetchNotifications(){ export function fetchNotifications(){
restGet("/notifications").then( e => notifications.value = e ); restGet("/notifications").then( e => notifications.value = e );