Skip to content

Commit eff406b

Browse files
fiorellaVfiorellaV
committed
Fix merge issues
1 parent d20083f commit eff406b

File tree

7 files changed

+98
-274
lines changed

7 files changed

+98
-274
lines changed

‎backend/src/main/java/com/youdemy/repository/UserRepository.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
1616

1717
Optional<User> findByEmail(String email);
1818

19-
@Query("SELECT u FROM UserTable u")
20-
public Page<User> findAllUsers(Pageable pageable);
21-
22-
2319
Page<User> findAll(Pageable page);
2420

2521
}

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

Lines changed: 94 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,20 @@ public class DatabaseInitializer {
6060
@PostConstruct
6161
public void init() throws IOException {
6262
// Sample users
63-
User guest = new User("[email protected]","[email protected]", "Guest", passwordEncoder.encode("pass2"), "USER");
64-
User user1 = new User("[email protected]", "[email protected]", "Ramirez", passwordEncoder.encode("pass"), "USER");
63+
// User guest = new User("[email protected]","[email protected]", "Guest", passwordEncoder.encode("pass2"), "USER");
64+
// User user1 = new User("[email protected]", "[email protected]", "Ramirez", passwordEncoder.encode("pass"), "USER");
6565
User user2 = new User("[email protected]", "[email protected]", "Ramirez", passwordEncoder.encode("adminpass"), "USER", "ADMIN");
66-
User user3 = new User("[email protected]", "[email protected]", "Ramirez", passwordEncoder.encode("teacherpass"), "USER", "TEACHER");
67-
User user4 = new User("[email protected]","[email protected]", "Ramirez2", passwordEncoder.encode("teacherpass"), "USER", "TEACHER");
68-
69-
70-
userRepository.save(guest);
71-
userRepository.save(user1);
66+
// User user3 = new User("[email protected]", "[email protected]", "Ramirez", passwordEncoder.encode("teacherpass"), "USER", "TEACHER");
67+
// User user4 = new User("[email protected]","[email protected]", "Ramirez2", passwordEncoder.encode("teacherpass"), "USER", "TEACHER");
68+
69+
70+
// userRepository.save(guest);
71+
// userRepository.save(user1);
7272
userRepository.save(user2);
73-
userRepository.save(user3);
74-
userRepository.save(user4);
75-
76-
73+
// userRepository.save(user3);
74+
// userRepository.save(user4);
75+
76+
7777
// byte[] thumbnail = loadRandomImage();
7878
//
7979
// ArrayList<String> tags = new ArrayList<>();
@@ -175,97 +175,89 @@ public void init() throws IOException {
175175
//
176176
// courseService.save(course6);
177177
//
178-
179-
ArrayList<Course> courses = new ArrayList<>();
180-
181-
// Sample course
182-
for (int i = 0; i < 30; i++) {
183-
byte[] thumbnail = loadRandomImage();
184-
185-
ArrayList<String> tags = new ArrayList<>();
186-
tags.add("Tag1");
187-
tags.add("Tag2");
188-
189-
Course course = new Course("Java", "Curso de Java", 100, thumbnail, tags, new ArrayList<Lesson>(), user1);
190-
191-
List<Lesson> lessons = new ArrayList<>();
192-
193-
for (int j = 0; j < 5; j++) {
194-
VideoThumbnail videoThumbnail = new VideoThumbnail();
195-
videoThumbnail.setName("" + j);
196-
videoThumbnail.setData(loadRandomImage());
197-
videoThumbnail.setType("jpg");
198-
199-
long thumbnailId = videoThumbnailService.save(videoThumbnail);
200-
lessons.add(new Lesson("Lesson " + j, "Desc", userRepository.getById(Long.parseLong("3")), course, "https://www.youtube.com/embed/HDhR2Yhnvfo", thumbnailId));
201-
}
202-
203-
course.setLessons(lessons);
204-
205-
206-
courses.add(courseService.save(course));
207-
}
208-
209-
210-
// // Sample orders
211-
OrderP order1 = new OrderP(user1.getId(),10,courses.get(0).getId(),user1.getFirstName(),courses.get(0).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
212-
orderRepository.save(order1);
213-
214-
OrderP order2 = new OrderP(user2.getId(),10,courses.get(0).getId(),user2.getFirstName(),courses.get(0).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
215-
OrderP order22 = new OrderP(user2.getId(),10,courses.get(1).getId(),user2.getFirstName(),courses.get(1).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
216-
OrderP order23 = new OrderP(user2.getId(),10,courses.get(8).getId(),user2.getFirstName(),courses.get(8).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
217-
OrderP order24 = new OrderP(user2.getId(),10,courses.get(8).getId(),user2.getFirstName(),courses.get(8).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
218-
orderRepository.save(order2);
219-
orderRepository.save(order22);
220-
orderRepository.save(order23);
221-
orderRepository.save(order24);
222-
223-
OrderP order3 = new OrderP(user3.getId(),10,courses.get(8).getId(),user3.getFirstName(),courses.get(8).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
224-
orderRepository.save(order3);
225-
226-
OrderP order4 = new OrderP(user4.getId(),10,courses.get(8).getId(),user4.getFirstName(),courses.get(8).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
227-
OrderP order42 = new OrderP(user4.getId(),10,courses.get(24).getId(),user4.getFirstName(),courses.get(24).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
228-
orderRepository.save(order4);
229-
orderRepository.save(order42);
230-
231-
OrderP order5 = new OrderP(user1.getId(),10,courses.get(24).getId(),user1.getFirstName(),courses.get(24).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
232-
orderRepository.save(order5);
233-
234-
OrderP order6 = new OrderP(user2.getId(),10,courses.get(24).getId(),user2.getFirstName(),courses.get(24).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
235-
orderRepository.save(order6);
236-
}
237-
238-
// public byte[] loadRandomImage() throws IOException {
239-
// int randomImgNum = (int) Math.floor(Math.random() * 9) + 1;
240-
// File image = ResourceUtils.getFile("classpath:./fakeImages/" + randomImgNum + ".jpg");
241178
//
242-
// return Files.readAllBytes(image.toPath());
179+
// ArrayList<Course> courses = new ArrayList<>();
180+
//
181+
// // Sample course
182+
// for (int i = 0; i < 5; i++) {
183+
// byte[] thumbnail = loadRandomImage();
184+
//
185+
// ArrayList<String> tags = new ArrayList<>();
186+
// tags.add("Tag1");
187+
// tags.add("Tag2");
188+
//
189+
// Course course = new Course("Java", "Curso de Java", 100, thumbnail, tags, new ArrayList<Lesson>(), user1);
190+
//
191+
// List<Lesson> lessons = new ArrayList<>();
192+
//
193+
// for (int j = 0; j < 3; j++) {
194+
// VideoThumbnail videoThumbnail = new VideoThumbnail();
195+
// videoThumbnail.setName("" + j);
196+
// videoThumbnail.setData(loadRandomImage());
197+
// videoThumbnail.setType("jpg");
198+
//
199+
// long thumbnailId = videoThumbnailService.save(videoThumbnail);
200+
// lessons.add(new Lesson("Lesson " + j, "Desc", userRepository.getById(Long.parseLong("3")), course, "https://www.youtube.com/embed/HDhR2Yhnvfo", thumbnailId));
201+
// }
202+
//
203+
// course.setLessons(lessons);
204+
//
205+
//
206+
// courses.add(courseService.save(course));
207+
// }
208+
//
209+
//
210+
//// // Sample orders
211+
// OrderP order1 = new OrderP(user1.getId(),10,courses.get(0).getId(),user1.getFirstName(),courses.get(0).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
212+
// orderRepository.save(order1);
213+
//
214+
// OrderP order2 = new OrderP(user2.getId(),10,courses.get(0).getId(),user2.getFirstName(),courses.get(0).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
215+
// OrderP order22 = new OrderP(user2.getId(),10,courses.get(1).getId(),user2.getFirstName(),courses.get(1).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
216+
// OrderP order23 = new OrderP(user2.getId(),10,courses.get(3).getId(),user2.getFirstName(),courses.get(3).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
217+
// OrderP order24 = new OrderP(user2.getId(),10,courses.get(3).getId(),user2.getFirstName(),courses.get(3).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
218+
// orderRepository.save(order2);
219+
// orderRepository.save(order22);
220+
// orderRepository.save(order23);
221+
// orderRepository.save(order24);
222+
//
223+
// OrderP order3 = new OrderP(user3.getId(),10,courses.get(3).getId(),user3.getFirstName(),courses.get(3).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
224+
// orderRepository.save(order3);
225+
//
226+
// OrderP order4 = new OrderP(user4.getId(),10,courses.get(3).getId(),user4.getFirstName(),courses.get(3).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
227+
// OrderP order42 = new OrderP(user4.getId(),10,courses.get(3).getId(),user4.getFirstName(),courses.get(3).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
228+
// orderRepository.save(order4);
229+
// orderRepository.save(order42);
230+
//
231+
// OrderP order5 = new OrderP(user1.getId(),10,courses.get(3).getId(),user1.getFirstName(),courses.get(3).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
232+
// orderRepository.save(order5);
233+
//
234+
// OrderP order6 = new OrderP(user2.getId(),10,courses.get(3).getId(),user2.getFirstName(),courses.get(3).getTitle(),"payment Method","billing Address","Country","Region", "data Card");
235+
// orderRepository.save(order6);
236+
// }
237+
//
238+
// public byte[] loadRandomImage() throws IOException {
239+
// URL url = new URL("https://picsum.photos/1920/1080");
240+
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
241+
// InputStream is = null;
242+
// try {
243+
// is = url.openStream ();
244+
// byte[] byteChunk = new byte[4096];
245+
// int n;
246+
//
247+
// while ( (n = is.read(byteChunk)) > 0 ) {
248+
// baos.write(byteChunk, 0, n);
249+
// }
250+
//
251+
// return baos.toByteArray();
252+
// }
253+
// catch (IOException e) {
254+
// e.printStackTrace ();
255+
// }
256+
// finally {
257+
// if (is != null) { is.close(); }
258+
// }
259+
//
260+
// return null;
243261
// }
244-
245-
public byte[] loadRandomImage() throws IOException {
246-
URL url = new URL("https://picsum.photos/1920/1080");
247-
ByteArrayOutputStream baos = new ByteArrayOutputStream();
248-
InputStream is = null;
249-
try {
250-
is = url.openStream ();
251-
byte[] byteChunk = new byte[4096];
252-
int n;
253-
254-
while ( (n = is.read(byteChunk)) > 0 ) {
255-
baos.write(byteChunk, 0, n);
256-
}
257-
258-
return baos.toByteArray();
259-
}
260-
catch (IOException e) {
261-
System.err.printf ("Failed while reading bytes from %s: %s", apiURI.toExternalForm(), e.getMessage());
262-
e.printStackTrace ();
263-
}
264-
finally {
265-
if (is != null) { is.close(); }
266-
}
267-
268-
return null;
269262
}
270-
271263
}

‎backend/src/main/resources/application.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
spring.mustache.suffix=.html
2-
spring.datasource.url=jdbc:postgresql://localhost/youdemy
3-
spring.datasource.username=postgres
4-
spring.datasource.password=password
2+
spring.datasource.url=jdbc:postgresql://${POSTGRE_IP}/${POSTGRE_DB}
3+
spring.datasource.username=${POSTGRE_USER}
4+
spring.datasource.password=${POSTGRE_PASS}
55
spring.jpa.hibernate.ddl-auto=create-drop
66
spring.datasource.hikari.auto-commit=false
77
spring.mustache.cache=false

‎backend/target/classes/META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎backend/target/classes/META-INF/maven/com.youdemy/Youdemy/pom.properties‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎backend/target/classes/META-INF/maven/com.youdemy/Youdemy/pom.xml‎

Lines changed: 0 additions & 148 deletions
This file was deleted.

0 commit comments

Comments
 (0)