[CCAP-659] Adding a couple User File methods to look up by mimetype and sorting by original name (#656)

Author: cram-cfa

src/main/java/formflow/library/data/UserFileRepository.java

@@ -12,22 +12,47 @@
 @Repository
 public interface UserFileRepository extends JpaRepository<UserFile, UUID> {
 
-  /**
-   * Finds all the {@link UserFile}s associated with a {@link Submission}}
-   *
-   * @param submission the {@link Submission} for which the associated {@link UserFile}s are sought
-   * @return {@link List} of associated {@link UserFile} objects
-   */
-  List<UserFile> findAllBySubmission(Submission submission);
-
-  /**
-   * Gets a count of all the {@link UserFile}s associated with a {@link Submission}} where the
-   * file has never been converted
-   *
-   * @param submission the {@link Submission} for which the count of associated {@link UserFile}s are sought
-   * @return count of {@link UserFile}s
-   */
-  long countBySubmissionAndConversionSourceFileIdIsNull(Submission submission);
-
-  List<UserFile> findAllBySubmissionAndConversionSourceFileId(Submission submission, UUID conversionSourceFileId);
+    /**
+     * Finds all the {@link UserFile}s associated with a {@link Submission}}
+     *
+     * @param submission the {@link Submission} for which the associated {@link UserFile}s are sought
+     * @return {@link List} of associated {@link UserFile} objects
+     */
+    List<UserFile> findAllBySubmission(Submission submission);
+
+    /**
+     * Gets a count of all the {@link UserFile}s associated with a {@link Submission}} where the file has never been converted
+     *
+     * @param submission the {@link Submission} for which the count of associated {@link UserFile}s are sought
+     * @return count of {@link UserFile}s
+     */
+    long countBySubmissionAndConversionSourceFileIdIsNull(Submission submission);
+
+    /**
+     * Finds all the {@link UserFile}s associated with a {@link Submission}} where the conversionSourceFileId matches
+     *
+     * @param submission the {@link Submission} for which the associated {@link UserFile}s are sought
+     * @param conversionSourceFileId
+     * @return
+     */
+    List<UserFile> findAllBySubmissionAndConversionSourceFileId(Submission submission, UUID conversionSourceFileId);
+
+    /**
+     * Finds all the {@link UserFile}s associated with a {@link Submission}} ordered by the OriginalName field
+     *
+     * @param submission the {@link Submission} for which the associated {@link UserFile}s are sought
+     * @return
+     */
+    List<UserFile> findAllBySubmissionOrderByOriginalName(Submission submission);
+
+    /**
+     * Finds all the {@link UserFile}s associated with a {@link Submission}} where the mimeType matches and ordered by the
+     * OriginalName field
+     *
+     * @param submission the {@link Submission} for which the associated {@link UserFile}s are sought
+     * @param mimeType
+     * @return
+     */
+    List<UserFile> findAllBySubmissionAndMimeTypeOrderByOriginalName(Submission submission, String mimeType);
+
 }

src/main/java/formflow/library/data/UserFileRepositoryService.java

@@ -80,7 +80,37 @@ public long countOfUploadedFilesBySubmission(Submission submission) {
         return repository.countBySubmissionAndConversionSourceFileIdIsNull(submission);
     }
 
-    public List<UserFile> findAll(Submission submission, UUID ConversionSourceFileId) {
-        return repository.findAllBySubmissionAndConversionSourceFileId(submission, ConversionSourceFileId);
+    /**
+     * Finds all the {@link UserFile}s associated with a {@link Submission}} where the conversionSourceFileId matches
+     *
+     * @param submission the {@link Submission} for which the associated {@link UserFile}s are sought
+     * @param conversionSourceFileId
+     * @return {@link List} of associated {@link UserFile} objects
+     */
+    public List<UserFile> findAll(Submission submission, UUID conversionSourceFileId) {
+        return repository.findAllBySubmissionAndConversionSourceFileId(submission, conversionSourceFileId);
     }
+
+    /**
+     * Finds all the {@link UserFile}s associated with a {@link Submission}} ordered by the OriginalName field
+     *
+     * @param submission the {@link Submission} for which the associated {@link UserFile}s are sought
+     * @return {@link List} of associated {@link UserFile} objects
+     */
+    public List<UserFile> findAllOrderedByOriginalName(Submission submission) {
+        return repository.findAllBySubmissionOrderByOriginalName(submission);
+    }
+
+    /**
+     * Finds all the {@link UserFile}s associated with a {@link Submission}} ordered by the OriginalName field
+     *
+     * @param submission the {@link Submission} for which the associated {@link UserFile}s are sought
+     * @param mimeType 
+     * @return {@link List} of associated {@link UserFile} objects
+     */
+    public List<UserFile> findAllOrderByOriginalName(Submission submission, String mimeType) {
+        return repository.findAllBySubmissionAndMimeTypeOrderByOriginalName(submission, mimeType);
+    }
+
+
 }