CMR-10141-1: Fixing broken build

nasa · Nov 12, 2024 · 3bb3630 · 3bb3630
1 parent 9445088
commit 3bb3630
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/metadata-db-app/int-test/cmr/metadata_db/int_test/utility.clj b/metadata-db-app/int-test/cmr/metadata_db/int_test/utility.clj
@@ -391,7 +391,9 @@
       (is (= (dissoc (expected-concept concept) :coll-concept-id)
              (dissoc stored-concept :revision-date :transaction-id :created-at :coll-concept-id)))
       (is (= (expected-concept concept)
-             (dissoc stored-concept :revision-date :transaction-id :created-at))))))
+             (util/dissoc-in
+              (dissoc stored-concept :revision-date :transaction-id :created-at)
+              [:extra-fields :aws-arn]))))))
 
 (defn is-tag-association-deleted?
   "Returns if the ta is marked as deleted in metadata-db"

diff --git a/metadata-db-app/src/cmr/metadata_db/services/sub_notifications.clj b/metadata-db-app/src/cmr/metadata_db/services/sub_notifications.clj
@@ -15,7 +15,9 @@
  (if (sub-note/subscription-exists? db subscription-id)
    (if (sub-note/sub-notification-exists? db subscription-id)
      (sub-note/update-sub-notification db subscription-id last-notified-time)
-     (sub-note/save-sub-notification db subscription-id))
+     (do
+       (sub-note/save-sub-notification db subscription-id)
+       (sub-note/update-sub-notification db subscription-id last-notified-time)))
    (errors/throw-service-error :not-found (msg/subscription-not-found subscription-id))))
 
 (defn update-subscription-notification

diff --git a/...em-int-test/test/cmr/system_int_test/ingest/subscription/subscription_processing_test.clj b/...em-int-test/test/cmr/system_int_test/ingest/subscription/subscription_processing_test.clj
@@ -172,7 +172,7 @@
                params {:revision-date-range (str "2016-01-02T00:00:00Z," (t/now))}
                _manual-endpoint (jobs/trigger-email-subscription-processing system-context params)
                postjob-subscriptions (get-subscriptions)]
-           (is (some? (get-in (first prejob-subscriptions) [:extra-fields :last-notified-at])))
+           (is (nil? (get-in (first prejob-subscriptions) [:extra-fields :last-notified-at])))
            (is (= prejob-subscriptions postjob-subscriptions))))))))
 
 (deftest ^:oracle subscription-email-processing-time-constraint-test