no message

Author: mateusz800

docker/Dockerfile.userApi

@@ -1,4 +1,5 @@
 FROM openjdk:11-jre
 ADD ./dist/userMicroservice-1.0.jar app.jar
 RUN bash -c 'touch /app.jar'
+# ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom","-Dserver.port=$PORT","-jar","/app.jar"]
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]

docker/docker-entrypoint-initdb.d/create_schema.sql

@@ -72,11 +72,9 @@ CREATE TABLE IF NOT EXISTS math.permissions (
 -- ------------------------------------------
 CREATE TABLE IF NOT EXISTS math.answer (
     id SERIAL PRIMARY KEY,
-    exercise_id INT  NOT NULL REFERENCES math.exercise(id),
+    exercise_id INT  REFERENCES math.exercise(id) ON DELETE CASCADE,
     user_id INT  NOT NULL REFERENCES math.user(id),
     correct BOOL NOT NULL
 );
 
--- TODO: unique index on exercise_id and user_id
-
 END;

docker/docker-entrypoint-initdb.d/insert_data.sql

@@ -17,15 +17,15 @@ INSERT INTO math.permissions(user_id, role_name) VALUES (1, 'teacher');
 
 
 -- course
-INSERT INTO math.course (name, description, image) VALUES ('trygonometria', 'jedynka trygonometryczna $\\\\$ $sin^{2}\alpha + cos^{2}\alpha = 1$ ', 'http://192.168.1.69:8125/images/course/trygonometry.png');
-INSERT INTO math.course (name, description, image) VALUES ('stereometria', 'Prostopadłościan: $\\ $ - długości krawędzi: a, b, c$\\ $- pole = 2(ab + bc + ac)$\\ $- objętość = ab$\\ $ Ostrosłup:$\\ $- pole podstawy: P_{p}$\\ $- wysokość: H$\\ $- objętość = $\frac{1}{3}P_{p}H$', 'http://192.168.1.69:8125/images/course/geometry.png');
-INSERT INTO math.course (name, description, image) VALUES ('ułamki', 'Jakis opis', 'http://192.168.1.69:8125/images/course/fractions.png');
-INSERT INTO math.course (name, description, image) VALUES ('funkcje', 'Jakis opis', 'http://192.168.1.69:8125/images/course/functions.png');
-INSERT INTO math.course (name, description, image) VALUES ('probabilistyka', 'Jakis opis', 'http://192.168.1.69:8125/images/course/probability.png');
-INSERT INTO math.course (name, description, image) VALUES ('statystyka', 'Jakis opis', 'http://192.168.1.69:8125/images/course/statistics.png');
-INSERT INTO math.course (name, description, image) VALUES ('planimetria', 'Jakis opis', 'http://192.168.1.69:8125/images/course/planimetry.png');
-INSERT INTO math.course (name, description, image) VALUES ('ciągi liczbowe', 'Jakis opis', 'http://192.168.1.69:8125/images/course/numerical_sequences.png');
-INSERT INTO math.course (name, description, image) VALUES ('równania i nierówności', 'Jakis opis', 'http://192.168.1.69:8125/images/course/equations.png');
+INSERT INTO math.course (name, description, image) VALUES ('trygonometria', 'jedynka trygonometryczna $\\\\$ $sin^{2}\alpha + cos^{2}\alpha = 1$ ', 'https://math-user-api.herokuapp.com/images/course/trygonometry.png');
+INSERT INTO math.course (name, description, image) VALUES ('stereometria', 'Prostopadłościan: $\\ $ - długości krawędzi: a, b, c$\\ $- pole = 2(ab + bc + ac)$\\ $- objętość = ab$\\ $ Ostrosłup:$\\ $- pole podstawy: P_{p}$\\ $- wysokość: H$\\ $- objętość = $\frac{1}{3}P_{p}H$', 'https://math-user-api.herokuapp.com/images/course/geometry.png');
+INSERT INTO math.course (name, description, image) VALUES ('ułamki', 'Jakis opis', 'https://math-user-api.herokuapp.com/images/course/fractions.png');
+INSERT INTO math.course (name, description, image) VALUES ('funkcje', 'Jakis opis', 'https://math-user-api.herokuapp.com/images/course/functions.png');
+INSERT INTO math.course (name, description, image) VALUES ('probabilistyka', 'Jakis opis', 'https://math-user-api.herokuapp.com/images/course/probability.png');
+INSERT INTO math.course (name, description, image) VALUES ('statystyka', 'Jakis opis', 'https://math-user-api.herokuapp.com/images/course/statistics.png');
+INSERT INTO math.course (name, description, image) VALUES ('planimetria', 'Jakis opis', 'https://math-user-api.herokuapp.com/images/course/planimetry.png');
+INSERT INTO math.course (name, description, image) VALUES ('ciągi liczbowe', 'Jakis opis', 'https://math-user-api.herokuapp.com/images/course/numerical_sequences.png');
+INSERT INTO math.course (name, description, image) VALUES ('równania i nierówności', 'Jakis opis', 'https://math-user-api.herokuapp.com/images/course/equations.png');
 
 
 -- course_author
@@ -55,7 +55,7 @@ INSERT INTO math.exercise (question, correct_answers, incorrect_answers, course_
 
 INSERT INTO math.exercise (question, correct_answers, incorrect_answers, course_id, image)
     VALUES ('W trójkącie, przedstawionym na rysunku powyżej, sinus kąta ostrego $\alpha$ jest równy',
-    '{"data": [{"answer":"$\\frac{2\\sqrt{6}}{5}$"}]}', '{"data": [{"answer":" $\\frac{\\sqrt{6}}{12}$"},{"answer":" $\\frac{1}{5}$"},{"answer":"  $\\frac{5}{24}$"}]}', 1, 'http://192.168.1.69:8125/images/exercise/img1.png');
+    '{"data": [{"answer":"$\\frac{2\\sqrt{6}}{5}$"}]}', '{"data": [{"answer":" $\\frac{\\sqrt{6}}{12}$"},{"answer":" $\\frac{1}{5}$"},{"answer":"  $\\frac{5}{24}$"}]}', 1, 'https://math-user-api.herokuapp.com/images/exercise/img1.png');
 
 INSERT INTO math.exercise (question, correct_answers, course_id)
     VALUES ('$ tg\alpha ctg\alpha $ jest równe','{"data": [{"answer":1}]}','1');

domain/src/main/java/com/example/core/domain/configuration/DbConfig.java

@@ -0,0 +1,37 @@
+package com.example.core.domain.configuration;
+
+
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/*
+@Configuration
+public class DbConfig {
+
+
+    @Bean
+    public DataSource getDataSource() throws URISyntaxException {
+
+        URI dbUri = new URI(System.getenv("DATABASE_URL"));
+
+        String username = dbUri.getUserInfo().split(":")[0];
+        String password = dbUri.getUserInfo().split(":")[1];
+        String dbUrl = "jdbc:postgresql://" + dbUri.getHost() + ':' + dbUri.getPort() + dbUri.getPath() ;//+ "?sslmode=require";
+
+        DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
+        //dataSourceBuilder.driverClassName("org.h2.Driver");
+        dataSourceBuilder.url(dbUrl);
+        dataSourceBuilder.username(username);
+        dataSourceBuilder.password(password);
+        return dataSourceBuilder.build();
+    }
+
+
+}
+ */
+

domain/src/main/java/com/example/core/domain/entity/Answer.java

@@ -5,6 +5,7 @@
 import javax.persistence.*;
 
 @Entity
+@Table(name="answer", schema = "math")
 public class Answer {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)

domain/src/main/java/com/example/core/domain/entity/Course.java

@@ -9,6 +9,7 @@
 import java.util.Set;
 
 @Entity
+@Table(name="course", schema = "math")
 public class Course {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
@@ -25,7 +26,7 @@ public class Course {
 
     @JsonIgnore
     @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "course_author", joinColumns = {
+    @JoinTable(name = "course_author", schema = "math", joinColumns = {
             @JoinColumn(name = "course_id") }, inverseJoinColumns = {
             @JoinColumn(name = "author_id") })
     private Set<User> authors;

domain/src/main/java/com/example/core/domain/entity/Exercise.java

@@ -11,6 +11,7 @@
 import java.util.Set;
 
 @Entity
+@Table(name="exercise", schema = "math")
 public class Exercise {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)

domain/src/main/java/com/example/core/domain/entity/SystemConfig.java

@@ -4,6 +4,7 @@
 import java.util.Set;
 
 @Entity
+@Table(name="role", schema = "math")
 public class Role {
     @Id
     @Column(name="name")

domain/src/main/java/com/example/core/domain/entity/user/Role.java

@@ -30,7 +30,7 @@ public class User implements UserDetails {
     private String firstName;
 
     @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "permissions", joinColumns = {
+    @JoinTable(name = "permissions", schema = "math", joinColumns = {
             @JoinColumn(name = "user_id") }, inverseJoinColumns = {
             @JoinColumn(name = "role_name") })
     private Set<Role> roles;