added new endpoints, getUser, getUserHistories, getBookmarks

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

View File

@@ -0,0 +1,39 @@
package com.safeqr.app.qrcode.entity;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.NoArgsConstructor;
import java.util.UUID;
@Entity
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "scan_bookmark", schema = "safeqr")
public class ScanBookmarkEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "qr_code_id", nullable = false)
private UUID qrCodeId;
@Column(name = "user_id", nullable = false)
private String userId;
@Enumerated(EnumType.STRING)
@Column(name = "status", nullable = false)
private BookmarkStatus scanStatus;
public enum BookmarkStatus {
ACTIVE,
INACTIVE
}
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "qr_code_id", referencedColumnName = "id", insertable = false, updatable = false)
private QRCodeEntity qrCodeEntity;
}

View File

@@ -32,4 +32,7 @@ public class ScanHistoryEntity {
ACTIVE,
INACTIVE
}
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "qr_code_id", referencedColumnName = "id", insertable = false, updatable = false)
private QRCodeEntity qrCodeEntity;
}

View File

@@ -19,20 +19,20 @@ public final class EmailModel extends QRCodeModel<EmailEntity> {
private final EmailVerificationService emailVerificationService;
public EmailModel(QRCodeEntity scannedQRCodeEntity, EmailVerificationService emailVerificationService) {
this.scannedQRCode = scannedQRCodeEntity;
this.data = scannedQRCodeEntity;
this.emailVerificationService = emailVerificationService;
this.details = null;
}
@Override
public void setDetails() {
details = EmailEntity.builder().qrCodeId(scannedQRCode.getId()).build();
details = EmailEntity.builder().qrCodeId(data.getId()).build();
// Insert into email table
emailVerificationService.insertDB(details);
}
@Override
public EmailEntity getDetails () {
return new EmailEntity();
return emailVerificationService.getEmailEntityByQRCodeId(data.getId());
}
}

View File

@@ -19,19 +19,19 @@ public final class PhoneModel extends QRCodeModel<PhoneEntity> {
private final PhoneVerificationService phoneVerificationService;
public PhoneModel(QRCodeEntity scannedQRCodeEntity, PhoneVerificationService phoneVerificationService) {
this.scannedQRCode = scannedQRCodeEntity;
this.data = scannedQRCodeEntity;
this.phoneVerificationService = phoneVerificationService;
this.details = null;
}
@Override
public void setDetails() {
details = PhoneEntity.builder().qrCodeId(scannedQRCode.getId()).build();
details = PhoneEntity.builder().qrCodeId(data.getId()).build();
// Insert into phone table
phoneVerificationService.insertDB(details);
}
@Override
public PhoneEntity getDetails () {
return new PhoneEntity();
return phoneVerificationService.getPhoneEntityByQRCodeId(data.getId());
}
}

View File

@@ -5,7 +5,7 @@ import lombok.Data;
@Data
public abstract class QRCodeModel<T>{
QRCodeEntity scannedQRCode;
QRCodeEntity data;
T details;
public abstract void setDetails();

View File

@@ -19,19 +19,19 @@ public final class SMSModel extends QRCodeModel<SMSEntity> {
private final SMSVerificationService smsVerificationService;
public SMSModel(QRCodeEntity scannedQRCodeEntity, SMSVerificationService smsVerificationService) {
this.scannedQRCode = scannedQRCodeEntity;
this.data = scannedQRCodeEntity;
this.smsVerificationService = smsVerificationService;
this.details = null;
}
@Override
public void setDetails() {
details = SMSEntity.builder().qrCodeId(scannedQRCode.getId()).build();
details = SMSEntity.builder().qrCodeId(data.getId()).build();
// Insert into sms table
smsVerificationService.insertDB(details);
}
@Override
public SMSEntity getDetails () {
return new SMSEntity();
return smsVerificationService.getSMSEntityByQRCodeId(data.getId());
}
}

View File

@@ -19,19 +19,19 @@ public final class TextModel extends QRCodeModel<TextEntity> {
private final TextVerificationService textVerificationService;
public TextModel(QRCodeEntity scannedQRCodeEntity, TextVerificationService textVerificationService) {
this.scannedQRCode = scannedQRCodeEntity;
this.data = scannedQRCodeEntity;
this.textVerificationService = textVerificationService;
this.details = null;
}
@Override
public void setDetails() {
details = TextEntity.builder().qrCodeId(scannedQRCode.getId()).text(scannedQRCode.getContents()).build();
details = TextEntity.builder().qrCodeId(data.getId()).text(data.getContents()).build();
// Insert into text table
textVerificationService.insertDB(details);
}
@Override
public TextEntity getDetails () {
return new TextEntity();
return textVerificationService.getTextEntityByQRCodeId(data.getId());
}
}

View File

@@ -22,19 +22,19 @@ public final class URLModel extends QRCodeModel<URLEntity> {
@Autowired
public URLModel(QRCodeEntity scannedQRCodeEntity, URLVerificationService urlVerificationService) {
this.scannedQRCode = scannedQRCodeEntity;
this.data = scannedQRCodeEntity;
this.urlVerificationService = urlVerificationService;
details = null;
}
@Override
public void setDetails() {
String url = scannedQRCode.getContents();
String url = data.getContents();
try {
details = urlVerificationService.breakdownURL(url);
urlVerificationService.countAndTrackRedirects(url, details);
// set qrCode Identifier
details.setQrCodeId(scannedQRCode.getId());
details.setQrCodeId(data.getId());
// Insert into URL table
urlVerificationService.insertDB(details);
@@ -45,6 +45,6 @@ public final class URLModel extends QRCodeModel<URLEntity> {
}
@Override
public URLEntity getDetails () {
return urlVerificationService.getURLEntityByQRCodeId(scannedQRCode.getId());
return urlVerificationService.getURLEntityByQRCodeId(data.getId());
}
}

View File

@@ -1,7 +1,6 @@
package com.safeqr.app.qrcode.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.safeqr.app.qrcode.entity.EmailEntity;
import com.safeqr.app.qrcode.entity.QRCodeEntity;
import com.safeqr.app.qrcode.entity.WifiEntity;
import com.safeqr.app.qrcode.service.WifiVerificationService;
@@ -19,19 +18,19 @@ public final class WifiModel extends QRCodeModel<WifiEntity> {
private final WifiVerificationService wifiVerificationService;
public WifiModel(QRCodeEntity scannedQRCodeEntity, WifiVerificationService wifiVerificationService) {
this.scannedQRCode = scannedQRCodeEntity;
this.data = scannedQRCodeEntity;
this.wifiVerificationService = wifiVerificationService;
this.details = null;
}
@Override
public void setDetails() {
details = WifiEntity.builder().qrCodeId(scannedQRCode.getId()).build();
details = WifiEntity.builder().qrCodeId(data.getId()).build();
// Insert into wifi table
wifiVerificationService.insertDB(details);
}
@Override
public WifiEntity getDetails () {
return new WifiEntity();
return wifiVerificationService.getWifiEntityByQRCodeId(data.getId());
}
}

View File

@@ -2,5 +2,9 @@ package com.safeqr.app.qrcode.repository;
import com.safeqr.app.qrcode.entity.EmailEntity;
import java.util.Optional;
import java.util.UUID;
public interface EmailRepository extends GenericRepository<EmailEntity> {
Optional<EmailEntity> findByQrCodeId(UUID qrCodeId);
}

View File

@@ -2,5 +2,9 @@ package com.safeqr.app.qrcode.repository;
import com.safeqr.app.qrcode.entity.PhoneEntity;
import java.util.Optional;
import java.util.UUID;
public interface PhoneRepository extends GenericRepository<PhoneEntity> {
Optional<PhoneEntity> findByQrCodeId(UUID qrCodeId);
}

View File

@@ -2,5 +2,9 @@ package com.safeqr.app.qrcode.repository;
import com.safeqr.app.qrcode.entity.SMSEntity;
import java.util.Optional;
import java.util.UUID;
public interface SMSRepository extends GenericRepository<SMSEntity> {
Optional<SMSEntity> findByQrCodeId(UUID qrCodeId);
}

View File

@@ -0,0 +1,13 @@
package com.safeqr.app.qrcode.repository;
import com.safeqr.app.qrcode.entity.QRCodeEntity;
import com.safeqr.app.qrcode.entity.ScanBookmarkEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
public interface ScanBookmarkRepository extends JpaRepository<ScanBookmarkEntity, Long> {
@Query("SELECT sb.qrCodeEntity FROM ScanBookmarkEntity sb WHERE sb.userId = :userId AND sb.scanStatus = 'ACTIVE'")
List<QRCodeEntity> findAllBookmarksByUserId(String userId);
}

View File

@@ -1,9 +1,15 @@
package com.safeqr.app.qrcode.repository;
import com.safeqr.app.qrcode.entity.QRCodeEntity;
import com.safeqr.app.qrcode.entity.ScanHistoryEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface ScanHistoryRepository extends JpaRepository<ScanHistoryEntity, Long> {
@Query("SELECT sh.qrCodeEntity FROM ScanHistoryEntity sh WHERE sh.userId = :userId AND sh.scanStatus = 'ACTIVE'")
List<QRCodeEntity> findAllQRCodesByUserId(String userId);
}

View File

@@ -2,5 +2,9 @@ package com.safeqr.app.qrcode.repository;
import com.safeqr.app.qrcode.entity.TextEntity;
import java.util.Optional;
import java.util.UUID;
public interface TextRepository extends GenericRepository<TextEntity> {
Optional<TextEntity> findByQrCodeId(UUID qrCodeId);
}

View File

@@ -2,5 +2,9 @@ package com.safeqr.app.qrcode.repository;
import com.safeqr.app.qrcode.entity.WifiEntity;
import java.util.Optional;
import java.util.UUID;
public interface WifiRepository extends GenericRepository<WifiEntity> {
Optional<WifiEntity> findByQrCodeId(UUID qrCodeId);
}

View File

@@ -1,5 +1,6 @@
package com.safeqr.app.qrcode.service;
import com.safeqr.app.exceptions.CustomNotFoundExceptions;
import com.safeqr.app.qrcode.entity.EmailEntity;
import com.safeqr.app.qrcode.repository.EmailRepository;
import org.slf4j.Logger;
@@ -7,6 +8,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.UUID;
@Service
public class EmailVerificationService {
private final EmailRepository emailRepository;
@@ -16,6 +19,11 @@ public class EmailVerificationService {
public EmailVerificationService(EmailRepository emailRepository) {
this.emailRepository = emailRepository;
}
public EmailEntity getEmailEntityByQRCodeId(UUID qrCodeId) {
logger.info("qrCodeId retrieving: {}", qrCodeId);
return emailRepository.findByQrCodeId(qrCodeId)
.orElseThrow(() -> new CustomNotFoundExceptions("Email not found for QR Code id: " + qrCodeId));
}
public void insertDB(EmailEntity emailEntity) {
emailRepository.save(emailEntity);
}

View File

@@ -1,5 +1,6 @@
package com.safeqr.app.qrcode.service;
import com.safeqr.app.exceptions.CustomNotFoundExceptions;
import com.safeqr.app.qrcode.entity.PhoneEntity;
import com.safeqr.app.qrcode.repository.PhoneRepository;
import org.slf4j.Logger;
@@ -7,6 +8,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.UUID;
@Service
public class PhoneVerificationService {
private final PhoneRepository phoneRepository;
@@ -16,6 +19,11 @@ public class PhoneVerificationService {
public PhoneVerificationService(PhoneRepository phoneRepository) {
this.phoneRepository = phoneRepository;
}
public PhoneEntity getPhoneEntityByQRCodeId(UUID qrCodeId) {
logger.info("qrCodeId retrieving: {}", qrCodeId);
return phoneRepository.findByQrCodeId(qrCodeId)
.orElseThrow(() -> new CustomNotFoundExceptions("Phone not found for QR Code id: " + qrCodeId));
}
public void insertDB(PhoneEntity phoneEntity) {
phoneRepository.save(phoneEntity);
}

View File

@@ -3,7 +3,7 @@ package com.safeqr.app.qrcode.service;
import static com.safeqr.app.constants.CommonConstants.*;
import com.safeqr.app.exceptions.QRCodeExceptions;
import com.safeqr.app.exceptions.CustomNotFoundExceptions;
import com.safeqr.app.qrcode.dto.request.QRCodePayload;
import com.safeqr.app.qrcode.dto.response.BaseScanResponse;
import com.safeqr.app.qrcode.entity.QRCodeEntity;
@@ -24,11 +24,7 @@ import reactor.core.publisher.Mono;
import java.security.NoSuchAlgorithmException;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.function.Function;
import java.util.stream.Collectors;
@Service
public class QRCodeTypeService {
@@ -73,7 +69,7 @@ public class QRCodeTypeService {
public BaseScanResponse getScannedQRCodeDetails(UUID qrCodeId){
// Find scanned qr code in qr code table
QRCodeEntity qrCodeEntity = qrCodeRepository.findById(qrCodeId)
.orElseThrow(() -> new QRCodeExceptions("QR Code not found with id: " + qrCodeId));
.orElseThrow(() -> new CustomNotFoundExceptions("QR Code not found with id: " + qrCodeId));
logger.info("qrCodeEntity: {}", qrCodeEntity);
QRCodeModel<?> qrCodeModel = qrCodeFactoryProvider.createQRCodeInstance(qrCodeEntity);
logger.info("Retrieved details: {}", qrCodeModel.getDetails());

View File

@@ -1,5 +1,6 @@
package com.safeqr.app.qrcode.service;
import com.safeqr.app.exceptions.CustomNotFoundExceptions;
import com.safeqr.app.qrcode.entity.SMSEntity;
import com.safeqr.app.qrcode.repository.SMSRepository;
import org.slf4j.Logger;
@@ -7,6 +8,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.UUID;
@Service
public class SMSVerificationService {
private final SMSRepository smsRepository;
@@ -16,6 +19,12 @@ public class SMSVerificationService {
public SMSVerificationService(SMSRepository smsRepository) {
this.smsRepository = smsRepository;
}
public SMSEntity getSMSEntityByQRCodeId(UUID qrCodeId) {
logger.info("qrCodeId retrieving: {}", qrCodeId);
return smsRepository.findByQrCodeId(qrCodeId)
.orElseThrow(() -> new CustomNotFoundExceptions("SMS not found for QR Code id: " + qrCodeId));
}
public void insertDB(SMSEntity smsEntity) {
smsRepository.save(smsEntity);
}

View File

@@ -1,5 +1,6 @@
package com.safeqr.app.qrcode.service;
import com.safeqr.app.exceptions.CustomNotFoundExceptions;
import com.safeqr.app.qrcode.entity.TextEntity;
import com.safeqr.app.qrcode.repository.TextRepository;
import org.slf4j.Logger;
@@ -7,6 +8,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.UUID;
@Service
public class TextVerificationService {
private final TextRepository textRepository;
@@ -15,6 +18,12 @@ public class TextVerificationService {
public TextVerificationService(TextRepository textRepository) {
this.textRepository = textRepository;
}
public TextEntity getTextEntityByQRCodeId(UUID qrCodeId) {
logger.info("qrCodeId retrieving: {}", qrCodeId);
return textRepository.findByQrCodeId(qrCodeId)
.orElseThrow(() -> new CustomNotFoundExceptions("Text not found for QR Code id: " + qrCodeId));
}
public void insertDB(TextEntity textEntity) {
textRepository.save(textEntity);
}

View File

@@ -2,7 +2,7 @@ package com.safeqr.app.qrcode.service;
import static com.safeqr.app.constants.CommonConstants.*;
import com.safeqr.app.exceptions.QRCodeExceptions;
import com.safeqr.app.exceptions.CustomNotFoundExceptions;
import com.safeqr.app.qrcode.dto.request.QRCodePayload;
import com.safeqr.app.qrcode.dto.URLVerificationResponse;
import com.safeqr.app.qrcode.entity.URLEntity;
@@ -30,7 +30,7 @@ public class URLVerificationService {
public URLEntity getURLEntityByQRCodeId(UUID qrCodeId) {
logger.info("qrCodeId retrieving: {}", qrCodeId);
return urlRepository.findByQrCodeId(qrCodeId)
.orElseThrow(() -> new QRCodeExceptions("URL not found for QR Code id: " + qrCodeId));
.orElseThrow(() -> new CustomNotFoundExceptions("URL not found for QR Code id: " + qrCodeId));
}
public void insertDB(URLEntity urlEntity) {

View File

@@ -1,5 +1,6 @@
package com.safeqr.app.qrcode.service;
import com.safeqr.app.exceptions.CustomNotFoundExceptions;
import com.safeqr.app.qrcode.entity.WifiEntity;
import com.safeqr.app.qrcode.repository.WifiRepository;
import org.slf4j.Logger;
@@ -7,6 +8,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.UUID;
@Service
public class WifiVerificationService {
private final WifiRepository wifiRepository;
@@ -16,6 +19,11 @@ public class WifiVerificationService {
public WifiVerificationService(WifiRepository wifiRepository) {
this.wifiRepository = wifiRepository;
}
public WifiEntity getWifiEntityByQRCodeId(UUID qrCodeId) {
logger.info("qrCodeId retrieving: {}", qrCodeId);
return wifiRepository.findByQrCodeId(qrCodeId)
.orElseThrow(() -> new CustomNotFoundExceptions("Wifi not found for QR Code id: " + qrCodeId));
}
public void insertDB(WifiEntity wifiEntity) {
wifiRepository.save(wifiEntity);
}