and new

notifications_catalog/triggers/on-deleted.yaml

@@ -1,4 +1,4 @@
 - when: app.metadata.deletionTimestamp != nil
   description: Application is deleted.
   send: [app-deleted]
-  oncePer: app.metadata.name
+  oncePer: app.metadata.name

notifications_catalog/triggers/on-deployed.yaml

@@ -1,4 +1,4 @@
-- when: app.status.operationState != nil and app.status.operationState.phase in ['Succeeded'] and app.status.health.status == 'Healthy'
+- when: app.status.operationState != nil and app.status.operationState.phase in ['Succeeded'] and app.status.health.status == 'Healthy' and !time.Parse(app.status.health.lastTransitionTime).Before(time.Parse(app.status.operationState.finishedAt))
   description: Application is synced and healthy. Triggered once per commit.
   send: [app-deployed]
-  oncePer: app.status.sync.revision
+  oncePer: app.status.operationState?.syncResult?.revision

notifications_catalog/triggers/on-sync-running.yaml

@@ -1,4 +1,3 @@
-- when: app.status.operationState != nil and app.status.operationState?.phase in ['Running']
+- when: app.status.operationState != nil and app.status.operationState.phase in ['Running']
   description: Application is being synced
-  send: [app-sync-running]
-  oncePer: app.status.operationState.syncResult?.revision
+  send: [app-sync-running]