Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
<version>1.18.32</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/pecacm/backend/entities/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
return List.of(new SimpleGrantedAuthority("ROLE_" + designation.toString()));
}


@Override
@JsonIgnore
public String getUsername() {
Expand Down
9 changes: 6 additions & 3 deletions src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
server:
port: 8080
spring:
docker:
compose:
enabled: false
datasource:
url: jdbc:postgresql://localhost:5432/acm
username: acmsecy
password: acmheads
username: postgres
password: 12345678
driver-class-name: org.postgresql.Driver
jpa:
hibernate:
ddl-auto: update
ddl-auto: create
properties:
hibernate:
format_sql: true
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ server:
request-attributes-enabled: true

spring:
docker:
compose:
enabled: false
datasource:
url: ${POSTGRESQL_DB_URL}
username: ${POSTGRESQL_DB_USER}
Expand Down
Binary file modified target/backend-1.0.1.jar
Binary file not shown.
Binary file modified target/backend-1.0.1.jar.original
Binary file not shown.
13 changes: 8 additions & 5 deletions target/classes/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
server:
port: 8080
spring:
docker:
compose:
enabled: false
datasource:
url: jdbc:postgresql://localhost:5432/acm
username: acmsecy
password: acmheads
username: postgres
password: 12345678
driver-class-name: org.postgresql.Driver
jpa:
hibernate:
ddl-auto: update
ddl-auto: create
properties:
hibernate:
format_sql: true
Expand All @@ -18,8 +21,8 @@ spring:
mail:
host: smtp.gmail.com
port: 587
username: your_email
password: your_app_password
username: acmcss@pec.edu.in
password: pzsdhgeqmjtnbdpp
properties:
mail:
smtp:
Expand Down
2 changes: 2 additions & 0 deletions target/classes/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ server:
request-attributes-enabled: true

spring:
profiles:
active: "local"
datasource:
url: ${POSTGRESQL_DB_URL}
username: ${POSTGRESQL_DB_USER}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified target/classes/com/pecacm/backend/entities/User$UserBuilder.class
Binary file not shown.
Binary file modified target/classes/com/pecacm/backend/entities/User.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified target/classes/com/pecacm/backend/model/EmailRequest.class
Binary file not shown.
Binary file not shown.
Binary file modified target/classes/com/pecacm/backend/services/EmailService.class
Binary file not shown.
Binary file modified target/classes/com/pecacm/backend/services/EventService.class
Binary file not shown.
Binary file modified target/classes/com/pecacm/backend/services/JwtService.class
Binary file not shown.
Binary file modified target/classes/com/pecacm/backend/services/SupportService.class
Binary file not shown.
Binary file modified target/classes/com/pecacm/backend/services/UserService.class
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\EndEventSidDetails.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\configuration\SecurityConfiguration.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\SupportService.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\enums\EventRole.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\JwtService.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\UserService.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\EmailRequest.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\enums\Branch.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\repository\TransactionRepository.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\AuthenticationResponse.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\entities\Transaction.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\entities\User.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\repository\EventRepository.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\SupportEventResponse.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\EventsController.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\entities\Event.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\util\LoggingInterceptor.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\exception\ExceptionResponseHandler.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\constants\ErrorConstants.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\filters\JwtFilter.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\RegisterResponse.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\EndEventDetails.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\EmailService.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\configuration\MyWebMvcConfigurer.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\BackendApplication.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\SupportController.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\EventService.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\configuration\CorsConfig.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\EmailController.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\UserEventDetails.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\VerificationService.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\exception\AcmException.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\constants\Constants.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\filters\SimpleCORSFilter.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\entities\VerificationToken.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\ErrorResponse.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\EventAttendeesResponse.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\repository\VerificationTokenRepository.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\SupportUserResponse.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\repository\UserRepository.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\HealthController.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\UserController.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\EventUserDetails.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\AssignRoleRequest.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\AuthenticationRequest.java
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\main\java\com\pecacm\backend\enums\Role.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\constants\ErrorConstants.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\configuration\MyWebMvcConfigurer.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\repository\UserRepository.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\EmailController.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\exception\ExceptionResponseHandler.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\EmailRequest.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\configuration\CorsConfig.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\EventService.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\EmailService.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\UserEventDetails.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\EndEventSidDetails.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\SupportEventResponse.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\filters\JwtFilter.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\JwtService.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\exception\AcmException.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\constants\Constants.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\EventsController.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\AuthenticationResponse.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\SupportService.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\enums\Branch.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\repository\TransactionRepository.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\UserController.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\entities\Event.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\AuthenticationRequest.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\UserService.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\BackendApplication.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\entities\VerificationToken.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\EventUserDetails.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\VerificationService.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\filters\SimpleCORSFilter.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\ErrorResponse.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\repository\EventRepository.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\util\LoggingInterceptor.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\AssignRoleRequest.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\enums\Role.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\configuration\SecurityConfiguration.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\EventAttendeesResponse.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\entities\Transaction.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\entities\User.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\SupportController.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\SupportUserResponse.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\EndEventDetails.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\RegisterResponse.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\enums\EventRole.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\HealthController.java
D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\repository\VerificationTokenRepository.java
Original file line number Diff line number Diff line change
@@ -1 +1 @@
C:\Users\sunpr\OneDrive\Desktop\PEC ACM\backend\acm-website-backend\src\test\java\com\pecacm\backend\BackendApplicationTests.java
D:\ACM\acm-website-backend\src\test\java\com\pecacm\backend\BackendApplicationTests.java
Loading