Skip to content

Commit da73134

Browse files
HashiruGHashiruG
authored
Merge pull request #24 from HashiruG/deployment-backup
fix: fix deployment issues
2 parents a4a5425 + 03b4a04 commit da73134

4 files changed

Lines changed: 138 additions & 130 deletions

File tree

‎pom.xml‎

Lines changed: 131 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,138 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.4.3</version>
9-
<relativePath/>
10-
</parent>
11-
<groupId>com.pentagon</groupId>
12-
<artifactId>Quicky_Backend</artifactId>
13-
<version>0.0.1-SNAPSHOT</version>
14-
<name>Quicky_Backend</name>
15-
<description>Backend of the Quicky project</description>
16-
<url/>
17-
<licenses>
18-
<license/>
19-
</licenses>
20-
<developers>
21-
<developer/>
22-
</developers>
23-
<scm>
24-
<connection/>
25-
<developerConnection/>
26-
<tag/>
27-
<url/>
28-
</scm>
29-
<properties>
30-
<java.version>17</java.version>
31-
</properties>
32-
<dependencies>
33-
<dependency>
34-
<groupId>org.springframework.boot</groupId>
35-
<artifactId>spring-boot-starter-data-jpa</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.springframework.boot</groupId>
39-
<artifactId>spring-boot-starter-security</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.springframework.boot</groupId>
43-
<artifactId>spring-boot-starter-web</artifactId>
44-
</dependency>
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">
455

46-
<dependency>
47-
<groupId>org.springframework.boot</groupId>
48-
<artifactId>spring-boot-devtools</artifactId>
49-
<scope>runtime</scope>
50-
<optional>true</optional>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.postgresql</groupId>
54-
<artifactId>postgresql</artifactId>
55-
<scope>runtime</scope>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.stripe</groupId>
59-
<artifactId>stripe-java</artifactId>
60-
<version>24.9.0</version>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.projectlombok</groupId>
64-
<artifactId>lombok</artifactId>
65-
<optional>true</optional>
66-
</dependency>
67-
<dependency>
68-
<groupId>org.springframework.boot</groupId>
69-
<artifactId>spring-boot-starter-test</artifactId>
70-
<scope>test</scope>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.springframework.security</groupId>
74-
<artifactId>spring-security-test</artifactId>
75-
<scope>test</scope>
76-
</dependency>
6+
<modelVersion>4.0.0</modelVersion>
777

78-
<dependency>
79-
<groupId>io.jsonwebtoken</groupId>
80-
<artifactId>jjwt-api</artifactId>
81-
<version>0.12.6</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>io.jsonwebtoken</groupId>
85-
<artifactId>jjwt-impl</artifactId>
86-
<version>0.12.6</version>
87-
<scope>runtime</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>io.jsonwebtoken</groupId>
91-
<artifactId>jjwt-jackson</artifactId>
92-
<version>0.12.6</version>
93-
<scope>runtime</scope>
94-
</dependency>
95-
<dependency>
8+
<parent>
969
<groupId>org.springframework.boot</groupId>
97-
<artifactId>spring-boot-starter-mail</artifactId>
98-
</dependency>
99-
</dependencies>
10+
<artifactId>spring-boot-starter-parent</artifactId>
11+
<version>3.4.3</version>
12+
<relativePath/>
13+
</parent>
10014

101-
<build>
102-
<plugins>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<artifactId>maven-compiler-plugin</artifactId>
106-
<configuration>
107-
<annotationProcessorPaths>
108-
<path>
109-
<groupId>org.projectlombok</groupId>
110-
<artifactId>lombok</artifactId>
111-
</path>
112-
</annotationProcessorPaths>
113-
</configuration>
114-
</plugin>
115-
<plugin>
116-
<groupId>org.springframework.boot</groupId>
117-
<artifactId>spring-boot-maven-plugin</artifactId>
118-
<configuration>
119-
<excludes>
120-
<exclude>
121-
<groupId>org.projectlombok</groupId>
122-
<artifactId>lombok</artifactId>
123-
</exclude>
124-
</excludes>
125-
</configuration>
126-
</plugin>
127-
</plugins>
128-
</build>
15+
<groupId>com.pentagon</groupId>
16+
<artifactId>Quicky_Backend</artifactId>
17+
<version>0.0.1-SNAPSHOT</version>
18+
<name>Quicky_Backend</name>
19+
<description>Backend of the Quicky project</description>
20+
21+
<properties>
22+
<java.version>17</java.version>
23+
</properties>
24+
25+
<dependencies>
26+
<!-- Spring Boot Starters -->
27+
<dependency>
28+
<groupId>org.springframework.boot</groupId>
29+
<artifactId>spring-boot-starter-data-jpa</artifactId>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.springframework.boot</groupId>
33+
<artifactId>spring-boot-starter-security</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.springframework.boot</groupId>
37+
<artifactId>spring-boot-starter-web</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-starter-mail</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.springframework.boot</groupId>
45+
<artifactId>spring-boot-devtools</artifactId>
46+
<scope>runtime</scope>
47+
<optional>true</optional>
48+
</dependency>
49+
50+
<!-- Database -->
51+
<dependency>
52+
<groupId>org.postgresql</groupId>
53+
<artifactId>postgresql</artifactId>
54+
<scope>runtime</scope>
55+
</dependency>
56+
57+
<!-- Stripe Payments -->
58+
<dependency>
59+
<groupId>com.stripe</groupId>
60+
<artifactId>stripe-java</artifactId>
61+
<version>24.9.0</version>
62+
</dependency>
63+
64+
<!-- JSON Web Token (JJWT for JWT auth) -->
65+
<dependency>
66+
<groupId>io.jsonwebtoken</groupId>
67+
<artifactId>jjwt-api</artifactId>
68+
<version>0.12.6</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>io.jsonwebtoken</groupId>
72+
<artifactId>jjwt-impl</artifactId>
73+
<version>0.12.6</version>
74+
<scope>runtime</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>io.jsonwebtoken</groupId>
78+
<artifactId>jjwt-jackson</artifactId>
79+
<version>0.12.6</version>
80+
<scope>runtime</scope>
81+
</dependency>
82+
83+
<!-- Lombok (for DTOs, Entities, etc) -->
84+
<dependency>
85+
<groupId>org.projectlombok</groupId>
86+
<artifactId>lombok</artifactId>
87+
<version>1.18.32</version> <!-- Use latest compatible version -->
88+
<scope>provided</scope>
89+
</dependency>
90+
91+
<!-- Test dependencies -->
92+
<dependency>
93+
<groupId>org.springframework.boot</groupId>
94+
<artifactId>spring-boot-starter-test</artifactId>
95+
<scope>test</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.springframework.security</groupId>
99+
<artifactId>spring-security-test</artifactId>
100+
<scope>test</scope>
101+
</dependency>
102+
</dependencies>
103+
104+
<build>
105+
<plugins>
106+
<!-- Lombok Annotation Processing for Maven -->
107+
<plugin>
108+
<groupId>org.apache.maven.plugins</groupId>
109+
<artifactId>maven-compiler-plugin</artifactId>
110+
<configuration>
111+
<annotationProcessorPaths>
112+
<path>
113+
<groupId>org.projectlombok</groupId>
114+
<artifactId>lombok</artifactId>
115+
<version>1.18.32</version>
116+
</path>
117+
</annotationProcessorPaths>
118+
</configuration>
119+
</plugin>
120+
121+
<!-- Spring Boot Maven Plugin -->
122+
<plugin>
123+
<groupId>org.springframework.boot</groupId>
124+
<artifactId>spring-boot-maven-plugin</artifactId>
125+
<configuration>
126+
<excludes>
127+
<!-- Exclude Lombok from final artifact -->
128+
<exclude>
129+
<groupId>org.projectlombok</groupId>
130+
<artifactId>lombok</artifactId>
131+
</exclude>
132+
</excludes>
133+
</configuration>
134+
</plugin>
135+
</plugins>
136+
</build>
129137

130138
</project>

‎src/main/java/com/pentagon/Quicky_Backend/controller/PayOutController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.springframework.web.bind.annotation.RestController;
1212

1313
import com.pentagon.Quicky_Backend.dto.PayOutRequestDto;
14-
import com.pentagon.Quicky_Backend.dto.PayoutResponseDto;
14+
import com.pentagon.Quicky_Backend.dto.PayOutResponseDto;
1515
import com.pentagon.Quicky_Backend.service.PayOutService;
1616
import org.springframework.web.bind.annotation.GetMapping;
1717

@@ -29,7 +29,7 @@ public ResponseEntity<String> acceptPayout(@RequestBody PayOutRequestDto payOutR
2929
}
3030

3131
@GetMapping("/get-payouts")
32-
public ResponseEntity<List<PayoutResponseDto>> getPayouts() {
32+
public ResponseEntity<List<PayOutResponseDto>> getPayouts() {
3333
return payOutService.getPayouts();
3434
}
3535

‎src/main/java/com/pentagon/Quicky_Backend/dto/PayOutResponseDto.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@AllArgsConstructor
1111
@NoArgsConstructor
1212
@Data
13-
public class PayoutResponseDto {
13+
public class PayOutResponseDto {
1414
private Integer payoutId;
1515
private double amount;
1616
private String status;

‎src/main/java/com/pentagon/Quicky_Backend/service/PayOutService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.springframework.transaction.annotation.Transactional;
1212

1313
import com.pentagon.Quicky_Backend.dto.PayOutRequestDto;
14-
import com.pentagon.Quicky_Backend.dto.PayoutResponseDto;
14+
import com.pentagon.Quicky_Backend.dto.PayOutResponseDto;
1515
import com.pentagon.Quicky_Backend.entity.DriverDetails;
1616

1717
import com.pentagon.Quicky_Backend.entity.PayOutRequests;
@@ -84,11 +84,11 @@ public ResponseEntity<String> processPayOuts(PayOutRequestDto payOutRequestDto,
8484
}
8585
}
8686

87-
public ResponseEntity<List<PayoutResponseDto>> getPayouts(){
87+
public ResponseEntity<List<PayOutResponseDto>> getPayouts(){
8888
List<PayOutRequests> payOutRequests = payOutRepo.findAll();
89-
List<PayoutResponseDto> payoutResponses = new ArrayList<>();
89+
List<PayOutResponseDto> payoutResponses = new ArrayList<>();
9090
for (PayOutRequests request : payOutRequests) {
91-
PayoutResponseDto payoutResponse = new PayoutResponseDto(
91+
PayOutResponseDto payoutResponse = new PayOutResponseDto(
9292
request.getPayoutId(),
9393
request.getAmount(),
9494
request.getStatus(),

0 commit comments

Comments
 (0)