et_fake_ccd 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3650d5f2910829691719778ec18ca0da089581e9126468cf404704513c9b34f2
-  data.tar.gz: 4792f9cd762c5ba1b8b5f79e5a655a6a6602908571a79abe20ce5e3609556c4b
+  metadata.gz: b396e67772f1ba9407c733f98fb6bcbd5c374671fe3f025ae8e4a2440f81136b
+  data.tar.gz: 1789651700ab482fac61cb54fea3ca9a82c45082596b38a3deead00fc60713b3
 SHA512:
-  metadata.gz: 7902fff2cc94e78d8fa52eadf4cfcbdfb9567c8bf4aea3a418f32c31d24c6af2305299d65acc4d5ad404895464048befea0efbcf8dcd8e0b8e5845b8d52af7c1
-  data.tar.gz: 37ac8465908e78804bcf5f4df3210a6882557da67df8e76b58070f12dfd60581b5263871503796c5f254bd7057bde64738e695a794b917c325317de8c1a7b242
+  metadata.gz: 16e5ad736c2a0d68f2c2de22230f0a8c3e5460fc03a4a68adccc8dc70efdab211b11c1db5cb8391ef7861f601d28ca5dc9c055bda1023283459cb27edbe9a5df
+  data.tar.gz: 7ee881410b2c21ac740b49330524a03ccc74b0e39403c03b86de2a10d6974d42321efc5f50f10440ad6707b3284b7c1b484e2ecdeb1684e55be071217e73c6fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_fake_ccd (0.1.17)
+    et_fake_ccd (0.1.18)
       activemodel (~> 5.2, >= 5.2.3)
       puma (~> 3.12)
       roda (~> 3.21)

data/lib/et_fake_ccd/command/create_case_command.rb

@@ -50,7 +50,7 @@ module EtFakeCcd
           errors.add :data, "Case data validation failed", field_error: { id: 'claimantType.claimant_contact_preference', message: "#{pref} is not a valid value" } unless valid_values.include?(pref)
         end
         data.dig('data', 'claimantType', 'claimant_addressUK', 'PostCode').tap do |postcode|
-          errors.add :data, "Case data validation failed", field_error: { id: 'claimantType.claimant_addressUK.PostCode', message: "#{postcode} exceed maximum length 14" } if postcode.length > 10
+          errors.add :data, "Case data validation failed", field_error: { id: 'claimantType.claimant_addressUK.PostCode', message: "#{postcode} exceed maximum length 10" } if postcode.length > 10
         end
       end
     end

data/lib/et_fake_ccd/command/upload_document_command.rb

@@ -4,6 +4,8 @@ module EtFakeCcd
     class UploadDocumentCommand
       include ActiveModel::Model
       include ActiveModel::Attributes
+      VALID_FILE_EXTENSIONS = ['.pdf', '.csv', '.rtf'].freeze
+      VALID_FILE_CONTENT_TYPES = ['application/pdf', 'text/csv', 'application/rtf'].freeze
 
       attribute :data
 
@@ -16,12 +18,22 @@ module EtFakeCcd
       private
 
       def validate_data
+        validate_file
+      end
+
+      def validate_file
+        return if validate_file_extension && validate_file_content_type
+
+        errors.add :data, "Your upload contains a disallowed file type", field_error: { "id": "files", "message": "Your upload contains a disallowed file type" }
+      end
 
+      def validate_file_content_type
+        VALID_FILE_CONTENT_TYPES.include?(data.dig('files', 'type'))
+      end
+
+      def validate_file_extension
+        VALID_FILE_EXTENSIONS.include?(File.extname(data.dig('files', 'filename')))
       end
     end
   end
 end
-
-#{"exception":"uk.gov.hmcts.ccd.endpoint.exceptions.CaseValidationException","timestamp":"2019-07-01T15:33:41.417","status":422,"error":"Unprocessable Entity","message":"Case data validation failed","path":"/caseworkers/22/jurisdictions/EMPLOYMENT/case-types/EmpTrib_MVP_1.0_Manc/cases","details":{"field_errors":[{"id":"claimantType.claimant_phone_number","message":"The data entered is not valid for this type of field, please delete and re-enter using only valid data"}]},"callbackErrors":null,"callbackWarnings":null}
-#{"exception":"uk.gov.hmcts.ccd.endpoint.exceptions.CaseValidationException","timestamp":"2019-07-01T15:51:15.291","status":422,"error":"Unprocessable Entity","message":"Case data validation failed","path":"/caseworkers/22/jurisdictions/EMPLOYMENT/case-types/EmpTrib_MVP_1.0_Manc/cases","details":{"field_errors":[{"id":"claimantType.claimant_mobile_number","message":"The data entered is not valid for this type of field, please delete and re-enter using only valid data"},{"id":"claimantType.claimant_phone_number","message":"The data entered is not valid for this type of field, please delete and re-enter using only valid data"}]},"callbackErrors":null,"callbackWarnings":null}
-#{"exception":"uk.gov.hmcts.ccd.endpoint.exceptions.CaseValidationException","timestamp":"2019-07-01T16:02:28.045","status":422,"error":"Unprocessable Entity","message":"Case data validation failed","path":"/caseworkers/22/jurisdictions/EMPLOYMENT/case-types/EmpTrib_MVP_1.0_Manc/cases","details":{"field_errors":[{"id":"claimant_TypeOfClaimant","message":"Wrong is not a valid value"},{"id":"claimantType.claimant_mobile_number","message":"The data entered is not valid for this type of field, please delete and re-enter using only valid data"},{"id":"claimantType.claimant_phone_number","message":"The data entered is not valid for this type of field, please delete and re-enter using only valid data"}]},"callbackErrors":null,"callbackWarnings":null}

data/lib/et_fake_ccd/service/document_store_app.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'et_fake_ccd/commands'
 require 'et_fake_ccd/auth_service'
 require 'et_fake_ccd/document_store_service'
+require 'active_support/core_ext/hash'
 module EtFakeCcd
   module Service
     class DocumentStoreApp < Roda
@@ -16,7 +17,7 @@ module EtFakeCcd
               r.halt 403, forbidden_error_for(r)
               break
             end
-            command = ::EtFakeCcd::Command::UploadDocumentCommand.from_json(r.params)
+            command = ::EtFakeCcd::Command::UploadDocumentCommand.from_json(r.params.deep_stringify_keys)
             unless command.valid?
               r.halt 422, render_error_for(command, r)
               break
@@ -110,6 +111,23 @@ module EtFakeCcd
         JSON.generate(j)
       end
 
+      def render_error_for(command, request)
+        j = {
+          "exception": "uk.gov.hmcts.ccd.endpoint.exceptions.CaseValidationException",
+          "timestamp": "2019-07-01T16:02:28.045",
+          "status": 422,
+          "error": "Unprocessable Entity",
+          "message": "Document validation failed",
+          "path": request.path,
+          "details": {
+            "field_errors": command.errors.details[:data].map {|e| e[:field_error]}
+          },
+          "callbackErrors": nil,
+          "callbackWarnings": nil
+        }
+
+        JSON.generate(j)
+      end
 
       def forbidden_error_for(r)
         j = {"timestamp":"2019-07-01T07:46:35.405+0000","status":403,"error":"Forbidden","message":"Access Denied","path": r.path}

data/lib/et_fake_ccd/version.rb

@@ -1,3 +1,3 @@
 module EtFakeCcd
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_fake_ccd
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda