lib/cocina/models/dro.rb in cocina-models-0.19.0 vs lib/cocina/models/dro.rb in cocina-models-0.20.0

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 module Cocina
   module Models
     # A digital repository object.  See http://sul-dlss.github.io/cocina-models/maps/DRO.json
-    class DRO < Dry::Struct
+    class DRO < Struct
       include Checkable
 
       TYPES = [
         Vocab.object,
         Vocab.three_dimensional,
@@ -23,61 +23,32 @@
         Vocab.webarchive_binary,
         Vocab.webarchive_seed
       ].freeze
 
       # Subschema for access concerns
-      class Access < Dry::Struct
+      class Access < Struct
         attribute :embargoReleaseDate, Types::Params::DateTime.meta(omittable: true)
-
-        def self.from_dynamic(dyn)
-          params = {}
-          params[:embargoReleaseDate] = dyn['embargoReleaseDate'] if dyn['embargoReleaseDate']
-          Access.new(params)
-        end
       end
 
       # Subschema for administrative concerns
-      class Administrative < Dry::Struct
+      class Administrative < Struct
         attribute :releaseTags, Types::Strict::Array.of(ReleaseTag).meta(omittable: true).default([].freeze)
         # Allowing hasAdminPolicy to be omittable for now (until rolled out to consumers),
         # but I think it's actually required for every DRO
         attribute :hasAdminPolicy, Types::Coercible::String.optional.default(nil)
-
-        def self.from_dynamic(dyn)
-          params = {}
-          params[:releaseTags] = dyn['releaseTags'].map { |rt| ReleaseTag.from_dynamic(rt) } if dyn['releaseTags']
-          params[:hasAdminPolicy] = dyn['hasAdminPolicy']
-          Administrative.new(params)
-        end
       end
 
       # Identification sub-schema for the DRO
-      class Identification < Dry::Struct
+      class Identification < Struct
         attribute :sourceId, Types::Strict::String.meta(omittable: true)
         attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
-        def self.from_dynamic(dyn)
-          params = {}
-          params[:sourceId] = dyn['sourceId'] if dyn['sourceId']
-          if dyn['catalogLinks']
-            params[:catalogLinks] = dyn['catalogLinks']
-                                    .map { |link| CatalogLink.from_dynamic(link) }
-          end
-          params
-        end
       end
 
       # Structural sub-schema for the DRO
-      class Structural < Dry::Struct
+      class Structural < Struct
         attribute :contains, Types::Strict::Array.of(FileSet).meta(omittable: true)
         attribute :isMemberOf, Types::Strict::String.meta(omittable: true)
-
-        def self.from_dynamic(dyn)
-          params = {}
-          params[:isMemberOf] = dyn['isMemberOf'] if dyn['isMemberOf']
-          params[:contains] = dyn['contains'].map { |fs| FileSet.from_dynamic(fs) } if dyn['contains']
-          Structural.new(params)
-        end
       end
 
       attribute :externalIdentifier, Types::Strict::String
       attribute :type, Types::String.enum(*TYPES)
       attribute :label, Types::Strict::String
@@ -89,10 +60,10 @@
       attribute :description, Description.optional.default(nil)
       attribute(:identification, Identification.default { Identification.new })
       attribute(:structural, Structural.default { Structural.new })
 
       def self.from_dynamic(dyn)
-        DROBuilder.build(self, dyn)
+        DRO.new(dyn)
       end
 
       def self.from_json(json)
         from_dynamic(JSON.parse(json))
       end