Skip to content

Commit

Permalink
Update AcqPlan class to handle acq-plan (#358)
Browse files Browse the repository at this point in the history
* Update AcqPlan class to handle acq-plan

* Rename class

* add reference to Plan class and reference correct class name

* Change to validate status and planType using mdCodes. fix array iteration for planOperations and satisfiedRequirements.

* remove puts

---------

Co-authored-by: Johnathan Aspinwall <jwaspin@gmail.com>
  • Loading branch information
J-Oliveros and jwaspin authored May 6, 2024
1 parent 4fa43cd commit 2c5f3c8
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 24 deletions.
15 changes: 0 additions & 15 deletions lib/adiwg/mdtranslator/readers/mdJson/modules/module_acq-plan.rb

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
require_relative 'module_acq-operation'
require_relative 'module_pass'
require_relative 'module_event'
require_relative 'module_plan'
require_relative 'module_acq-environment'

module ADIWG
Expand Down Expand Up @@ -35,15 +36,15 @@ def self.unpack(hAcquisition, responseObj, inContext = nil)
end
end

# if hAcquisition.has_key?('plan')
# aItems = hAcquisition['plan']
# aItems.each do |item|
# hReturn = AcqPlan.unpack(item, responseObj, outContext)
# unless hReturn.nil?
# intAcquisition[:plans] << hReturn
# end
# end
# end
if hAcquisition.has_key?('plan')
aItems = hAcquisition['plan']
aItems.each do |item|
hReturn = Plan.unpack(item, responseObj, outContext)
unless hReturn.nil?
intAcquisition[:plans] << hReturn
end
end
end

if hAcquisition.has_key?('requirement')
aItems = hAcquisition['requirement']
Expand Down
80 changes: 80 additions & 0 deletions lib/adiwg/mdtranslator/readers/mdJson/modules/module_plan.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
require 'adiwg/mdtranslator/internal/module_codelistFun'
require_relative 'module_citation'
require_relative 'module_operation'
require_relative 'module_requirement'

module ADIWG
module Mdtranslator
module Readers
module MdJson

module Plan
def self.unpack(hPlan, responseObj, inContext = nil)

@MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson

# return nil object if input is empty
if hPlan.empty?
@MessagePath.issueWarning(40, responseObj, inContext)
return nil
end

intMetadataClass = InternalMetadata.new
intPlan = intMetadataClass.newPlan

outContext = 'plan'
outContext = inContext + ' > ' + outContext unless inContext.nil?

if hPlan.has_key?('planId')
intPlan[:planId] = hPlan['planId']

else
@MessagePath.issueError(42, responseObj, outContext)
end

if hPlan.has_key?('planType') && CodelistFun.validateItem('iso_geometryTypeCode', hPlan['planType'])
intPlan[:planType] = hPlan['planType']
end

if hPlan.has_key?('status') && CodelistFun.validateItem('iso_progress', hPlan['status'])
intPlan[:status] = hPlan['status']
else
@MessagePath.issueError(43, responseObj, outContext)
end

if hPlan.has_key?('citation')
hReturn = Citation.unpack(hPlan['citation'], responseObj, outContext)
unless hReturn.nil?
intPlan[:citation] = hReturn
end
else
@MessagePath.issueError(44, responseObj, outContext)
end

if hPlan.has_key?('planOperations')
hPlan['planOperations'].each do |item|
hReturn = Operation.unpack(item, responseObj, outContext)
unless hReturn.nil?
intPlan[:planOperations] << hReturn
end
end
end

if hPlan.has_key?('satisfiedRequirements')
hPlan['satisfiedRequirements'].each do |item|
hReturn = Requirement.unpack(item, responseObj, outContext)
unless hReturn.nil?
intPlan[:satisfiedRequirements] << hReturn
end
end
end

intPlan

end
end

end
end
end
end

0 comments on commit 2c5f3c8

Please sign in to comment.