Merge pull request #26 from ccil-kbw/csv-support

feat: remove api dependency

Author: serafdev

cmd/monolith/main.go

@@ -3,15 +3,12 @@ package main
 import (
 	"fmt"
 	"github.com/ccil-kbw/robot/iqama"
-	"io"
-	"net/http"
 	"os"
 	"os/signal"
 	"strings"
 	"time"
 
 	"github.com/ccil-kbw/robot/discord"
-	v1 "github.com/ccil-kbw/robot/iqama/v1"
 	"github.com/ccil-kbw/robot/rec"
 )
 
@@ -21,7 +18,6 @@ var (
 	// Double check on the env side if we need the feature at run time (e.g openbroadcaster is configured, proxy is required, etc)
 	config = Config{
 		Features: Features{
-			Proxy:      true,
 			DiscordBot: true,
 			Record:     true,
 		},
@@ -49,27 +45,23 @@ func main() {
 	notifyChan := make(chan string)
 
 	signal.Notify(stop, os.Interrupt)
-
-	var prayersData *iqama.PrayersData
-	{
-		prayersData = iqama.StartIqamaServer()
-	}
-
-	go func() {
-		go iqama.StartRecordingScheduleServer()
-
-		for {
-			in := 15 * time.Minute
-			notifyFunc(notifyChan, prayersData, in)
-			notifyFunc(notifyChan, prayersData, 0)
-			time.Sleep(55 * time.Second)
+	/*
+		var prayersData *iqama.PrayersData
+		{
+			prayersData = iqama.StartIqamaServer()
 		}
+		go func() {
+			go iqama.StartRecordingScheduleServer()
 
-	}()
+			for {
+				in := 15 * time.Minute
+				notifyFunc(notifyChan, prayersData, in)
+				notifyFunc(notifyChan, prayersData, 0)
+				time.Sleep(55 * time.Second)
+			}
 
-	if config.Features.Proxy {
-		go proxy()
-	}
+		}()
+	*/
 
 	var obs *rec.Recorder
 
@@ -136,13 +128,7 @@ out:
 
 // proxy, move to apis, maybe pkg/apis/proxyserver/proxyserver.go
 func proxy() {
-	http.HandleFunc("/today", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Printf("request: %s, %s\n", r.Method, r.URL)
-		_, _ = io.WriteString(w, string(v1.GetRAW()))
-	})
-
-	fmt.Println("Running iqama-proxy Go server on port :3333")
-	_ = http.ListenAndServe(":3333", nil)
+	fmt.Println("implement me")
 }
 
 func bot(obs *rec.Recorder, notifyChan chan string) {

iqama/v1/iqama.go

@@ -1,32 +1,15 @@
 package v1
 
 import (
-	"io/ioutil"
-	"log"
-	"net/http"
+	"errors"
+	"fmt"
 )
 
 func Get() (*Resp, error) {
-
-	body := GetRAW()
-
-	iqamaResp, err := UnmarshalResp(body)
-	if err != nil {
-		return nil, err
-	}
-	return &iqamaResp, err
+	fmt.Println("implement me")
+	return nil, errors.New("implement me")
 }
 
 func GetRAW() []byte {
-	resp, err := http.Get("https://iqama.ccil-kbw.com/iqamatimes.php")
-	if err != nil {
-		log.Fatalln(err)
-	}
-	defer resp.Body.Close()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	return body
+	panic("implement me")
 }

iqama/v2/csv.go

@@ -0,0 +1,81 @@
+package v2
+
+import (
+	"encoding/csv"
+	"log"
+	"os"
+	"time"
+)
+
+type IqamaCSV struct {
+	filePath   string
+	iqamaTimes map[time.Time]IqamaDailyTimes
+}
+
+func NewIqamaCSV(filePath string) Iqama {
+	i := &IqamaCSV{filePath: filePath}
+	if err := i.readCSV(); err != nil {
+		log.Fatalf("Unable to read CSV file %s", filePath)
+	}
+	return i
+}
+
+func (i *IqamaCSV) GetTodayTimes() (*IqamaDailyTimes, error) {
+	// Get today's date
+	today := time.Now().Truncate(24 * time.Hour)
+	// Get today's iqama times
+	times, ok := i.iqamaTimes[today]
+	if !ok {
+		return nil, nil
+	}
+	return &times, nil
+}
+
+func (i *IqamaCSV) GetTomorrowTimes() (*IqamaDailyTimes, error) {
+	// Get tomorrow's date
+	tomorrow := time.Now().Add(24 * time.Hour).Truncate(24 * time.Hour)
+	// Get tomorrow's iqama times
+	times, ok := i.iqamaTimes[tomorrow]
+	if !ok {
+		return nil, nil
+	}
+	return &times, nil
+}
+
+func (i *IqamaCSV) GetDiscordPrettified() string {
+	t := toTable(i.iqamaTimes)
+	return "```markdown\n" + t.Render() + "\n```"
+}
+
+func (i *IqamaCSV) GetShellPrettified() string {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (i *IqamaCSV) readCSV() error {
+	file, err := os.Open(i.filePath)
+	if err != nil {
+		log.Fatalf("Unable to open file %s", i.filePath)
+		return err
+	}
+	defer file.Close()
+
+	reader := csv.NewReader(file)
+	records, err := reader.ReadAll()
+	if err != nil {
+		log.Fatalf("Unable to parse file as CSV for %s", i.filePath)
+		return err
+	}
+
+	iqamaTimes := make(map[time.Time]IqamaDailyTimes)
+	for _, record := range records {
+		// Convert each record to IqamaDailyTimes and add to iqamaTimes
+		// You need to replace the following lines with your conversion logic
+		date, _ := time.Parse("2006-01-02", record[0]) // assuming the date is the first field in the record
+		iqamaTimes[date] = IqamaDailyTimes{}
+	}
+
+	i.iqamaTimes = iqamaTimes
+
+	return nil
+}

iqama/v2/csv_test.go

@@ -0,0 +1,143 @@
+package v2
+
+import (
+	"reflect"
+	"testing"
+	"time"
+)
+
+func TestNewIqamaCSV(t *testing.T) {
+	type args struct {
+		filePath string
+	}
+	tests := []struct {
+		name string
+		args args
+	}{
+		{
+			name: "TestNewIqamaCSV",
+			args: args{
+				filePath: "test_assets/iqama_2024.csv",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			NewIqamaCSV(tt.args.filePath)
+		})
+	}
+}
+
+func TestIqamaCSV_GetTodayTimes(t *testing.T) {
+	type fields struct {
+		filePath   string
+		iqamaTimes map[time.Time]IqamaDailyTimes
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		want    *IqamaDailyTimes
+		wantErr bool
+	}{
+		{
+			name: "TestIqamaCSV_GetTodayTimes",
+			fields: fields{
+				filePath:   "test_assets/iqama_2024.csv",
+				iqamaTimes: nil,
+			},
+			want:    nil,
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			i := &IqamaCSV{
+				filePath:   tt.fields.filePath,
+				iqamaTimes: tt.fields.iqamaTimes,
+			}
+			got, err := i.GetTodayTimes()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("IqamaCSV.GetTodayTimes() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("IqamaCSV.GetTodayTimes() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestIqamaCSV_GetTomorrowTimes(t *testing.T) {
+	type fields struct {
+		filePath   string
+		iqamaTimes map[time.Time]IqamaDailyTimes
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		want    *IqamaDailyTimes
+		wantErr bool
+	}{
+		{
+			name: "TestIqamaCSV_GetTomorrowTimes",
+			fields: fields{
+				filePath:   "test_assets/iqama_2024.csv",
+				iqamaTimes: nil,
+			},
+			want:    nil,
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			i := &IqamaCSV{
+				filePath:   tt.fields.filePath,
+				iqamaTimes: tt.fields.iqamaTimes,
+			}
+			got, err := i.GetTomorrowTimes()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("IqamaCSV.GetTomorrowTimes() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("IqamaCSV.GetTomorrowTimes() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestIqamaCSV_GetDiscordPrettified(t *testing.T) {
+	type fields struct {
+		filePath   string
+		iqamaTimes map[time.Time]IqamaDailyTimes
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		want   string
+	}{
+		{
+			name: "TestIqamaCSV_GetDiscordPrettified",
+			fields: fields{
+				filePath:   "test_assets/iqama_2024.csv",
+				iqamaTimes: nil,
+			},
+			want: "```markdown\n+------+------+--------+-----+---------+------+\n| DATE | FAJR | DHUHUR | ASR | MAGHRIB | ISHA |\n+------+------+--------+-----+---------+------+\n+------+------+--------+-----+---------+------+\n```",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			i := &IqamaCSV{
+				filePath:   tt.fields.filePath,
+				iqamaTimes: tt.fields.iqamaTimes,
+			}
+			if got := i.GetDiscordPrettified(); got != tt.want {
+				t.Errorf("IqamaCSV.GetDiscordPrettified() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

iqama/v2/helpers.go

@@ -0,0 +1,19 @@
+package v2
+
+import (
+	"github.com/jedib0t/go-pretty/v6/table"
+	"os"
+	"time"
+)
+
+func toTable(m map[time.Time]IqamaDailyTimes) table.Writer {
+	t := table.NewWriter()
+	t.SetOutputMirror(os.Stdout)
+	t.AppendHeader(table.Row{"Date", "Fajr", "Dhuhur", "Asr", "Maghrib", "Isha"})
+	for date, times := range m {
+		t.AppendRows([]table.Row{
+			{date.Format("2006-01-02"), times.Fajr, times.Dhuhr, times.Asr, times.Maghrib, times.Isha},
+		})
+	}
+	return t
+}

iqama/v2/interface.go

@@ -0,0 +1,8 @@
+package v2
+
+type Iqama interface {
+	GetTodayTimes() (*IqamaDailyTimes, error)
+	GetTomorrowTimes() (*IqamaDailyTimes, error)
+	GetDiscordPrettified() string
+	GetShellPrettified() string
+}

iqama/v2/models.go

@@ -0,0 +1,23 @@
+package v2
+
+import "time"
+
+type IqamaDailyTimes struct {
+	Date    time.Time
+	Fajr    Prayer
+	Sunrise time.Time
+	Dhuhr   Prayer
+	Asr     Prayer
+	Maghrib Prayer
+	Isha    Prayer
+	Jumuaa  Jumuaa
+}
+
+type Prayer struct {
+	Adhan time.Time
+	Iqama time.Time
+}
+
+type Jumuaa struct {
+	Times []time.Time
+}