Api 33481 poa v2 ind signatures

modules/claims_api/app/controllers/claims_api/v2/veterans/power_of_attorney/base_controller.rb

@@ -49,6 +49,8 @@ def shared_form_validation(form_number)
           @claims_api_forms_validation_errors = validate_form_2122_and_2122a_submission_values(user_profile)
           # JSON validations for POA submission, will combine with previously captured errors and raise
           validate_json_schema(form_number.upcase)
+          @rep_id = validate_registration_number!(form_number)
+
           add_claimant_data_to_form if user_profile
           # if we get here there were only validations file errors
           if @claims_api_forms_validation_errors
@@ -57,6 +59,22 @@ def shared_form_validation(form_number)
           end
         end
 
+        def validate_registration_number!(form_number)
+          base = form_number == '2122' ? 'serviceOrganization' : 'representative'
+          rn = form_attributes.dig(base, 'registrationNumber')
+          poa_code = form_attributes.dig(base, 'poaCode')
+          rep = ::Veteran::Service::Representative.where('? = ANY(poa_codes) AND representative_id = ?',
+                                                         poa_code,
+                                                         rn).order(created_at: :desc).first
+          if rep.nil?
+            raise ::Common::Exceptions::ResourceNotFound.new(
+              detail: "Could not find an Accredited Representative with registration number: #{rn} " \
+                      "and poa code: #{poa_code}"
+            )
+          end
+          rep.id
+        end
+
         def submit_power_of_attorney(poa_code, form_number)
           attributes = {
             status: ClaimsApi::PowerOfAttorney::PENDING,
@@ -70,7 +88,7 @@ def submit_power_of_attorney(poa_code, form_number)
           power_of_attorney = ClaimsApi::PowerOfAttorney.create!(attributes)
 
           unless Settings.claims_api&.poa_v2&.disable_jobs
-            ClaimsApi::V2::PoaFormBuilderJob.perform_async(power_of_attorney.id, form_number)
+            ClaimsApi::V2::PoaFormBuilderJob.perform_async(power_of_attorney.id, form_number, @rep_id)
           end
 
           render json: ClaimsApi::V2::Blueprints::PowerOfAttorneyBlueprint.render(

modules/claims_api/app/sidekiq/claims_api/v2/poa_form_builder_job.rb

@@ -15,10 +15,11 @@ class PoaFormBuilderJob < ClaimsApi::ServiceBase
       # it queues a job to update the POA code in BGS, as well.
       #
       # @param power_of_attorney_id [String] Unique identifier of the submitted POA
-      def perform(power_of_attorney_id, form_number)
+      def perform(power_of_attorney_id, form_number, rep_id)
         power_of_attorney = ClaimsApi::PowerOfAttorney.find(power_of_attorney_id)
+        rep = ::Veteran::Service::Representative.where(representative_id: rep_id).order(created_at: :desc).first
 
-        output_path = pdf_constructor(form_number).construct(data(power_of_attorney, form_number),
+        output_path = pdf_constructor(form_number).construct(data(power_of_attorney, form_number, rep),
                                                              id: power_of_attorney.id)
         upload_to_vbms(power_of_attorney, output_path)
         ClaimsApi::PoaUpdater.perform_async(power_of_attorney.id)
@@ -43,7 +44,7 @@ def pdf_constructor(form_number)
       # @param form_number [String] Either 2122 or 2122A
       #
       # @return [Hash] All data to be inserted into pdf
-      def data(power_of_attorney, form_number)
+      def data(power_of_attorney, form_number, rep)
         res = power_of_attorney
               .form_data.deep_merge({
                                       'veteran' => {
@@ -57,16 +58,18 @@ def data(power_of_attorney, form_number)
         signatures = if form_number == '2122A'
                        individual_signatures(power_of_attorney)
                      else
-                       organization_signatures(power_of_attorney)
+                       organization_signatures(power_of_attorney, rep)
                      end
 
+        res.deep_merge!({ 'serviceOrganization' => {
+                          'firstName' => rep.first_name,
+                          'lastName' => rep.last_name
+                        } })
         res.merge!({ 'text_signatures' => signatures })
         res
       end
 
-      def organization_signatures(power_of_attorney)
-        rep_first_name = power_of_attorney.form_data['serviceOrganization']['firstName']
-        rep_last_name = power_of_attorney.form_data['serviceOrganization']['lastName']
+      def organization_signatures(power_of_attorney, rep)
         first_name, last_name = veteran_or_claimant_signature(power_of_attorney)
         {
           'page2' => [
@@ -77,7 +80,7 @@ def organization_signatures(power_of_attorney)
               'y' => 240
             },
             {
-              'signature' => "#{rep_first_name} #{rep_last_name} - signed via api.va.gov",
+              'signature' => "#{rep.first_name} #{rep.last_name} - signed via api.va.gov",
               'x' => 35,
               'y' => 200
             }
@@ -89,8 +92,19 @@ def individual_signatures(power_of_attorney)
         first_name = power_of_attorney.form_data['representative']['firstName']
         last_name = power_of_attorney.form_data['representative']['lastName']
         {
-          'page1' => individual_page1_signatures(power_of_attorney, first_name, last_name),
-          'page2' => individual_page2_signatures(power_of_attorney, first_name, last_name)
+          'page2' => [
+            {
+              'signature' => "#{power_of_attorney.auth_headers['va_eauth_firstName']} " \
+                             "#{power_of_attorney.auth_headers['va_eauth_lastName']} - signed via api.va.gov",
+              'x' => 35,
+              'y' => 306
+            },
+            {
+              'signature' => "#{first_name} #{last_name} - signed via api.va.gov",
+              'x' => 35,
+              'y' => 200
+            }
+          ]
         }
       end
 

modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json

@@ -8751,6 +8751,14 @@
                         "pointer": "data/attributes/representative"
                       }
                     },
+                    {
+                      "title": "Unprocessable entity",
+                      "detail": "The property /representative did not contain the required key registrationNumber",
+                      "status": "422",
+                      "source": {
+                        "pointer": "data/attributes/representative"
+                      }
+                    },
                     {
                       "title": "Unprocessable entity",
                       "detail": "The property / did not contain the required key veteran",
@@ -8815,7 +8823,7 @@
                     {
                       "title": "Resource not found",
                       "status": "404",
-                      "detail": "Could not find an Accredited Representative with code: 083",
+                      "detail": "Could not find an Accredited Representative with registration number: 67890 and poa code: 083",
                       "source": {
                         "pointer": "/modules/claims_api/app/controllers/claims_api/v2/veterans/power_of_attorney/individual_controller.rb:35:in `validate_individual_poa_code!'"
                       }
@@ -9123,6 +9131,7 @@
                             "additionalProperties": false,
                             "required": [
                               "poaCode",
+                              "registrationNumber",
                               "firstName",
                               "lastName",
                               "type"
@@ -9133,6 +9142,11 @@
                                 "type": "string",
                                 "example": "A1Q"
                               },
+                              "registrationNumber": {
+                                "description": "Registration Number of representative.",
+                                "type": "string",
+                                "example": "12345"
+                              },
                               "firstName": {
                                 "description": "First Name of the representative.",
                                 "type": "string",
@@ -9254,6 +9268,7 @@
                       },
                       "representative": {
                         "poaCode": "083",
+                        "registrationNumber": "67890",
                         "firstName": "my",
                         "lastName": "name",
                         "type": "ATTORNEY",
@@ -9451,13 +9466,29 @@
                         "pointer": "data/attributes/serviceOrganization"
                       }
                     },
+                    {
+                      "title": "Unprocessable entity",
+                      "detail": "The property /serviceOrganization did not contain the required key registrationNumber",
+                      "status": "422",
+                      "source": {
+                        "pointer": "data/attributes/serviceOrganization"
+                      }
+                    },
                     {
                       "title": "Unprocessable entity",
                       "detail": "The property / did not contain the required key veteran",
                       "status": "422",
                       "source": {
                         "pointer": "data/attributes/"
                       }
+                    },
+                    {
+                      "title": "Unprocessable entity",
+                      "detail": "The property /serviceOrganization/withoutPoaCode is not defined on the schema. Additional properties are not allowed",
+                      "status": "422",
+                      "source": {
+                        "pointer": "data/attributes/serviceOrganization/withoutPoaCode"
+                      }
                     }
                   ]
                 },
@@ -9515,7 +9546,7 @@
                     {
                       "title": "Resource not found",
                       "status": "404",
-                      "detail": "Could not find an Organization with code: 083",
+                      "detail": "Could not find an Accredited Representative with registration number: 67890 and poa code: 083",
                       "source": {
                         "pointer": "/modules/claims_api/app/controllers/claims_api/v2/veterans/power_of_attorney/organization_controller.rb:35:in `validate_org_poa_code!'"
                       }
@@ -9806,7 +9837,8 @@
                             "type": "object",
                             "additionalProperties": false,
                             "required": [
-                              "poaCode"
+                              "poaCode",
+                              "registrationNumber"
                             ],
                             "properties": {
                               "poaCode": {
@@ -9819,15 +9851,10 @@
                                 "type": "string",
                                 "example": "I help vets LLC."
                               },
-                              "firstName": {
-                                "description": "First Name of the representative.",
+                              "registrationNumber": {
+                                "description": "Registration Number of representative.",
                                 "type": "string",
-                                "example": "John"
-                              },
-                              "lastName": {
-                                "description": "Last Name of the representative",
-                                "type": "string",
-                                "example": "Doe"
+                                "example": "12345"
                               },
                               "jobTitle": {
                                 "description": "Job title of the representative.",
@@ -9888,7 +9915,8 @@
                         }
                       },
                       "serviceOrganization": {
-                        "poaCode": "083"
+                        "poaCode": "083",
+                        "registrationNumber": "67890"
                       }
                     }
                   }
@@ -10065,6 +10093,14 @@
                         "pointer": "data/attributes/representative"
                       }
                     },
+                    {
+                      "title": "Unprocessable entity",
+                      "detail": "The property /representative did not contain the required key registrationNumber",
+                      "status": "422",
+                      "source": {
+                        "pointer": "data/attributes/representative"
+                      }
+                    },
                     {
                       "title": "Unprocessable entity",
                       "detail": "The property / did not contain the required key veteran",
@@ -10129,7 +10165,7 @@
                     {
                       "title": "Resource not found",
                       "status": "404",
-                      "detail": "Could not find an Accredited Representative with code: 083",
+                      "detail": "Could not find an Accredited Representative with registration number: 67890 and poa code: 083",
                       "source": {
                         "pointer": "/modules/claims_api/app/controllers/claims_api/v2/veterans/power_of_attorney/individual_controller.rb:35:in `validate_individual_poa_code!'"
                       }
@@ -10437,6 +10473,7 @@
                             "additionalProperties": false,
                             "required": [
                               "poaCode",
+                              "registrationNumber",
                               "firstName",
                               "lastName",
                               "type"
@@ -10447,6 +10484,11 @@
                                 "type": "string",
                                 "example": "A1Q"
                               },
+                              "registrationNumber": {
+                                "description": "Registration Number of representative.",
+                                "type": "string",
+                                "example": "12345"
+                              },
                               "firstName": {
                                 "description": "First Name of the representative.",
                                 "type": "string",
@@ -10568,6 +10610,7 @@
                       },
                       "representative": {
                         "poaCode": "083",
+                        "registrationNumber": "67890",
                         "firstName": "my",
                         "lastName": "name",
                         "type": "ATTORNEY",
@@ -10756,13 +10799,29 @@
                         "pointer": "data/attributes/serviceOrganization"
                       }
                     },
+                    {
+                      "title": "Unprocessable entity",
+                      "detail": "The property /serviceOrganization did not contain the required key registrationNumber",
+                      "status": "422",
+                      "source": {
+                        "pointer": "data/attributes/serviceOrganization"
+                      }
+                    },
                     {
                       "title": "Unprocessable entity",
                       "detail": "The property / did not contain the required key veteran",
                       "status": "422",
                       "source": {
                         "pointer": "data/attributes/"
                       }
+                    },
+                    {
+                      "title": "Unprocessable entity",
+                      "detail": "The property /serviceOrganization/withoutPoaCode is not defined on the schema. Additional properties are not allowed",
+                      "status": "422",
+                      "source": {
+                        "pointer": "data/attributes/serviceOrganization/withoutPoaCode"
+                      }
                     }
                   ]
                 },
@@ -10820,7 +10879,7 @@
                     {
                       "title": "Resource not found",
                       "status": "404",
-                      "detail": "Could not find an Organization with code: 083",
+                      "detail": "Could not find an Accredited Representative with registration number: 67890 and poa code: 083",
                       "source": {
                         "pointer": "/modules/claims_api/app/controllers/claims_api/v2/veterans/power_of_attorney/organization_controller.rb:35:in `validate_org_poa_code!'"
                       }
@@ -11111,7 +11170,8 @@
                             "type": "object",
                             "additionalProperties": false,
                             "required": [
-                              "poaCode"
+                              "poaCode",
+                              "registrationNumber"
                             ],
                             "properties": {
                               "poaCode": {
@@ -11124,15 +11184,10 @@
                                 "type": "string",
                                 "example": "I help vets LLC."
                               },
-                              "firstName": {
-                                "description": "First Name of the representative.",
+                              "registrationNumber": {
+                                "description": "Registration Number of representative.",
                                 "type": "string",
-                                "example": "John"
-                              },
-                              "lastName": {
-                                "description": "Last Name of the representative",
-                                "type": "string",
-                                "example": "Doe"
+                                "example": "12345"
                               },
                               "jobTitle": {
                                 "description": "Job title of the representative.",
@@ -11193,7 +11248,8 @@
                         }
                       },
                       "serviceOrganization": {
-                        "poaCode": "083"
+                        "poaCode": "083",
+                        "registrationNumber": "67890"
                       }
                     }
                   }