added new endpoints, getUser, getUserHistories, getBookmarks

src/main/java/com/safeqr/app/qrcode/model/EmailModel.java

@@ -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());
     }
 }

src/main/java/com/safeqr/app/qrcode/model/PhoneModel.java

@@ -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());
     }
 }

src/main/java/com/safeqr/app/qrcode/model/QRCodeModel.java

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

src/main/java/com/safeqr/app/qrcode/model/SMSModel.java

@@ -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());
     }
 }

src/main/java/com/safeqr/app/qrcode/model/TextModel.java

@@ -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());
     }
 }

src/main/java/com/safeqr/app/qrcode/model/URLModel.java

@@ -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());
     }
 }

src/main/java/com/safeqr/app/qrcode/model/WifiModel.java

@@ -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());
     }
 }