AC-3378: feat(anychat-pubsub): [BE] Add dead letter policy to all pub…

…sub subscriptions > update as review
AnyMindGroup · Apr 1, 2024 · e73efc3 · e73efc3
1 parent 6947221
commit e73efc3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/zio-gc-pubsub-google-test/src/test/scala/com/anymindgroup/pubsub/google/SubscriberSpec.scala b/zio-gc-pubsub-google-test/src/test/scala/com/anymindgroup/pubsub/google/SubscriberSpec.scala
@@ -53,7 +53,7 @@ object SubscriberSpec extends ZIOSpecDefault {
   ): Task[Unit] =
     ZIO.attempt {
       subscriptionAdmin.deleteSubscription(SubscriptionName.of(projectName, subscriptionName))
-    }
+    }.ignore
 
   override def spec: Spec[TestEnvironment & Scope, Any] = suite("SubscriberSpec")(
     test("create a subscription and remove after usage") {
@@ -164,6 +164,19 @@ object SubscriberSpec extends ZIOSpecDefault {
         _                         <- SubscriptionAdmin.createOrUpdate(connection, subscriptionWithDeadLetter)
         afterUpdate               <- SubscriptionAdmin.fetchCurrentSubscription(client, connection.project.name, tempSubName)
         _                         <- assertTrue(afterUpdate.is(_.some).deadLettersSettings.get == deadLettersSettings)
+        _                         <- SubscriptionAdmin.createOrUpdate(connection, subscription)
+        afterUpdateToEmpty        <- SubscriptionAdmin.fetchCurrentSubscription(client, connection.project.name, tempSubName)
+        _                         <- assertTrue(afterUpdateToEmpty.is(_.some).deadLettersSettings.isEmpty)
+      } yield assertCompletes
+    }.provideSome[Scope](emulatorConnectionConfigLayer()),
+    test("Fetch Not Found Subscription should be handled properly") {
+      for {
+        (connection, _) <- initTopicWithSchemaAndDeadLetters
+        client          <- SubscriptionAdmin.makeClient(connection)
+        tempSubName     <- Gen.alphaNumericStringBounded(10, 10).map("sub_" + _).runHead.map(_.get)
+        _               <- deleteSubscription(connection.project.name, tempSubName, client)
+        result          <- SubscriptionAdmin.fetchCurrentSubscription(client, connection.project.name, tempSubName).either
+        _               <- assertTrue(result.is(_.right).isEmpty)
       } yield assertCompletes
     }.provideSome[Scope](emulatorConnectionConfigLayer()),
   )

diff --git a/zio-gc-pubsub-google/src/main/scala/com/anymindgroup/pubsub/google/SubscriptionAdmin.scala b/zio-gc-pubsub-google/src/main/scala/com/anymindgroup/pubsub/google/SubscriptionAdmin.scala
@@ -120,7 +120,7 @@ object SubscriptionAdmin {
     subscriptionName: String,
   ): ZIO[Any, Throwable, Option[Subscription]] =
     (ZIO
-      .attempt(subscriptionAdmin.getSubscription(SubscriptionName.of(projectName, subscriptionName)))
+      .attempt({ subscriptionAdmin.getSubscription(SubscriptionName.of(projectName, subscriptionName)) })
       .map { gSub =>
         Some(
           Subscription(