import isbn to IsbnRecord

next-l · May 3, 2020 · f457845 · f457845
1 parent 774684d
commit f457845
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/app/models/concerns/enju_ndl/enju_manifestation.rb b/app/models/concerns/enju_ndl/enju_manifestation.rb
@@ -42,7 +42,7 @@ def self.import_from_ndl_search(options)
 
       def self.import_record(doc)
         iss_itemno = URI.parse(doc.at('//dcndl:BibAdminResource[@rdf:about]').values.first).path.split('/').last
-        identifier_type = IdentifierType.where(name: 'iss_itemno').first_or_create!
+        identifier_type = IdentifierType.find_or_create_by!(name: 'iss_itemno')
         identifier = Identifier.find_by(body: iss_itemno, identifier_type_id: identifier_type.id)
         return identifier.manifestation if identifier
 
@@ -152,9 +152,17 @@ def self.import_record(doc)
           )
           manifestation.serial = true if is_serial
           identifier = {}
-          if isbn
-            identifier[:isbn] = Identifier.new(body: isbn)
-            identifier[:isbn].identifier_type = IdentifierType.where(name: 'isbn').first || IdnetifierType.create!(name: 'isbn')
+          if isbn.present?
+            IsbnRecordAndManifestation.create(
+              isbn_record: IsbnRecord.find_or_create_by(body: isbn),
+              manifestation: manifestation
+            )
+          end
+          if issn.present?
+            IssnRecordAndManifestation.create(
+              issn_record: IssnRecord.find_or_create_by(body: issn),
+              manifestation: manifestation
+            )
           end
           if iss_itemno
             identifier[:iss_itemno] = Identifier.new(body: iss_itemno)
@@ -164,10 +172,6 @@ def self.import_record(doc)
             identifier[:jpno] = Identifier.new(body: jpno)
             identifier[:jpno].identifier_type = IdentifierType.where(name: 'jpno').first || IdentifierType.create!(name: 'jpno')
           end
-          if issn
-            identifier[:issn] = Identifier.new(body: issn)
-            identifier[:issn].identifier_type = IdentifierType.where(name: 'issn').first || IdentifierType.create!(name: 'issn')
-          end
           if issn_l
             identifier[:issn_l] = Identifier.new(body: issn_l)
             identifier[:issn_l].identifier_type = IdentifierType.where(name: 'issn_l').first || IdentifierType.create!(name: 'issn_l')

diff --git a/spec/models/ndl_book_spec.rb b/spec/models/ndl_book_spec.rb
@@ -21,7 +21,7 @@
     it "should import bibliographic record", vcr: true do
       manifestation = NdlBook.import_from_sru_response('R100000002-I000010980901-00')
       manifestation.manifestation_identifier.should eq 'http://iss.ndl.go.jp/books/R100000002-I000010980901-00'
-      manifestation.identifier_contents(:isbn).should eq ['9784839931995']
+      expect(manifestation.isbn_records.pluck(:body)).to eq ['9784839931995']
       manifestation.classifications.pluck(:category).should eq ["007.64"]
       manifestation.identifier_contents(:iss_itemno).should eq ["R100000002-I000010980901-00"]
       manifestation.identifier_contents(:jpno).should eq ["21816393"]