Skip to content

Commit 83407be

Browse files
committed
[ISSUE-22] Add skip alert param (default: false)
1 parent 631fc78 commit 83407be

5 files changed

Lines changed: 10 additions & 9 deletions

File tree

src/main/scala/org/occidere/githubwatcher/GithubWatcher.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ import scala.util.{Failure, Success, Try}
1414
*/
1515
object GithubWatcher extends App with GithubWatcherTask with GithubWatcherLogger {
1616
private val userId = sys.env.getOrElse("gw_user_id", "")
17-
sys.env.getOrElse("gw_tasks", "").split(",").map(_.trim)
17+
private val skipAlert = sys.env.getOrElse("gw_skip_alert", "false").toBoolean
18+
sys.env.getOrElse("gw_tasks", "").split(",").map(_.trim).filterNot(taskName => taskName.isBlank)
1819
.foreach(task => {
1920
if (!AVAILABLE_TASKS.contains(task)) logger.warn(s"Unsupported task: $task")
20-
else Try(AVAILABLE_TASKS(task).run(userId)) match {
21+
else Try(AVAILABLE_TASKS(task).run(userId, skipAlert)) match {
2122
case Success(_) => logger.info(s"$task Success!")
2223
case Failure(e) => logger.error(s"$task Failed!", e)
2324
}

src/main/scala/org/occidere/githubwatcher/task/FollowerWatchTask.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.occidere.githubwatcher.vo.FollowerDiff
1212
*/
1313
object FollowerWatchTask extends Task with GithubWatcherLogger {
1414

15-
override def run(userId: String): Unit = {
15+
override def run(userId: String, skipAlert: Boolean = false): Unit = {
1616
logger.info(s"User ID: $userId")
1717

1818
// Data from GitHub API
@@ -31,7 +31,7 @@ object FollowerWatchTask extends Task with GithubWatcherLogger {
3131
logger.info(s"Not changed followers: ${diff.notChangedFollowerLogins.size}")
3232

3333
// Send line message if follower changed
34-
if (diff.hasChanged) LineMessengerService.sendFollowerMessage(diff)
34+
if (diff.hasChanged && !skipAlert) LineMessengerService.sendFollowerMessage(diff)
3535

3636
// Update DB to latest data including repos
3737
latestUser.followerLogins = diff.newFollowerLogins ++ diff.notChangedFollowerLogins

src/main/scala/org/occidere/githubwatcher/task/ReactionWatchTask.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import scala.util.{Failure, Success, Try}
1414
* @since 2020-09-23
1515
*/
1616
object ReactionWatchTask extends Task with GithubWatcherLogger {
17-
override def run(userId: String): Unit = {
17+
override def run(userId: String, skipAlert: Boolean = false): Unit = {
1818
logger.info(s"User ID: $userId")
1919

2020
// Fetch reactions from Issues
@@ -30,7 +30,7 @@ object ReactionWatchTask extends Task with GithubWatcherLogger {
3030
// Diff & Send line message
3131
val changedReactions = latestReactions.filter(latest => {
3232
val diff = ReactionDiff(prevReactions.getOrElse(latest.uniqueKey, copyReactionWithoutCounts(latest)), latest)
33-
Try(if (diff.hasChanged) LineMessengerService.sendReactionMessage(diff)) match {
33+
Try(if (diff.hasChanged && !skipAlert) LineMessengerService.sendReactionMessage(diff)) match {
3434
case Failure(e) =>
3535
logger.error(s"${latest.uniqueKey} process failed (htmlUrl: ${latest.htmlUrl})", e)
3636
false

src/main/scala/org/occidere/githubwatcher/task/RepositoryWatchTask.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import scala.util.{Failure, Success, Try}
1414
*/
1515
object RepositoryWatchTask extends Task with GithubWatcherLogger {
1616

17-
override def run(userId: String): Unit = {
17+
override def run(userId: String, skipAlert: Boolean = false): Unit = {
1818
logger.info(s"User ID: $userId")
1919

2020
// Latest repos from API
@@ -38,7 +38,7 @@ object RepositoryWatchTask extends Task with GithubWatcherLogger {
3838
logger.info(s"Repo: ${diff.repoName} (changed: ${diff.hasChanged})")
3939

4040
// Send message
41-
Try(if (diff.hasChanged) LineMessengerService.sendRepositoryMessage(diff)) match {
41+
Try(if (diff.hasChanged && !skipAlert) LineMessengerService.sendRepositoryMessage(diff)) match {
4242
case Failure(exception) =>
4343
logger.error(s"${latest.name} process failed", exception)
4444
false

src/main/scala/org/occidere/githubwatcher/task/Task.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ package org.occidere.githubwatcher.task
77
* @since 2020-09-22
88
*/
99
trait Task {
10-
def run(userId: String): Unit
10+
def run(userId: String, skipAlert: Boolean = false): Unit
1111
}

0 commit comments

Comments
 (0)