Merge pull request #17 from CodeURJC-DAW-2021-22/feature/postgre

Replace H2 with Postgre

Author: OscarArranz

backend/pom.xml

@@ -25,12 +25,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
     		<groupId>org.springframework.boot</groupId>
     		<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -54,13 +48,16 @@
 		    <artifactId>openpdf</artifactId>
 		    <version>1.3.8</version>
 		</dependency>
-		
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>42.3.3</version>
+		</dependency>
 		<dependency>
 		   <groupId>org.json</groupId>
 		   <artifactId>json</artifactId>
 		   <version>20080701</version>
 		</dependency>
-
 		<dependency>
 		 <groupId>io.jsonwebtoken</groupId>
 		 <artifactId>jjwt</artifactId>

backend/src/main/java/com/youdemy/model/OrderP.java

@@ -4,13 +4,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
+import javax.persistence.*;
 
 import org.hibernate.annotations.Cascade;
 
@@ -20,8 +14,10 @@ public class OrderP {
 	@GeneratedValue(strategy = GenerationType.IDENTITY) 
 	private long id;
 	private int price;
-	
+
+	@Column(name = "Yuser")
 	private long user;
+
  	private long course;
  	private String courseTitle;
  	private String userName;

backend/src/main/java/com/youdemy/model/User.java

@@ -4,7 +4,9 @@
 
 import javax.persistence.*;
 
-@Entity(name = "UserTable")
+
+@Entity
+@Table(name = "Yuser")
 public class User {
 
 	@Id

backend/src/main/java/com/youdemy/service/DatabaseInitializer.java

@@ -1,5 +1,7 @@
 package com.youdemy.service;
 
+import java.io.*;
+import java.net.HttpURLConnection;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -233,6 +235,13 @@ public void init() throws IOException {
 		orderRepository.save(order6);
 	}
 
+//	public byte[] loadRandomImage() throws IOException {
+//		int randomImgNum = (int) Math.floor(Math.random() * 9) + 1;
+//		File image = ResourceUtils.getFile("classpath:./fakeImages/" + randomImgNum + ".jpg");
+//
+//		return Files.readAllBytes(image.toPath());
+//	}
+
 	public byte[] loadRandomImage() throws IOException {
 		URL url = new URL("https://picsum.photos/1920/1080");
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -245,17 +254,18 @@ public byte[] loadRandomImage() throws IOException {
 			while ( (n = is.read(byteChunk)) > 0 ) {
 				baos.write(byteChunk, 0, n);
 			}
+
+			return baos.toByteArray();
 		}
 		catch (IOException e) {
-			System.err.printf ("Failed while reading bytes from %s: %s", url.toExternalForm(), e.getMessage());
+			System.err.printf ("Failed while reading bytes from %s: %s", apiURI.toExternalForm(), e.getMessage());
 			e.printStackTrace ();
 		}
 		finally {
 			if (is != null) { is.close(); }
 		}
 
-		return baos.toByteArray();
-
+		return null;
 	}
 
 }

backend/src/main/resources/application.properties

@@ -1,6 +1,9 @@
 spring.mustache.suffix=.html
-spring.h2.console.enabled=true
-spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.url=jdbc:postgresql://localhost/youdemy
+spring.datasource.username=postgres
+spring.datasource.password=password
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.datasource.hikari.auto-commit=false
 spring.mustache.cache=false
 spring.servlet.multipart.enabled=true
 spring.mustache.expose-request-attributes=true

backend/target/classes/application.properties

@@ -1,6 +1,9 @@
 spring.mustache.suffix=.html
-spring.h2.console.enabled=true
-spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.url=jdbc:postgresql://localhost/youdemy
+spring.datasource.username=postgres
+spring.datasource.password=password
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.datasource.hikari.auto-commit=false
 spring.mustache.cache=false
 spring.servlet.multipart.enabled=true
 spring.mustache.expose-request-attributes=true