#605 Fix NonUniqueResultException

elimu-ai · Nov 22, 2017 · 47c3847 · 47c3847
1 parent 68b6bbc
commit 47c3847
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/src/main/java/ai/elimu/dao/ApplicationDao.java b/src/main/java/ai/elimu/dao/ApplicationDao.java
@@ -5,15 +5,12 @@
 
 import ai.elimu.model.enums.Locale;
 import ai.elimu.model.enums.admin.ApplicationStatus;
-import ai.elimu.model.project.Project;
 
 import org.springframework.dao.DataAccessException;
 
 public interface ApplicationDao extends GenericDao<Application> {
 
     Application readByPackageName(Locale locale, String packageName) throws DataAccessException;
-
-    Application readByPackageName(Project project, String packageName) throws DataAccessException;
 
     List<Application> readAll(Locale locale) throws DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java
@@ -9,7 +9,6 @@
 
 import ai.elimu.model.enums.Locale;
 import ai.elimu.model.enums.admin.ApplicationStatus;
-import ai.elimu.model.project.Project;
 
 public class ApplicationDaoJpa extends GenericDaoJpa<Application> implements ApplicationDao {
 
@@ -30,23 +29,6 @@ public Application readByPackageName(Locale locale, String packageName) throws D
             return null;
         }
     }
-
-    @Override
-    public Application readByPackageName(Project project, String packageName) throws DataAccessException {
-        try {
-            return (Application) em.createQuery(
-                "SELECT a " +
-                "FROM Application a " +
-                "WHERE a.packageName = :packageName " +
-                "AND a.project = :project")
-                .setParameter("project", project)
-                    .setParameter("packageName", packageName)
-                .getSingleResult();
-        } catch (NoResultException e) {
-            logger.warn("Application with packageName \"" + packageName + "\" was not found for Project " + project.getId());
-            return null;
-        }
-    }
 
     @Override
     public List<Application> readAll(Locale locale) throws DataAccessException {

diff --git a/src/main/java/ai/elimu/web/ApkController.java b/src/main/java/ai/elimu/web/ApkController.java
@@ -19,7 +19,6 @@
 import ai.elimu.model.admin.ApplicationVersion;
 import ai.elimu.model.enums.Locale;
 import ai.elimu.model.project.License;
-import ai.elimu.model.project.Project;
 import org.apache.http.util.TextUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -54,6 +53,7 @@ public void handleRequest(
             // Custom Project
             @RequestParam(required = false) String licenseEmail,
             @RequestParam(required = false) String licenseNumber,
+            @RequestParam(required = false) Long applicationId,
 
             HttpServletRequest request,
             HttpServletResponse response,
@@ -74,8 +74,8 @@ public void handleRequest(
             // Custom Project
             License license = licenseDao.read(licenseEmail, licenseNumber);
             if (license != null) {
-                Project project = license.getAppCollection().getProject();
-                application = applicationDao.readByPackageName(project, packageName);
+                // TODO: fetch Application based on License instead of additional applicationId parameter
+                application = applicationDao.read(applicationId);
             }
         }
         ApplicationVersion applicationVersion = applicationVersionDao.read(application, versionCode);