From 751c96ba3063cf197683dbf751c8df2f4c4690e3 Mon Sep 17 00:00:00 2001 From: Martin Fenner Date: Wed, 8 May 2019 08:24:03 +0200 Subject: [PATCH] update graphql orcid support. #255 --- app/models/researcher.rb | 6 +++--- spec/fixtures/vcr_cassettes/Researcher/find_by_id/found.yml | 6 +++--- .../vcr_cassettes/Researcher/find_by_id/not_found.yml | 6 +++--- spec/models/researcher_spec.rb | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/researcher.rb b/app/models/researcher.rb index ce834e5dd..f50379ebd 100644 --- a/app/models/researcher.rb +++ b/app/models/researcher.rb @@ -15,9 +15,9 @@ def self.find_by_id(id) def self.parse_message(id: nil, message: nil) { id: id, - given_name: message.dig("name", "given-names", "value"), - family_name: message.dig("name", "family-name", "value"), - name: message.dig("name", "credit-name", "value") }.compact + name: message.dig("name", "credit-name", "value"), + "givenName" => message.dig("name", "given-names", "value"), + "familyName" => message.dig("name", "family-name", "value") }.compact end def self.orcid_from_url(url) diff --git a/spec/fixtures/vcr_cassettes/Researcher/find_by_id/found.yml b/spec/fixtures/vcr_cassettes/Researcher/find_by_id/found.yml index c69de197a..e9e7f936c 100644 --- a/spec/fixtures/vcr_cassettes/Researcher/find_by_id/found.yml +++ b/spec/fixtures/vcr_cassettes/Researcher/find_by_id/found.yml @@ -23,7 +23,7 @@ http_interactions: Content-Type: - application/vnd.orcid+json; qs=4;charset=UTF-8 Date: - - Sun, 05 May 2019 10:30:03 GMT + - Tue, 07 May 2019 19:04:30 GMT Expires: - '0' Pragma: @@ -37,7 +37,7 @@ http_interactions: Connection: - keep-alive Set-Cookie: - - X-Mapping-fjhppofk=286B142B3C5849CB06CC59D0E32CD23F; path=/ + - X-Mapping-fjhppofk=FAC9A421C8E47CC7F8C08879007190C1; path=/ X-Frame-Options: - DENY body: @@ -45,5 +45,5 @@ http_interactions: string: !binary |- {
  "last-modified-date" : {
    "value" : 1517873256636
  },
  "name" : {
    "created-date" : {
      "value" : 1460763664405
    },
    "last-modified-date" : {
      "value" : 1460763664405
    },
    "given-names" : {
      "value" : "Martin"
    },
    "family-name" : {
      "value" : "Fenner"
    },
    "credit-name" : {
      "value" : "Martin Fenner"
    },
    "source" : null,
    "visibility" : "PUBLIC",
    "path" : "0000-0003-1419-2405"
  },
  "other-names" : {
    "last-modified-date" : {
      "value" : 1446760703722
    },
    "other-name" : [ {
      "created-date" : {
        "value" : 1406836421699
      },
      "last-modified-date" : {
        "value" : 1406836421699
      },
      "source" : {
        "source-orcid" : {
          "uri" : "https://orcid.org/0000-0003-1419-2405",
          "path" : "0000-0003-1419-2405",
          "host" : "orcid.org"
        },
        "source-client-id" : null,
        "source-name" : {
          "value" : "Martin Fenner"
        }
      },
      "content" : "M Fenner",
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/other-names/247043",
      "put-code" : 247043,
      "display-index" : 0
    }, {
      "created-date" : {
        "value" : 1406836421700
      },
      "last-modified-date" : {
        "value" : 1406836421700
      },
      "source" : {
        "source-orcid" : {
          "uri" : "https://orcid.org/0000-0003-1419-2405",
          "path" : "0000-0003-1419-2405",
          "host" : "orcid.org"
        },
        "source-client-id" : null,
        "source-name" : {
          "value" : "Martin Fenner"
        }
      },
      "content" : "MH Fenner",
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/other-names/247044",
      "put-code" : 247044,
      "display-index" : 0
    }, {
      "created-date" : {
        "value" : 1438321583994
      },
      "last-modified-date" : {
        "value" : 1438321583994
      },
      "source" : {
        "source-orcid" : {
          "uri" : "https://orcid.org/0000-0003-1419-2405",
          "path" : "0000-0003-1419-2405",
          "host" : "orcid.org"
        },
        "source-client-id" : null,
        "source-name" : {
          "value" : "Martin Fenner"
        }
      },
      "content" : "Martin H. Fenner",
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/other-names/509846",
      "put-code" : 509846,
      "display-index" : 0
    }, {
      "created-date" : {
        "value" : 1446760703722
      },
      "last-modified-date" : {
        "value" : 1446760703722
      },
      "source" : {
        "source-orcid" : {
          "uri" : "https://orcid.org/0000-0003-1419-2405",
          "path" : "0000-0003-1419-2405",
          "host" : "orcid.org"
        },
        "source-client-id" : null,
        "source-name" : {
          "value" : "Martin Fenner"
        }
      },
      "content" : "Martin Hellmut Fenner",
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/other-names/566914",
      "put-code" : 566914,
      "display-index" : 0
    } ],
    "path" : "/0000-0003-1419-2405/other-names"
  },
  "biography" : {
    "created-date" : {
      "value" : 1460763664408
    },
    "last-modified-date" : {
      "value" : 1493241773392
    },
    "content" : "Martin Fenner is the DataCite Technical Director and manages the technical architecture for Datacite as well as DataCite’s technical contributions for the EU-funded THOR project. From 2012 to 2015 he was the technical lead for the PLOS Article-Level Metrics project. Martin has a medical degree from the Free University of Berlin and is a Board-certified medical oncologist.",
    "visibility" : "PUBLIC",
    "path" : "/0000-0003-1419-2405/biography"
  },
  "researcher-urls" : {
    "last-modified-date" : {
      "value" : 1480255200394
    },
    "researcher-url" : [ {
      "created-date" : {
        "value" : 1406836421703
      },
      "last-modified-date" : {
        "value" : 1480255200394
      },
      "source" : {
        "source-orcid" : {
          "uri" : "https://orcid.org/0000-0003-1419-2405",
          "path" : "0000-0003-1419-2405",
          "host" : "orcid.org"
        },
        "source-client-id" : null,
        "source-name" : {
          "value" : "Martin Fenner"
        }
      },
      "url-name" : "My SciENCV",
      "url" : {
        "value" : "http://www.ncbi.nlm.nih.gov/myncbi/mfenner/cv/1413/"
      },
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/researcher-urls/334415",
      "put-code" : 334415,
      "display-index" : 4
    }, {
      "created-date" : {
        "value" : 1406836421702
      },
      "last-modified-date" : {
        "value" : 1480255200394
      },
      "source" : {
        "source-orcid" : {
          "uri" : "https://orcid.org/0000-0003-1419-2405",
          "path" : "0000-0003-1419-2405",
          "host" : "orcid.org"
        },
        "source-client-id" : null,
        "source-name" : {
          "value" : "Martin Fenner"
        }
      },
      "url-name" : "Twitter",
      "url" : {
        "value" : "http://twitter.com/mfenner"
      },
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/researcher-urls/334414",
      "put-code" : 334414,
      "display-index" : 3
    }, {
      "created-date" : {
        "value" : 1406836421702
      },
      "last-modified-date" : {
        "value" : 1480255200394
      },
      "source" : {
        "source-orcid" : {
          "uri" : "https://orcid.org/0000-0003-1419-2405",
          "path" : "0000-0003-1419-2405",
          "host" : "orcid.org"
        },
        "source-client-id" : null,
        "source-name" : {
          "value" : "Martin Fenner"
        }
      },
      "url-name" : "Blog",
      "url" : {
        "value" : "http://blog.martinfenner.org"
      },
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/researcher-urls/334413",
      "put-code" : 334413,
      "display-index" : 2
    } ],
    "path" : "/0000-0003-1419-2405/researcher-urls"
  },
  "emails" : {
    "last-modified-date" : null,
    "email" : [ ],
    "path" : "/0000-0003-1419-2405/email"
  },
  "addresses" : {
    "last-modified-date" : {
      "value" : 1465226976952
    },
    "address" : [ {
      "created-date" : {
        "value" : 1453660427119
      },
      "last-modified-date" : {
        "value" : 1465226976952
      },
      "source" : {
        "source-orcid" : {
          "uri" : "https://orcid.org/0000-0003-1419-2405",
          "path" : "0000-0003-1419-2405",
          "host" : "orcid.org"
        },
        "source-client-id" : null,
        "source-name" : {
          "value" : "Martin Fenner"
        }
      },
      "country" : {
        "value" : "DE"
      },
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/address/348071",
      "put-code" : 348071,
      "display-index" : 0
    } ],
    "path" : "/0000-0003-1419-2405/address"
  },
  "keywords" : {
    "last-modified-date" : null,
    "keyword" : [ ],
    "path" : "/0000-0003-1419-2405/keywords"
  },
  "external-identifiers" : {
    "last-modified-date" : {
      "value" : 1517873256636
    },
    "external-identifier" : [ {
      "created-date" : {
        "value" : 1378921887304
      },
      "last-modified-date" : {
        "value" : 1517873256636
      },
      "source" : {
        "source-orcid" : null,
        "source-client-id" : {
          "uri" : "https://orcid.org/client/0000-0002-5982-8983",
          "path" : "0000-0002-5982-8983",
          "host" : "orcid.org"
        },
        "source-name" : {
          "value" : "Scopus - Elsevier"
        }
      },
      "external-id-type" : "Scopus Author ID",
      "external-id-value" : "7006600825",
      "external-id-url" : {
        "value" : "http://www.scopus.com/inward/authorDetails.url?authorID=7006600825&partnerID=MN8TOARS"
      },
      "external-id-relationship" : "SELF",
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/external-identifiers/143928",
      "put-code" : 143928,
      "display-index" : 3
    }, {
      "created-date" : {
        "value" : 1387382277259
      },
      "last-modified-date" : {
        "value" : 1517873256636
      },
      "source" : {
        "source-orcid" : null,
        "source-client-id" : {
          "uri" : "https://orcid.org/client/0000-0003-0412-1857",
          "path" : "0000-0003-0412-1857",
          "host" : "orcid.org"
        },
        "source-name" : {
          "value" : "ISNI2ORCID search and link"
        }
      },
      "external-id-type" : "ISNI",
      "external-id-value" : "000000035060549X",
      "external-id-url" : {
        "value" : "http://isni.org/000000035060549X"
      },
      "external-id-relationship" : "SELF",
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/external-identifiers/182778",
      "put-code" : 182778,
      "display-index" : 2
    }, {
      "created-date" : {
        "value" : 1497972789448
      },
      "last-modified-date" : {
        "value" : 1497972789448
      },
      "source" : {
        "source-orcid" : null,
        "source-client-id" : {
          "uri" : "https://orcid.org/client/0000-0001-8099-6984",
          "path" : "0000-0001-8099-6984",
          "host" : "orcid.org"
        },
        "source-name" : {
          "value" : "DataCite"
        }
      },
      "external-id-type" : "GitHub",
      "external-id-value" : "mfenner",
      "external-id-url" : {
        "value" : "https://github.com/mfenner"
      },
      "external-id-relationship" : "SELF",
      "visibility" : "PUBLIC",
      "path" : "/0000-0003-1419-2405/external-identifiers/737549",
      "put-code" : 737549,
      "display-index" : 0
    } ],
    "path" : "/0000-0003-1419-2405/external-identifiers"
  },
  "path" : "/0000-0003-1419-2405/person"
} http_version: - recorded_at: Sun, 05 May 2019 10:30:03 GMT + recorded_at: Tue, 07 May 2019 19:04:30 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/vcr_cassettes/Researcher/find_by_id/not_found.yml b/spec/fixtures/vcr_cassettes/Researcher/find_by_id/not_found.yml index aa75eaa46..87d338061 100644 --- a/spec/fixtures/vcr_cassettes/Researcher/find_by_id/not_found.yml +++ b/spec/fixtures/vcr_cassettes/Researcher/find_by_id/not_found.yml @@ -23,7 +23,7 @@ http_interactions: Content-Type: - application/vnd.orcid+json; qs=4;charset=UTF-8 Date: - - Sun, 05 May 2019 10:25:09 GMT + - Tue, 07 May 2019 19:04:30 GMT Expires: - '0' Pragma: @@ -37,7 +37,7 @@ http_interactions: Connection: - keep-alive Set-Cookie: - - X-Mapping-fjhppofk=AC7FD72D56BC49A75A07C0057E9FFEE4; path=/ + - X-Mapping-fjhppofk=FAC9A421C8E47CC7F8C08879007190C1; path=/ X-Frame-Options: - DENY body: @@ -51,5 +51,5 @@ http_interactions: "more-info" : "https://members.orcid.org/api/resources/troubleshooting" } http_version: - recorded_at: Sun, 05 May 2019 10:25:09 GMT + recorded_at: Tue, 07 May 2019 19:04:30 GMT recorded_with: VCR 3.0.3 diff --git a/spec/models/researcher_spec.rb b/spec/models/researcher_spec.rb index 91d2cba61..5a273aeaa 100644 --- a/spec/models/researcher_spec.rb +++ b/spec/models/researcher_spec.rb @@ -6,7 +6,7 @@ id = "https://orcid.org/0000-0003-1419-2405" researchers = Researcher.find_by_id(id) expect(researchers.size).to eq(1) - expect(researchers.first).to eq(id: "https://orcid.org/0000-0003-1419-2405", name: "Martin Fenner", given_name: "Martin", family_name: "Fenner") + expect(researchers.first).to eq(id: "https://orcid.org/0000-0003-1419-2405", name: "Martin Fenner", "givenName" => "Martin", "familyName" => "Fenner") end it "not found" do