Merge branch 'feature/IA-589' into 'develop'

Resolve IA-589 "Add models and enums to subject management"

Closes IA-589

See merge request !39

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## [0.0.30-RELEASE]
 ### Added
 -add entites assitant devoir
+- Add models and enums to subject management
 
 ## [0.0.29-RELEASE] 
 ### Added

src/main/java/com/marketingconfort/brainboost_common/subjectmanagement/enums/ImprovementStatus.java

+package com.marketingconfort.brainboost_common.subjectmanagement.enums;
+
+public enum ImprovementStatus {
+    NEW,
+    IN_PROGRESS,
+    RESOLVED,
+    REJECTED
+}
+

src/main/java/com/marketingconfort/brainboost_common/subjectmanagement/enums/ImprovementType.java

+package com.marketingconfort.brainboost_common.subjectmanagement.enums;
+
+public enum ImprovementType {
+    PARENT,
+    CHILD,
+    ADMIN
+}
+

src/main/java/com/marketingconfort/brainboost_common/subjectmanagement/enums/MultimediaType.java

+package com.marketingconfort.brainboost_common.subjectmanagement.enums;
+
+public enum MultimediaType {
+    IMAGE,
+    VIDEO,
+    AUDIO,
+    DOCUMENT
+}

src/main/java/com/marketingconfort/brainboost_common/subjectmanagement/mock/Exercise.java

+package com.marketingconfort.brainboost_common.subjectmanagement.mock;
+
+import lombok.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+// TODO: Temporary mock for Exercise. Replace with Real entity when available.
+public class Exercise {
+    private Long id;
+    private String title;
+    private Long chapterId;
+}

src/main/java/com/marketingconfort/brainboost_common/subjectmanagement/models/Comment.java

+package com.marketingconfort.brainboost_common.subjectmanagement.models;
+
+import com.marketingconfort.brainboost_common.usermanagement.models.Admin;
+import jakarta.persistence.*;
+import lombok.*;
+import java.util.*;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Comment extends BaseEntity{
+    private String content;
+    @ManyToOne
+    @JoinColumn(name = "improvement_id")
+    private Improvement improvement;
+    @ManyToOne
+    @JoinColumn(name = "admin_id")
+    private Admin author;
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "comment_id")
+    private List<Multimedia> attachments;
+}

src/main/java/com/marketingconfort/brainboost_common/subjectmanagement/models/Improvement.java

+package com.marketingconfort.brainboost_common.subjectmanagement.models;
+
+import com.marketingconfort.brainboost_common.subjectmanagement.enums.ImprovementStatus;
+import com.marketingconfort.brainboost_common.subjectmanagement.enums.ImprovementType;
+import com.marketingconfort.brainboost_common.subjectmanagement.mock.Exercise;
+import com.marketingconfort.brainboost_common.usermanagement.models.Admin;
+import jakarta.persistence.*;
+import lombok.*;
+import java.util.*;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Improvement extends BaseEntity{
+    private String title;
+    private String description;
+    @Enumerated(EnumType.STRING)
+    private ImprovementStatus status;
+    @Enumerated(EnumType.STRING)
+    private ImprovementType type;
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "improvement_id")
+    private List<Multimedia> attachments;
+    @OneToMany(mappedBy = "improvement", cascade = CascadeType.ALL)
+    private List<Comment> comments;
+    @ManyToOne
+    @JoinColumn(name = "level_id")
+    private Level level;
+    @ManyToOne
+    @JoinColumn(name = "subject_id")
+    private Subject subject;
+    @ManyToOne
+    @JoinColumn(name = "chapter_id")
+    private Chapter chapter;
+    @ManyToOne
+    @JoinColumn(name = "exercise_id")
+    private Exercise exercise;
+    @ManyToOne
+    @JoinColumn(name = "assignedby_id")
+    private Admin assignedBy;
+    @ManyToMany
+    @JoinTable(
+        name = "improvement_admin",
+        joinColumns = @JoinColumn(name = "improvement_id"),
+        inverseJoinColumns = @JoinColumn(name = "admin_id")
+    )
+    private List<Admin> assignedAdmins;
+}

src/main/java/com/marketingconfort/brainboost_common/subjectmanagement/models/Multimedia.java

+package com.marketingconfort.brainboost_common.subjectmanagement.models;
+
+import com.marketingconfort.brainboost_common.subjectmanagement.enums.MultimediaType;
+import jakarta.persistence.*;
+import lombok.*;
+import java.util.*;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Multimedia extends BaseEntity{
+    private String name;
+    @Enumerated(EnumType.STRING)
+    private MultimediaType type;
+    private String format;
+    private Long size;
+    private String url;
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date uploadedAt;
+}