isky/backend-springboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhance logging and fix Null pointer exception at wifi Null

Browse Source
This commit is contained in:
heyethereum
2024-08-12 00:51:35 +08:00
parent 3b2533bb62
commit a71cbd3093
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/safeqr/app/gmail/controller/GmailController.java
View File

@@ -104,7 +104,7 @@ public class GmailController {
@GetMapping(value = API_URL_GMAIL_GET_SCANNED_EMAILS, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<ScannedGmailResponseDto> getUserScannedEmails(@RequestHeader(name = "X-USER-ID") String userId) {
logger.info("Invoking GET User scanned Emails endpoint");
logger.info("User Id Invoking GET User scanned Emails endpoint: {}", userId);
return ResponseEntity.ok(gmailService.fetchScannedGmail(userId));
}
@GetMapping(value = API_URL_GMAIL_GET_EMAILS, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -112,7 +112,7 @@ public class GmailController {
@RequestHeader(name = "refreshToken") String refreshToken,
@RequestHeader(name = "X-USER-ID") String userId
) {
logger.info("Invoking GET Scan User Emails endpoints");
logger.info("User Id Invoking GET Scan User Emails endpoints: {}", userId);
if (accessToken == null || accessToken.isEmpty()) {
return new ResponseEntity<>("Access token is missing", HttpStatus.BAD_REQUEST);
}

2
src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java
View File

@@ -52,7 +52,7 @@ public class QRCodeTypeController {
@PostMapping(value = API_URL_QRCODE_SCAN, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<BaseScanResponse> scanQRCode(@RequestBody QRCodePayload payload,
@RequestHeader(required = false, name = HEADER_USER_ID) String userId) {
logger.info("Invoking scan endpoint");
logger.info("User Id Invoking scan endpoint: {}", userId);
return ResponseEntity.ok(qrCodeTypeService.scanQRCode(userId, payload));
}

2
src/main/java/com/safeqr/app/qrcode/entity/WifiEntity.java
View File

@@ -2,6 +2,7 @@ package com.safeqr.app.qrcode.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -31,6 +32,7 @@ public class WifiEntity {
private String ssid;
private String password;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private String encryption;
private boolean hidden;
}

5
src/main/java/com/safeqr/app/qrcode/service/WifiVerificationService.java
View File

@@ -60,6 +60,11 @@ public class WifiVerificationService {
}
public String getClassification(String encryptionType) {
// Check if encryptionType is null
if (encryptionType == null) {
return CLASSIFY_UNSAFE;
}
if (encryptionType.equalsIgnoreCase("WPA") ||
encryptionType.equalsIgnoreCase("WPA2") ||
encryptionType.equalsIgnoreCase("WPA3")) {

16
src/main/java/com/safeqr/app/user/controller/UserController.java
View File

@@ -37,49 +37,49 @@ public class UserController {
@GetMapping(value = API_URL_USER_GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<UserResponseDto> getUser(@RequestHeader(name = HEADER_USER_ID) String userId) {
logger.info("Invoking GET User endpoint");
logger.info("User Id Invoking GET User endpoint: {}", userId);
return ResponseEntity.ok(userService.getUserById(userId));
}
@GetMapping(value = API_URL_USER_GET_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<ScannedHistoriesDto>> getUserScannedHistories(@RequestHeader(name = HEADER_USER_ID) String userId) {
logger.info("Invoking GET User Scanned Histories endpoint");
logger.info("User Id Invoking GET User Scanned Histories endpoint: {}", userId);
return ResponseEntity.ok(userService.getUserScannedHistories(userId));
}
@PutMapping(value = API_URL_USER_DELETE_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<BaseResponse> deleteScannedHistory(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) {
logger.info("Invoking PUT Delete Single Scanned History endpoint");
logger.info("User Id Invoking PUT Delete Single Scanned History endpoint: {}", userId);
return ResponseEntity.ok(userService.deleteScannedHistory(userId, bookmarkRequestDto.getQrCodeId()));
}
@PutMapping(value = API_URL_USER_DELETE_ALL_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<BaseResponse> deleteAllScannedHistories(@RequestHeader(name = HEADER_USER_ID) String userId) {
logger.info("Invoking PUT Delete All Scanned Histories endpoint");
logger.info("User Id Invoking PUT Delete All Scanned Histories endpoint: {}", userId);
return ResponseEntity.ok(userService.deleteAllScannedHistoriesByUserId(userId));
}
@GetMapping(value = API_URL_USER_GET_BOOKMARKS, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<ScannedHistoriesDto>> getUserBookmarks(@RequestHeader(name = HEADER_USER_ID) String userId) {
logger.info("Invoking GET User bookmarks endpoint");
logger.info("User Id Invoking GET User bookmarks endpoint: {}", userId);
return ResponseEntity.ok(userService.getUserBookmarks(userId));
}
@PostMapping(value = API_URL_USER_SET_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<BaseResponse> setBookmark(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) {
logger.info("Invoking POST User bookmark endpoint");
logger.info("User Id Invoking POST User bookmark endpoint: {}", userId);
return ResponseEntity.ok(userService.setBookmark(userId, bookmarkRequestDto.getQrCodeId()));
}
@PutMapping(value = API_URL_USER_DELETE_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<BaseResponse> deleteBookmark(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) {
logger.info("Invoking PUT Delete Single Bookmark endpoint");
logger.info("User Id Invoking PUT Delete Single Bookmark endpoint: {}", userId);
return ResponseEntity.ok(userService.deleteBookmark(userId, bookmarkRequestDto.getQrCodeId()));
}
@PutMapping(value = API_URL_USER_DELETE_ALL_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<BaseResponse> deleteAllBookmark(@RequestHeader(name = HEADER_USER_ID) String userId) {
logger.info("Invoking PUT Delete All Bookmark endpoint");
logger.info("User Id Invoking PUT Delete All Bookmark endpoint: {}", userId);
return ResponseEntity.ok(userService.deleteAllBookmarkByUserId(userId));
}
}