implemented fetch qr code scanned details
This commit is contained in:
@@ -3,7 +3,7 @@ package com.safeqr.app.qrcode.model;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.EmailEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
|
||||
import com.safeqr.app.qrcode.service.EmailVerificationService;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -12,14 +12,12 @@ import org.slf4j.LoggerFactory;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class EmailModel extends QRCodeModel {
|
||||
public final class EmailModel extends QRCodeModel<EmailEntity> {
|
||||
private static final Logger logger = LoggerFactory.getLogger(EmailModel.class);
|
||||
|
||||
@JsonIgnore
|
||||
private final EmailVerificationService emailVerificationService;
|
||||
|
||||
EmailEntity details;
|
||||
|
||||
public EmailModel(QRCodeEntity scannedQRCodeEntity, EmailVerificationService emailVerificationService) {
|
||||
this.scannedQRCode = scannedQRCodeEntity;
|
||||
this.emailVerificationService = emailVerificationService;
|
||||
@@ -32,4 +30,9 @@ public class EmailModel extends QRCodeModel {
|
||||
// Insert into email table
|
||||
emailVerificationService.insertDB(details);
|
||||
}
|
||||
|
||||
@Override
|
||||
public EmailEntity getDetails () {
|
||||
return new EmailEntity();
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
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.PhoneEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.service.PhoneVerificationService;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -12,14 +12,12 @@ import org.slf4j.LoggerFactory;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class PhoneModel extends QRCodeModel {
|
||||
public final class PhoneModel extends QRCodeModel<PhoneEntity> {
|
||||
private static final Logger logger = LoggerFactory.getLogger(PhoneModel.class);
|
||||
|
||||
@JsonIgnore
|
||||
private final PhoneVerificationService phoneVerificationService;
|
||||
|
||||
PhoneEntity details;
|
||||
|
||||
public PhoneModel(QRCodeEntity scannedQRCodeEntity, PhoneVerificationService phoneVerificationService) {
|
||||
this.scannedQRCode = scannedQRCodeEntity;
|
||||
this.phoneVerificationService = phoneVerificationService;
|
||||
@@ -32,4 +30,8 @@ public class PhoneModel extends QRCodeModel {
|
||||
// Insert into phone table
|
||||
phoneVerificationService.insertDB(details);
|
||||
}
|
||||
@Override
|
||||
public PhoneEntity getDetails () {
|
||||
return new PhoneEntity();
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.safeqr.app.qrcode.model;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public abstract class QRCodeModel {
|
||||
public abstract class QRCodeModel<T>{
|
||||
QRCodeEntity scannedQRCode;
|
||||
T details;
|
||||
|
||||
public abstract void setDetails();
|
||||
public abstract T getDetails();
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
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.SMSEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.service.SMSVerificationService;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -12,14 +12,12 @@ import org.slf4j.LoggerFactory;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class SMSModel extends QRCodeModel {
|
||||
public final class SMSModel extends QRCodeModel<SMSEntity> {
|
||||
private static final Logger logger = LoggerFactory.getLogger(SMSModel.class);
|
||||
|
||||
@JsonIgnore
|
||||
private final SMSVerificationService smsVerificationService;
|
||||
|
||||
SMSEntity details;
|
||||
|
||||
public SMSModel(QRCodeEntity scannedQRCodeEntity, SMSVerificationService smsVerificationService) {
|
||||
this.scannedQRCode = scannedQRCodeEntity;
|
||||
this.smsVerificationService = smsVerificationService;
|
||||
@@ -32,4 +30,8 @@ public class SMSModel extends QRCodeModel {
|
||||
// Insert into sms table
|
||||
smsVerificationService.insertDB(details);
|
||||
}
|
||||
@Override
|
||||
public SMSEntity getDetails () {
|
||||
return new SMSEntity();
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
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.TextEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.service.TextVerificationService;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -12,14 +12,12 @@ import org.slf4j.LoggerFactory;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class TextModel extends QRCodeModel {
|
||||
public final class TextModel extends QRCodeModel<TextEntity> {
|
||||
private static final Logger logger = LoggerFactory.getLogger(TextModel.class);
|
||||
|
||||
@JsonIgnore
|
||||
private final TextVerificationService textVerificationService;
|
||||
|
||||
TextEntity details;
|
||||
|
||||
public TextModel(QRCodeEntity scannedQRCodeEntity, TextVerificationService textVerificationService) {
|
||||
this.scannedQRCode = scannedQRCodeEntity;
|
||||
this.textVerificationService = textVerificationService;
|
||||
@@ -32,4 +30,8 @@ public class TextModel extends QRCodeModel {
|
||||
// Insert into text table
|
||||
textVerificationService.insertDB(details);
|
||||
}
|
||||
@Override
|
||||
public TextEntity getDetails () {
|
||||
return new TextEntity();
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
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.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.entity.URLEntity;
|
||||
import com.safeqr.app.qrcode.service.URLVerificationService;
|
||||
import lombok.*;
|
||||
@@ -15,17 +15,16 @@ import java.net.URISyntaxException;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class URLModel extends QRCodeModel {
|
||||
public final class URLModel extends QRCodeModel<URLEntity> {
|
||||
private static final Logger logger = LoggerFactory.getLogger(URLModel.class);
|
||||
@JsonIgnore
|
||||
private final URLVerificationService urlVerificationService;
|
||||
|
||||
URLEntity details;
|
||||
@Autowired
|
||||
public URLModel(QRCodeEntity scannedQRCodeEntity, URLVerificationService urlVerificationService) {
|
||||
this.scannedQRCode = scannedQRCodeEntity;
|
||||
this.urlVerificationService = urlVerificationService;
|
||||
this.details = null;
|
||||
details = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -44,4 +43,8 @@ public class URLModel extends QRCodeModel {
|
||||
logger.error("Error: ", e);
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public URLEntity getDetails () {
|
||||
return urlVerificationService.getURLEntityByQRCodeId(scannedQRCode.getId());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
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.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.service.WifiVerificationService;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -12,14 +12,12 @@ import org.slf4j.LoggerFactory;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class WifiModel extends QRCodeModel {
|
||||
public final class WifiModel extends QRCodeModel<WifiEntity> {
|
||||
private static final Logger logger = LoggerFactory.getLogger(WifiModel.class);
|
||||
|
||||
@JsonIgnore
|
||||
private final WifiVerificationService wifiVerificationService;
|
||||
|
||||
WifiEntity details;
|
||||
|
||||
public WifiModel(QRCodeEntity scannedQRCodeEntity, WifiVerificationService wifiVerificationService) {
|
||||
this.scannedQRCode = scannedQRCodeEntity;
|
||||
this.wifiVerificationService = wifiVerificationService;
|
||||
@@ -32,4 +30,8 @@ public class WifiModel extends QRCodeModel {
|
||||
// Insert into wifi table
|
||||
wifiVerificationService.insertDB(details);
|
||||
}
|
||||
@Override
|
||||
public WifiEntity getDetails () {
|
||||
return new WifiEntity();
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.safeqr.app.qrcode.model.factory;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.model.EmailModel;
|
||||
import com.safeqr.app.qrcode.service.EmailVerificationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.safeqr.app.qrcode.model.factory;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.model.PhoneModel;
|
||||
import com.safeqr.app.qrcode.service.PhoneVerificationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
package com.safeqr.app.qrcode.model.factory;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.model.QRCodeModel;
|
||||
|
||||
@FunctionalInterface
|
||||
public interface QRCodeFactory<T extends QRCodeModel> {
|
||||
public interface QRCodeFactory<T extends QRCodeModel<?>> {
|
||||
T create(QRCodeEntity scannedQRCodeEntity);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.safeqr.app.qrcode.model.factory;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.model.QRCodeModel;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.safeqr.app.qrcode.model.factory;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.model.SMSModel;
|
||||
import com.safeqr.app.qrcode.service.SMSVerificationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.safeqr.app.qrcode.model.factory;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.model.TextModel;
|
||||
import com.safeqr.app.qrcode.service.TextVerificationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.safeqr.app.qrcode.model.factory;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.model.URLModel;
|
||||
import com.safeqr.app.qrcode.service.URLVerificationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.safeqr.app.qrcode.model.factory;
|
||||
|
||||
import com.safeqr.app.qrcode.entity.QRCodeEntity;
|
||||
import com.safeqr.app.qrcode.entity.QRCodeTypeEntity;
|
||||
import com.safeqr.app.qrcode.model.WifiModel;
|
||||
import com.safeqr.app.qrcode.service.WifiVerificationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
Reference in New Issue
Block a user