Skip to content

Commit 044d8c5

Browse files
jbarcia2019jbarcia2019
authored
Merge pull request #36 from CodeURJC-DAW-2021-22/develop
Develop to main
2 parents 20fa9c8 + 1c243f0 commit 044d8c5

File tree

86 files changed

+14573
-11146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+14573
-11146
lines changed

‎Article.postman_collection.json‎

Lines changed: 513 additions & 3 deletions
Large diffs are not rendered by default.

‎backend/docker-compose-local.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version: "3.9"
2-
services:
2+
services:
33
web:
44
build: .
55
restart: always
66
ports:
7-
- 8443:8443
7+
- 8443:8443
88
environment:
99
- SPRING_DATASOURCE_URL=jdbc:postgresql://db/wallypop
1010
- SPRING_DATASOURCE_USERNAME=postgres

‎backend/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version: "3.9"
2-
services:
2+
services:
33
web:
44
image: jesusbarcia/codeurjc-daw-2021-22-webapp4
55
restart: always
66
ports:
7-
- 8443:8443
7+
- 8443:8443
88
environment:
99
- SPRING_DATASOURCE_URL=jdbc:postgresql://db/wallypop
1010
- SPRING_DATASOURCE_USERNAME=postgres

‎backend/pom.xml‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
<parent>
7-
<groupId>org.springframework.boot</groupId>
8-
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>2.6.3</version>
10-
<relativePath /> <!-- lookup parent from repository -->
11-
</parent>
12-
<groupId>es.codeurjc</groupId>
13-
<artifactId>wallypop1</artifactId>
14-
<version>0.0.1-SNAPSHOT</version>
15-
<name>wallypop-1</name>
16-
<description>Demo project for Spring Boot</description>
17-
<properties>
18-
<java.version>17</java.version>
19-
</properties>
20-
<dependencies>
21-
<dependency>
22-
<groupId>org.springframework.boot</groupId>
23-
<artifactId>spring-boot-starter-data-jpa</artifactId>
24-
</dependency>
25-
<dependency>
26-
<groupId>org.springframework.boot</groupId>
27-
<artifactId>spring-boot-starter-mustache</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.springframework.boot</groupId>
31-
<artifactId>spring-boot-starter-web</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.postgresql</groupId>
35-
<artifactId>postgresql</artifactId>
36-
<scope>runtime</scope>
37-
</dependency>
38-
<dependency>
39-
<groupId>org.springframework.boot</groupId>
40-
<artifactId>spring-boot-starter-security</artifactId>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.springframework.boot</groupId>
44-
<artifactId>spring-boot-devtools</artifactId>
45-
</dependency>
46-
<dependency>
47-
<groupId>com.sun.mail</groupId>
48-
<artifactId>javax.mail</artifactId>
49-
<version>1.6.2</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>io.jsonwebtoken</groupId>
53-
<artifactId>jjwt</artifactId>
54-
<version>0.7.0</version>
55-
</dependency>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>org.springframework.boot</groupId>
8+
<artifactId>spring-boot-starter-parent</artifactId>
9+
<version>2.6.3</version>
10+
<relativePath/> <!-- lookup parent from repository -->
11+
</parent>
12+
<groupId>es.codeurjc</groupId>
13+
<artifactId>wallypop1</artifactId>
14+
<version>0.0.1-SNAPSHOT</version>
15+
<name>wallypop-1</name>
16+
<description>Demo project for Spring Boot</description>
17+
<properties>
18+
<java.version>17</java.version>
19+
</properties>
20+
<dependencies>
21+
<dependency>
22+
<groupId>org.springframework.boot</groupId>
23+
<artifactId>spring-boot-starter-data-jpa</artifactId>
24+
</dependency>
25+
<dependency>
26+
<groupId>org.springframework.boot</groupId>
27+
<artifactId>spring-boot-starter-mustache</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-starter-web</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.postgresql</groupId>
35+
<artifactId>postgresql</artifactId>
36+
<scope>runtime</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.springframework.boot</groupId>
40+
<artifactId>spring-boot-starter-security</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.springframework.boot</groupId>
44+
<artifactId>spring-boot-devtools</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.sun.mail</groupId>
48+
<artifactId>javax.mail</artifactId>
49+
<version>1.6.2</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.jsonwebtoken</groupId>
53+
<artifactId>jjwt</artifactId>
54+
<version>0.7.0</version>
55+
</dependency>
5656

57-
<dependency>
58-
<groupId>org.springdoc</groupId>
59-
<artifactId>springdoc-openapi-ui</artifactId>
60-
<version>1.5.12</version>
61-
</dependency>
57+
<dependency>
58+
<groupId>org.springdoc</groupId>
59+
<artifactId>springdoc-openapi-ui</artifactId>
60+
<version>1.5.12</version>
61+
</dependency>
6262

6363

64-
</dependencies>
64+
</dependencies>
6565

66-
<build>
67-
<plugins>
68-
<plugin>
69-
<groupId>org.springframework.boot</groupId>
70-
<artifactId>spring-boot-maven-plugin</artifactId>
71-
<configuration>
72-
<image>
73-
<env>
74-
<BPE_OVERRIDE_JAVA_TOOL_OPTIONS>
75-
-Xss256K
76-
-XX:ReservedCodeCacheSize=64M
77-
-XX:MaxMetaspaceSize=100000K
78-
-Xmx64M
79-
</BPE_OVERRIDE_JAVA_TOOL_OPTIONS>
80-
</env>
81-
</image>
82-
</configuration>
83-
</plugin>
84-
</plugins>
85-
</build>
66+
<build>
67+
<plugins>
68+
<plugin>
69+
<groupId>org.springframework.boot</groupId>
70+
<artifactId>spring-boot-maven-plugin</artifactId>
71+
<configuration>
72+
<image>
73+
<env>
74+
<BPE_OVERRIDE_JAVA_TOOL_OPTIONS>
75+
-Xss256K
76+
-XX:ReservedCodeCacheSize=64M
77+
-XX:MaxMetaspaceSize=100000K
78+
-Xmx64M
79+
</BPE_OVERRIDE_JAVA_TOOL_OPTIONS>
80+
</env>
81+
</image>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</build>
8686

8787
</project>

‎backend/src/main/java/es/codeurjc/wallypop/WallypopApplication.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
@SpringBootApplication
77
public class WallypopApplication {
88

9-
public static void main(String[] args) {
10-
SpringApplication.run(WallypopApplication.class, args);
11-
}
9+
public static void main(String[] args) {
10+
SpringApplication.run(WallypopApplication.class, args);
11+
}
1212

1313
}

‎backend/src/main/java/es/codeurjc/wallypop/configuration/DatabaseConfig.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.zaxxer.hikari.HikariConfig;
44
import com.zaxxer.hikari.HikariDataSource;
5-
import org.slf4j.LoggerFactory;
65
import org.springframework.beans.factory.annotation.Value;
76
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
87
import org.springframework.context.annotation.Bean;
@@ -11,13 +10,12 @@
1110
import javax.sql.DataSource;
1211
import java.net.URI;
1312
import java.net.URISyntaxException;
14-
import java.util.logging.Level;
15-
import java.util.logging.Logger;
1613

1714
@Configuration
1815
public class DatabaseConfig {
1916
@Value("${DATABASE_URL:null}")
2017
private String databaseUrl;
18+
2119
@Bean
2220
@ConditionalOnProperty("DATABASE_URL")
2321
public DataSource dataSource() throws URISyntaxException {

‎backend/src/main/java/es/codeurjc/wallypop/configuration/DatabaseWaitConfigurator.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@
1111

1212
@SpringBootConfiguration
1313
public class DatabaseWaitConfigurator {
14-
@Bean
15-
public DatabaseStartupValidator databaseStartupValidator(DataSource dataSource) {
16-
DatabaseStartupValidator dsv = new DatabaseStartupValidator();
17-
dsv.setDataSource(dataSource);
18-
// Configuration delay and timeout
19-
dsv.setInterval(5);
20-
dsv.setTimeout(120);
21-
return dsv;
22-
}
2314
@Bean
2415
public static BeanFactoryPostProcessor dependsOnPostProcessor() {
2516
return bf ->
@@ -32,4 +23,14 @@ public static BeanFactoryPostProcessor dependsOnPostProcessor() {
3223
.forEach(it -> it.setDependsOn("databaseStartupValidator"));
3324
};
3425
}
26+
27+
@Bean
28+
public DatabaseStartupValidator databaseStartupValidator(DataSource dataSource) {
29+
DatabaseStartupValidator dsv = new DatabaseStartupValidator();
30+
dsv.setDataSource(dataSource);
31+
// Configuration delay and timeout
32+
dsv.setInterval(5);
33+
dsv.setTimeout(120);
34+
return dsv;
35+
}
3536
}

‎backend/src/main/java/es/codeurjc/wallypop/controller/UserController.java‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
11
package es.codeurjc.wallypop.controller;
22

3-
import java.io.IOException;
4-
3+
import es.codeurjc.wallypop.model.User;
4+
import es.codeurjc.wallypop.service.UserService;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.stereotype.Controller;
77
import org.springframework.ui.Model;
88
import org.springframework.web.bind.annotation.PostMapping;
99
import org.springframework.web.bind.annotation.RequestMapping;
1010

11-
import es.codeurjc.wallypop.model.User;
12-
import es.codeurjc.wallypop.service.UserService;
11+
import java.io.IOException;
1312

1413
@Controller
1514
public class UserController {
16-
@Autowired
17-
private UserService userService;
18-
19-
/* LOGIN */
20-
@RequestMapping("/login")
21-
public String login() {
22-
return "login";
23-
}
24-
25-
@RequestMapping("/loginerror")
26-
public String loginerror(Model model) {
27-
model.addAttribute("ERROR", true);
28-
return "login";
29-
}
30-
31-
/* SING UP */
32-
@RequestMapping("/newaccount")
33-
public String newAccount(Model model) {
34-
model.addAttribute("user", new User());
35-
return "newaccount";
36-
}
37-
38-
@RequestMapping("/newaccounterror")
39-
public String newAccountError(Model model) {
40-
model.addAttribute("user", new User());
41-
model.addAttribute("ERROR", true);
42-
return "newaccount";
43-
}
44-
45-
@PostMapping("/newaccount")
46-
public String newUser(Model model, User us) throws IOException {
47-
us.setPASSWORD(userService.encode(us.getPASSWORD()));
48-
if (userService.userExists(us)) {
49-
return "newaccounterror";
50-
} else {
51-
userService.save(us);
52-
return "login";
53-
}
54-
}
15+
@Autowired
16+
private UserService userService;
17+
18+
/* LOGIN */
19+
@RequestMapping("/login")
20+
public String login() {
21+
return "login";
22+
}
23+
24+
@RequestMapping("/loginerror")
25+
public String loginerror(Model model) {
26+
model.addAttribute("ERROR", true);
27+
return "login";
28+
}
29+
30+
/* SING UP */
31+
@RequestMapping("/newaccount")
32+
public String newAccount(Model model) {
33+
model.addAttribute("user", new User());
34+
return "newaccount";
35+
}
36+
37+
@RequestMapping("/newaccounterror")
38+
public String newAccountError(Model model) {
39+
model.addAttribute("user", new User());
40+
model.addAttribute("ERROR", true);
41+
return "newaccount";
42+
}
43+
44+
@PostMapping("/newaccount")
45+
public String newUser(Model model, User us) throws IOException {
46+
us.setPASSWORD(userService.encode(us.getPASSWORD()));
47+
if (userService.userExists(us)) {
48+
return "newaccounterror";
49+
} else {
50+
userService.save(us);
51+
return "login";
52+
}
53+
}
5554
}

0 commit comments

Comments
 (0)