Merge pull request #10 from mlibrary/updating-digifeeds-updater

searches first for the set id

Author: niquerio

env.example

@@ -7,7 +7,6 @@ ALMA_API_HOST='https://api-na.hosted.exlibrisgroup.com'
 STUDENT_USERS_SET_ID="your_users_set_id"
 
 # hathitrust
-DIGIFEEDS_SET_ID="some_set_id"
 CHANGE_PHYSICAL_ITEM_INFORMATION_JOB_ID="some_job_id"
 
 # sms

lib/aim/cli.rb

@@ -12,7 +12,10 @@ class HathiTrust < Thor
         that Umich is the digitizer of the item. 
       DESC
       def set_digitizer
+        start_time = Time.now.to_i
+        AIM::HathiTrust::DigitizerSetter.configure
         AIM::HathiTrust::DigitizerSetter.new.run
+        AIM::HathiTrust::DigitizerSetter.send_metrics(start_time)
       end
     end
 

lib/aim/hathi_trust/digitizer_setter.rb

@@ -1,13 +1,43 @@
 module AIM
   module HathiTrust
     class DigitizerSetter
+      def self.configure
+        ::Yabeda.configure do
+          gauge :aim_hathi_trust_set_digitizer_last_success, comment: "Start time of the last Set Digitizer Job that successfully finished."
+        end
+        Yabeda.configure!
+      end
+
+      def self.send_metrics(start_time)
+        Yabeda.aim_hathi_trust_set_digitizer_last_success.set({}, start_time)
+        begin
+          Yabeda::Prometheus.push_gateway.add(Yabeda::Prometheus.registry)
+        rescue
+          Logger.new($stdout).error("Failed to contact the push gateway")
+        end
+      end
+
       def initialize(logger: Logger.new($stdout))
         @logger = logger
       end
 
       def run
+        @logger.info("Fetching digifeeds_metadata set id")
+        sets_resp = AlmaRestClient.client.get_all(url: "/conf/sets", record_key: "set", query: {"q" => "name~digifeeds_metadata"})
+        if sets_resp.status != 200
+          @logger.error("Failed to fetch set")
+          abort
+        end
+
+        set_id = sets_resp
+          .body["set"]
+          .filter_map { |x| x["id"] if x["name"] == "digifeeds_metadata" }
+          .first
+
+        @logger.info("Set Id: #{set_id}")
+
         @logger.info("Sending Change Physical Item Job to set the Digitizer to Umich for Digifeeds")
-        resp = AlmaRestClient.client.post("/conf/jobs/#{ENV.fetch("CHANGE_PHYSICAL_ITEM_INFORMATION_JOB_ID")}?op=run", body: body)
+        resp = AlmaRestClient.client.post("/conf/jobs/#{ENV.fetch("CHANGE_PHYSICAL_ITEM_INFORMATION_JOB_ID")}?op=run", body: body(set_id: set_id))
         @logger.info resp.body
         if resp.status == 200
           @logger.info("Finished Sending Change Physical Items job")
@@ -16,9 +46,9 @@ def run
         end
       end
 
-      def body
+      def body(set_id:)
         {
-          "parameter" => params.map do |name, value|
+          "parameter" => params(set_id: set_id).map do |name, value|
             {
               "name" => {"value" => name, "desc" => name},
               "value" => value
@@ -27,11 +57,11 @@ def body
         }
       end
 
-      def params
+      def params(set_id:)
         {
           "STATISTICS_NOTE_1_value" => digitizer,
           "STATISTICS_NOTE_1_selected" => true,
-          "set_id" => ENV.fetch("DIGIFEEDS_SET_ID"),
+          "set_id" => set_id,
           "job_name" => job_name
         }
       end

spec/aim/hathi_trust/digitizer_setter_spec.rb

@@ -6,10 +6,11 @@
        [
          {"name" => {"value" => "STATISTICS_NOTE_1_value", "desc" => "STATISTICS_NOTE_1_value"}, "value" => "umich"},
          {"name" => {"value" => "STATISTICS_NOTE_1_selected", "desc" => "STATISTICS_NOTE_1_selected"}, "value" => true},
-         {"name" => {"value" => "set_id", "desc" => "set_id"}, "value" => ENV.fetch("DIGIFEEDS_SET_ID")},
+         {"name" => {"value" => "set_id", "desc" => "set_id"}, "value" => "999"},
          {"name" => {"value" => "job_name", "desc" => "job_name"}, "value" => "Change Physical items information - set digitizer to Umich"}
        ]}
 
+    stub_alma_get_request(url: "conf/sets?q=name~digifeeds_metadata&limit=100&offset=0", output: fixture("hathi_trust/digitizer_setter_sets.json"))
     request = stub_alma_post_request(url: "conf/jobs/#{ENV.fetch("CHANGE_PHYSICAL_ITEM_INFORMATION_JOB_ID")}?op=run", input: body)
     described_class.new(logger: logger_double).run
     expect(request).to have_been_requested

spec/fixtures/hathi_trust/digitizer_setter_sets.json

@@ -0,0 +1,69 @@
+{
+  "set": [
+    {
+      "id": "111",
+      "name": "digifeeds_metadata_20230607",
+      "description": "three missing volumes from 20230504",
+      "type": {
+        "value": "ITEMIZED",
+        "desc": "Itemized"
+      },
+      "content": {
+        "value": "ITEM",
+        "desc": "Physical items"
+      },
+      "status": {
+        "value": "ACTIVE",
+        "desc": "Active"
+      },
+      "origin": {
+        "value": "UI",
+        "desc": "Institution only"
+      },
+      "private": {
+        "value": "false",
+        "desc": "No"
+      },
+      "status_date": "2023-06-07T19:00:32.689Z",
+      "created_by": {
+        "value": "test",
+        "desc": "TEST, TEST"
+      },
+      "created_date": "2023-06-07T19:00:32.689Z",
+      "link": "https://api-na.hosted.exlibrisgroup.com/almaws/v1/conf/sets/111"
+    },
+    {
+      "id": "999",
+      "name": "digifeeds_metadata",
+      "description": "list of metadata for digifeeds",
+      "type": {
+        "value": "ITEMIZED",
+        "desc": "Itemized"
+      },
+      "content": {
+        "value": "ITEM",
+        "desc": "Physical items"
+      },
+      "status": {
+        "value": "ACTIVE",
+        "desc": "Active"
+      },
+      "origin": {
+        "value": "UI",
+        "desc": "Institution only"
+      },
+      "private": {
+        "value": "false",
+        "desc": "No"
+      },
+      "status_date": "2023-07-17T17:23:03.086Z",
+      "created_by": {
+        "value": "test",
+        "desc": "TEST, TEST"
+      },
+      "created_date": "2023-07-17T17:23:03.086Z",
+      "link": "https://api-na.hosted.exlibrisgroup.com/almaws/v1/conf/sets/999"
+    }
+  ],
+  "total_record_count": 2
+}