DjalimSimaila/SAE201-DevApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7 from IUTInfoAix-R202-2022/modele_sql

Browse Source 
Simplification du modèle relationnel
This commit is contained in:
Thomas R 2022-06-04 21:22:01 +02:00 committed by GitHub
commit f067497d70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 67 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/fr/univ_amu/iut/dao/DAOUsage.java
View File

@ -1,6 +1,6 @@
package fr.univ_amu.iut.dao;
import fr.univ_amu.iut.model.Usages;
import fr.univ_amu.iut.model.Usage;
public interface DAOUsage extends DAO<Usages>{
public interface DAOUsage extends DAO<Usage>{
}

28
src/main/java/fr/univ_amu/iut/dao/jpa/DAOTypeActeurJPA.java
View File

@ -1,28 +0,0 @@
package fr.univ_amu.iut.dao.jpa;
import fr.univ_amu.iut.dao.DAO;
import fr.univ_amu.iut.model.TypeActeur;
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
import java.util.List;
public class DAOTypeActeurJPA extends DAOBaseClassJPA<TypeActeur> implements DAO<TypeActeur> {
public DAOTypeActeurJPA(EntityManager entityManager) {
super(entityManager);
}
@Override
public List<TypeActeur> findAll() {
TypedQuery<TypeActeur> query = entityManager.createNamedQuery("TypeActeur.findAll", TypeActeur.class);
return query.getResultList();
}
@Override
public TypeActeur getById(int id) {
TypedQuery<TypeActeur> query = entityManager.createNamedQuery("TypeActeur.findById", TypeActeur.class);
query.setParameter("numEt", id);
return query.getSingleResult();
}
}

12
src/main/java/fr/univ_amu/iut/dao/jpa/DAOUsageJPA.java
View File

@ -1,27 +1,27 @@
package fr.univ_amu.iut.dao.jpa;
import fr.univ_amu.iut.dao.DAOUsage;
import fr.univ_amu.iut.model.Usages;
import fr.univ_amu.iut.model.Usage;
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
import java.util.List;
public class DAOUsageJPA extends DAOBaseClassJPA<Usages> implements DAOUsage {
public class DAOUsageJPA extends DAOBaseClassJPA<Usage> implements DAOUsage {
public DAOUsageJPA(EntityManager entityManager) {
super(entityManager);
}
@Override
public List<Usages> findAll() {
TypedQuery<Usages> query = entityManager.createNamedQuery("Usage.findAll", Usages.class);
public List<Usage> findAll() {
TypedQuery<Usage> query = entityManager.createNamedQuery("Usage.findAll", Usage.class);
return query.getResultList();
}
@Override
public Usages getById(int id) {
TypedQuery<Usages> query = entityManager.createNamedQuery("Usage.findById", Usages.class);
public Usage getById(int id) {
TypedQuery<Usage> query = entityManager.createNamedQuery("Usage.findById", Usage.class);
query.setParameter("numEt", id);
return query.getSingleResult();
}

6
src/main/java/fr/univ_amu/iut/model/Acteur.java
View File

@ -12,11 +12,11 @@ public class Acteur {
@GeneratedValue
int id;
String type;
String identite;
public Acteur(String type, String identite) {
String type;
public Acteur(String identite, String type) {
this.type = type;
this.identite = identite;
}

9
src/main/java/fr/univ_amu/iut/model/Discipline.java
View File

@ -1,9 +1,6 @@
package fr.univ_amu.iut.model;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Transient;
import jakarta.persistence.*;
import java.util.ArrayList;
import java.util.List;
@ -11,7 +8,7 @@ import java.util.List;
@Entity
public class Discipline {
private static List<Discipline> INSTANCES = new ArrayList<>();
private static final List<Discipline> INSTANCES = new ArrayList<>();
@Transient
public static Discipline Toutes = new Discipline("Toutes disciplines");
@ -33,6 +30,8 @@ public class Discipline {
@Id
@GeneratedValue
int id;
@Column(unique = true)
String nom;
public Discipline() {

2
src/main/java/fr/univ_amu/iut/model/RegionAcademique.java
View File

@ -50,6 +50,8 @@ public class RegionAcademique {
@Id
@GeneratedValue
int id;
@Column(unique = true)
String nom;
public RegionAcademique() {

19
src/main/java/fr/univ_amu/iut/model/Ressource.java
View File

@ -2,6 +2,7 @@ package fr.univ_amu.iut.model;
import jakarta.persistence.*;
import java.net.MalformedURLException;
import java.net.URL;
@NamedQueries({
@ -16,10 +17,24 @@ public class Ressource {
String nomRessource;
String typeRessource;
URL lienRessource;
public Ressource(URL lienRessource, String nomRessource, String typeRessource) {
String typeRessource;
private static URL convertUrl(String url){
try{
return new URL(url);
}catch(MalformedURLException e){
e.printStackTrace();
return null;
}
}
public Ressource(String nomRessource, String lienRessource, String typeRessource) {
this(nomRessource, convertUrl(lienRessource), typeRessource);
}
public Ressource(String nomRessource, URL lienRessource, String typeRessource) {
this.nomRessource = nomRessource;
this.typeRessource = typeRessource;
this.lienRessource = lienRessource;
}

20
src/main/java/fr/univ_amu/iut/model/Thematique.java
View File

@ -1,12 +1,18 @@
package fr.univ_amu.iut.model;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Transient;
import jakarta.persistence.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@Entity
public class Thematique {
private final static List<Thematique> INSTANCES = new ArrayList<>();
@Transient
public static Thematique ClasseInversee= new Thematique("Classe inversée");
@Transient
@ -55,6 +61,8 @@ public class Thematique {
@Id
@GeneratedValue
int id;
@Column(unique = true)
String nom;
public String getNom() {
@ -63,11 +71,15 @@ public class Thematique {
public Thematique(String nom) {
this.nom = nom;
INSTANCES.add(this);
}
public Thematique() {
}
public static List<Thematique> toutes(){
return INSTANCES;
}
@Override
public String toString() {

31
src/main/java/fr/univ_amu/iut/model/TypeActeur.java
View File

@ -1,31 +0,0 @@
package fr.univ_amu.iut.model;
import jakarta.persistence.*;
@NamedQueries({
@NamedQuery(name = "TypeActeur.findAll", query = "SELECT p FROM TypeActeur p"),
@NamedQuery(name = "TypeActeur.findById", query = "SELECT p FROM TypeActeur p WHERE p.id = :id"),
})
@Entity
public class TypeActeur {
@Id
@GeneratedValue
int id;
String nom;
public TypeActeur(String nom) {
this.nom = nom;
}
public TypeActeur() {
}
public String getNom() {
return nom;
}
public void setNom(String nom) {
this.nom = nom;
}
}

23
src/main/java/fr/univ_amu/iut/model/TypeRessource.java
View File

@ -1,23 +0,0 @@
package fr.univ_amu.iut.model;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
@Entity
public class TypeRessource {
@Id
@GeneratedValue
int id;
String nom;
public TypeRessource(String nom) {
this.nom = nom;
}
public TypeRessource() {}
public String getNom() {
return nom;
}
}

24
src/main/java/fr/univ_amu/iut/model/Usages.java → src/main/java/fr/univ_amu/iut/model/Usage.java
View File

@ -6,11 +6,13 @@ import java.util.ArrayList;
import java.util.List;
@NamedQueries({
@NamedQuery(name = "Usage.findAll", query = "SELECT p FROM Usages p"),
@NamedQuery(name = "Usage.findById", query = "SELECT p FROM Usages p WHERE p.id = :id"),
@NamedQuery(name = "Usage.findAll", query = "SELECT p FROM Usage p"),
@NamedQuery(name = "Usage.findById", query = "SELECT p FROM Usage p WHERE p.id = :id"),
})
@Entity
public class Usages {
@Table(name="\"USAGE\"")
public class Usage {
@Id
@GeneratedValue
int id;
@ -34,12 +36,12 @@ public class Usages {
@OneToMany(cascade = CascadeType.ALL)
List<Ressource> ressources = new ArrayList<>();
@OneToOne(cascade = CascadeType.ALL)
Acteur acteur;
@OneToMany(cascade = CascadeType.ALL)
List<Acteur> acteurs = new ArrayList<>();
String commentaire;
public Usages() {
public Usage() {
}
public String getNom() {
@ -98,12 +100,12 @@ public class Usages {
this.ressources.add(ressource);
}
public Acteur getActeur() {
return acteur;
public List<Acteur> getActeurs() {
return acteurs;
}
public void setActeur(Acteur acteur) {
this.acteur = acteur;
public void addActeur(Acteur acteur) {
this.acteurs.add(acteur);
}
public String getCommentaire() {
@ -126,7 +128,7 @@ public class Usages {
", niveau=" + niveau +
", academie=" + academie +
", ressources=" + ressources +
", acteur=" + acteur +
", acteurs=" + acteurs +
", commentaire='" + commentaire + '\'' +
'}';
}

2
src/main/java/fr/univ_amu/iut/test/DAORessourceTest.java
View File

@ -24,7 +24,7 @@ public class DAORessourceTest implements DAORessource {
} catch (MalformedURLException e) {
e.printStackTrace();
}
Ressource ressource = new Ressource(url, "google", "site web");
Ressource ressource = new Ressource("google", url, "site web");
liste.add(ressource);
}
return liste;

5
src/main/resources/META-INF/persistence.xml
View File

@ -8,8 +8,9 @@
<properties>
<!-- database connection properties -->
<property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/devapp"/>
<property name="jakarta.persistence.jdbc.user" value="root"/>
<property name="jakarta.persistence.jdbc.password" value="azerty123"/>
<property name="jakarta.persistence.jdbc.user" value="devapp"/>
<property name="jakarta.persistence.jdbc.password" value="7kPoWBgoV5ahygxyXYGzaL"/>
<!-- Nous ne devrions pas commit le mot de passe dans le dépot, mais... je ne pense pas que le projet ne respecte la moindre règle de sécurité de toute facon (pas d'architecture trois tiers)-->
<property name="eclipselink.ddl-generation.output-mode" value="database"/>
<property name="eclipselink.ddl-generation" value="create-tables"/>