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

added new endpoints, getUser, getUserHistories, getBookmarks

Browse Source
This commit is contained in:
heyethereum
2024-07-20 01:10:28 +08:00
parent f7e592f8ec
commit ee3180dbea
33 changed files with 261 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,25 +1,55 @@
package com.safeqr.app.user.controller;
import static com.safeqr.app.constants.APIConstants.*;
import static com.safeqr.app.constants.CommonConstants.HEADER_USER_ID;
import com.safeqr.app.qrcode.entity.QRCodeEntity;
import com.safeqr.app.user.dto.UserResponseDto;
import com.safeqr.app.user.service.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/v1")
@RequestMapping(API_VERSION)
public class UserController {
@Autowired
private static final Logger logger = LoggerFactory.getLogger(UserController.class);
UserService userService;
@Autowired
public UserController(UserService userService) {
this.userService = userService;
}
@GetMapping(value = "/version", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Map<String, String>> version() {
// System.out.println(userService.getUserByEmail());
System.out.println("Health Check");
logger.info("Health Check");
return ResponseEntity.ok(Map.of("version","SafeQR v1.0.2"));
}
@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");
return ResponseEntity.ok(userService.getUserById(userId));
}
@GetMapping(value = API_URL_USER_GET_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<QRCodeEntity>> getUserScannedHistories(@RequestHeader(name = HEADER_USER_ID) String userId) {
logger.info("Invoking GET User Scanned Histories endpoint");
return ResponseEntity.ok(userService.getUserScannedHistories(userId));
}
@GetMapping(value = API_URL_USER_GET_BOOKMARKS, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<QRCodeEntity>> getUserBookmarks(@RequestHeader(name = HEADER_USER_ID) String userId) {
logger.info("Invoking GET User bookmarks endpoint");
return ResponseEntity.ok(userService.getUserBookmarks(userId));
}
}

4
src/main/java/com/safeqr/app/user/dto/ScannedHistoriesResponse.java Normal file
View File

@@ -0,0 +1,4 @@
package com.safeqr.app.user.dto;
public class ScannedHistoriesResponse {
}

19
src/main/java/com/safeqr/app/user/dto/UserResponseDto.java Normal file
View File

@@ -0,0 +1,19 @@
package com.safeqr.app.user.dto;
import lombok.Builder;
import lombok.Data;
import java.time.OffsetDateTime;
import java.util.List;
@Data
@Builder
public class UserResponseDto {
private String id;
private String name;
private String email;
private OffsetDateTime dateJoined;
private OffsetDateTime dateUpdated;
private List<String> roles;
private String status;
}

10
src/main/java/com/safeqr/app/user/entity/UserEntity.java
View File

@@ -1,19 +1,19 @@
package com.safeqr.app.user.entity;
import io.hypersistence.utils.hibernate.type.array.ListArrayType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.*;
import org.hibernate.annotations.Type;
import java.util.List;
import java.time.OffsetDateTime;
import java.util.List;
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Getter
@Setter
@Entity
@Data
@Table(name="user", schema = "safeqr")
@@ -29,6 +29,8 @@ public class UserEntity {
@Column(name = "date_updated")
private OffsetDateTime dateUpdated;
private String source;
@Type(ListArrayType.class)
@Column(name = "roles", columnDefinition = "text[]")
private List<String> roles;
private String status;
}

1
src/main/java/com/safeqr/app/user/repository/UserRepository.java
View File

@@ -6,5 +6,4 @@ import org.springframework.stereotype.Repository;
@Repository
public interface UserRepository extends JpaRepository<UserEntity, String> {
UserEntity findByEmail(String email);
}

45
src/main/java/com/safeqr/app/user/service/UserService.java
View File

@@ -1,23 +1,52 @@
package com.safeqr.app.user.service;
import com.safeqr.app.exceptions.CustomNotFoundExceptions;
import com.safeqr.app.qrcode.entity.QRCodeEntity;
import com.safeqr.app.qrcode.repository.ScanBookmarkRepository;
import com.safeqr.app.qrcode.repository.ScanHistoryRepository;
import com.safeqr.app.user.dto.UserResponseDto;
import com.safeqr.app.user.entity.UserEntity;
import com.safeqr.app.user.repository.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class UserService {
@Autowired
private UserRepository userRepository;
public UserService(UserRepository userRepository,
ScanHistoryRepository scanHistoryRepository,
ScanBookmarkRepository scanBookmarkRepository) {
this.userRepository = userRepository;
this.scanHistoryRepository = scanHistoryRepository;
this.scanBookmarkRepository = scanBookmarkRepository;
}
private final UserRepository userRepository;
private final ScanHistoryRepository scanHistoryRepository;
private final ScanBookmarkRepository scanBookmarkRepository;
public String getUserByEmail() {
public UserResponseDto getUserById(String userId) {
// Find user by id
UserEntity userEntity = userRepository.findById(userId)
.orElseThrow(() -> new CustomNotFoundExceptions("User id not found: " + userId));
// Retrieve the user by email
UserEntity retrievedUser = userRepository.findByEmail("piggyinu@gmail.com");
if (retrievedUser != null) {
return "User found: " + retrievedUser.getName();
}
return "User not found";
// Map to DTO before returning to controller
return UserResponseDto.builder()
.id(userEntity.getId())
.email(userEntity.getEmail())
.name(userEntity.getName())
.dateJoined(userEntity.getDateCreated())
.dateUpdated(userEntity.getDateUpdated())
.roles(userEntity.getRoles())
.status(userEntity.getStatus())
.build();
}
public List<QRCodeEntity> getUserScannedHistories(String userId) {
return scanHistoryRepository.findAllQRCodesByUserId(userId);
}
public List<QRCodeEntity> getUserBookmarks(String userId) {
return scanBookmarkRepository.findAllBookmarksByUserId(userId);
}
}