README.md

@@ -125,7 +125,7 @@ slack:
     api_token: SLACK_API_TOKEN
     create_from_weekday: 3
     default_conversation: SLACK_UID
-    sticky_users:
+	sticky_users:
         - SLACK_UID
 
 ```

api.go

@@ -2,14 +2,12 @@ package main
 
 import (
 	"encoding/json"
-	"errors"
 	"log"
 	"net/http"
 	"time"
 
 	"github.com/gorilla/mux"
 	"github.com/slack-go/slack"
-	"gorm.io/gorm"
 )
 
 // Commonly used strings.
@@ -100,34 +98,13 @@ func (s *HTTPServer) RegisterAPIRoutes(r *mux.Router) {
 		now := time.Now().UTC()
 		conversation := app.config.Slack.DefaultConversation
 
-		// Find plan times that are occuring right now. A 60-minute buffer
+		// Find plan times that are occuring right now.
-		// is applied past ends_at so services that run long still resolve
-		// to their event channel instead of falling back to the default.
-		// Order by starts_at DESC so the most recent active service wins
-		// when a later service's window overlaps an earlier service's buffer.
 		var planTime PlanTimes
-		err = app.db.Where("time_type='service' AND starts_at < ? AND ends_at > ?", now, now.Add(-60*time.Minute)).Order("starts_at DESC").First(&planTime).Error
+		app.db.Where("time_type='service' AND starts_at < ? AND ends_at > ?", now, now).First(&planTime)
-		// A "record not found" simply means no service is occuring right now, in
-		// which case we fall back to the default conversation. Any other error
-		// (e.g. "database is locked") must NOT be swallowed: treating it as "no
-		// service" would silently misroute the message to the default
-		// conversation instead of the event channel. Fail so the caller retries.
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			log.Println("Error looking up plan time:", err)
-			s.APISendGeneralResp(w, APIERR, "Error looking up plan time")
-			return
-		}
 		if planTime.Plan != 0 {
 			// If plan found, check for the slack channel.
 			var channel SlackChannels
-			err = app.db.Where("pc_plan = ?", planTime.Plan).First(&channel).Error
+			app.db.Where("pc_plan = ?", planTime.Plan).First(&channel)
-			// As above, only "record not found" is a benign result here. On any
-			// other error we must not fall through to the default conversation.
-			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				log.Println("Error looking up slack channel:", err)
-				s.APISendGeneralResp(w, APIERR, "Error looking up slack channel")
-				return
-			}
 			if channel.ID != "" {
 				// If slack channel found, update the conversation to the channel ID.
 				conversation = channel.ID

database.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"log"
-	"strings"
 	"time"
 
 	"gorm.io/driver/mysql"
@@ -127,21 +126,7 @@ func (a *App) InitDB() {
 	}
 	// Depending on connection configuration, open the database.
 	if a.config.DB.Type == "sqlite3" {
-		// Enable WAL journaling and a busy timeout. Without WAL, a single
+		a.db, err = gorm.Open(sqlite.Open(a.config.DB.Connection), dbConfig)
-		// long-running writer (e.g. the channel-creation/sync routine, which
-		// interleaves slow Slack API calls with its writes) blocks all readers,
-		// causing "database is locked" on concurrent reads such as the
-		// send_message channel lookup. WAL lets reads proceed alongside the
-		// writer, and the busy timeout makes any remaining contention wait
-		// rather than fail immediately. Append as DSN pragmas, preserving any
-		// query string already present in the configured connection.
-		conn := a.config.DB.Connection
-		sep := "?"
-		if strings.Contains(conn, "?") {
-			sep = "&"
-		}
-		conn += sep + "_journal_mode=WAL&_busy_timeout=10000"
-		a.db, err = gorm.Open(sqlite.Open(conn), dbConfig)
 	} else if a.config.DB.Type == "mysql" {
 		a.db, err = gorm.Open(mysql.Open(a.config.DB.Connection), dbConfig)
 	} else if a.config.DB.Type == "postgres" {

main.go

@@ -13,7 +13,7 @@ import (
 const (
 	serviceName        = "service-notifications"
 	serviceDescription = "Notifications for church services"
-	serviceVersion     = "0.2.2"
+	serviceVersion     = "0.2"
 )
 
 // App is the global application structure for communicating between servers and storing information.

update.go

@@ -110,8 +110,7 @@ func UpdatePCData() {
 		// Get the plans for this service type.
 		allPlans, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans", serviceTypeID))
 		if err != nil {
-			log.Println("Error getting plans for service type:", serviceTypeID, err)
+			log.Fatalln(err)
-			continue
 		}
 		// For each plan, update data in database and pull other plan releated items for updates.
 		for _, data := range allPlans {
@@ -153,8 +152,7 @@ func UpdatePCData() {
 			// Get all times for this plan.
 			allPlanTimes, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans/%d/plan_times", serviceTypeID, planID))
 			if err != nil {
-				log.Println("Error getting plan times for plan:", planID, err)
+				log.Fatalln(err)
-				continue
 			}
 			// With each time, save it to the database.
 			for _, data := range allPlanTimes {
@@ -190,8 +188,7 @@ func UpdatePCData() {
 			// Get all members of the plan.
 			allTeamMembers, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans/%d/team_members", serviceTypeID, planID))
 			if err != nil {
-				log.Println("Error getting team members for plan:", planID, err)
+				log.Fatalln(err)
-				continue
 			}
 			// With each member, update the database.
 			for _, data := range allTeamMembers {
@@ -229,13 +226,11 @@ func UpdateSlackData() {
 	// Get all users from Slack.
 	users, err := app.slack.GetUsers()
 	if err != nil {
-		log.Println("Error getting Slack users:", err)
+		log.Fatalln(err)
-		return
 	}
 	// If no users returned, error as we should have some...
 	if len(users) == 0 {
-		log.Println("No users found in Slack.")
+		log.Fatalln("No users found in Slack.")
-		return
 	}
 	// With each user, update the database.
 	for _, user := range users {
@@ -359,8 +354,7 @@ func CreateSlackChannels() {
 	app.db.Where("time_type='service' AND starts_at > ? AND starts_at < ?", startDate, lastDate).Find(&planTimes)
 	// If no plan times matched, exit here.
 	if len(planTimes) == 0 {
-		log.Println("No services found for this time frame.")
+		log.Fatalln("No services found for this time frame.")
-		return
 	}
 
 	// With each plan time found, create a slack channel.
@@ -438,28 +432,22 @@ func CreateSlackChannels() {
 			log.Println("Creating channel:", channel.Name)
 			schan, err := app.slack.CreateConversation(channelInfo)
 			if err != nil {
-				log.Println("Failed to create channel:", err)
+				log.Fatalln("Failed to create channel:", err)
-				continue
 			}
 
 			// If topic is defined, set the topic and purpose.
 			if topic != "" {
-				// Keep count of failures so we can try again.
+				// Sleep before, as it takes time for Slack APIs
-				failed := 0
+				// to recongize the channel was created.
-				_, err = app.slack.SetTopicOfConversation(schan.ID, topic)
+				time.Sleep(120 * time.Second)
+				_, err = app.slack.SetTopicOfConversation(channel.ID, topic)
 				if err != nil {
-					failed++
 					log.Println("Failed to set topic:", err)
 				}
-				_, err = app.slack.SetPurposeOfConversation(schan.ID, topic)
+				_, err = app.slack.SetPurposeOfConversation(channel.ID, topic)
 				if err != nil {
-					failed++
 					log.Println("Failed to set purpose:", err)
 				}
-				// If it failed, make topic empty so we can try again next run.
-				if failed != 0 {
-					topic = ""
-				}
 			}
 
 			// Save the channel to the database.