feat: add club information and events parsing to the parser and do some refactoring

Author: cjcocokrisp

src/data_parser/db/db.go

@@ -2,31 +2,54 @@ package db
 
 import (
 	"context"
-	"log"
+	"fmt"
 	"os"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
-	"github.com/umlcloudcomputing/immersion/dataparser/models"
+	"github.com/umlcloudcomputing/immersion/dataparser/util"
 )
 
-var (
-	OrganizationTableName = os.Getenv("ORGANIZATION_TABLE")
+type TableName int
+
+const (
+	ServerTable TableName = iota
+	OnboardingTable
+	CacheTable
+	EventTable
 )
 
-func InsertOnboarding(ctx context.Context, db *dynamodb.Client, org models.Onboarding) {
-	item, err := attributevalue.MarshalMap(org)
-	if err != nil {
-		log.Fatal(item)
-	}
+var tableNames = map[TableName]string{
+	ServerTable:     os.Getenv("SERVER_TABLE"),
+	OnboardingTable: os.Getenv("ORGANIZATION_TABLE"),
+	CacheTable:      os.Getenv("CACHE_TABLE"),
+	EventTable:      os.Getenv("EVENT_TABLE"),
+}
+
+func InsertItem(ctx context.Context, db *dynamodb.Client, table TableName, data any) {
+	item, err := attributevalue.MarshalMap(data)
+	util.CheckError(err)
 
 	input := dynamodb.PutItemInput{
-		TableName: &OrganizationTableName,
+		TableName: aws.String(tableNames[table]),
 		Item:      item,
 	}
 
 	_, err = db.PutItem(ctx, &input)
-	if err != nil {
-		log.Fatal(err)
-	}
+	util.CheckError(err)
+	fmt.Printf("Inserted an item into %s\n", tableNames[table])
 }
+
+//func InsertOnboarding(ctx context.Context, db *dynamodb.Client, org models.Onboarding) {
+//	item, err := attributevalue.MarshalMap(org)
+//	util.CheckError(err)
+//
+//	input := dynamodb.PutItemInput{
+//		TableName: &OrganizationTableName,
+//		Item:      item,
+//	}
+//
+//	_, err = db.PutItem(ctx, &input)
+//	util.CheckError(err)
+//}

src/data_parser/main.go

@@ -4,35 +4,46 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"log"
 	"os"
 
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/umlcloudcomputing/immersion/dataparser/db"
 	"github.com/umlcloudcomputing/immersion/dataparser/models"
+	"github.com/umlcloudcomputing/immersion/dataparser/util"
 )
 
-func parseMessage(dbClient *dynamodb.Client, message string) {
+func filterMessage(dbClient *dynamodb.Client, message string) {
 	var parsedMessage models.Message[any]
 	err := json.Unmarshal([]byte(message), &parsedMessage)
-	if err != nil {
-		log.Fatal(err)
-	}
+	util.CheckError(err)
 
 	fmt.Printf("Parsed a message with the %s header\n", parsedMessage.Header)
 
+	ctx := context.TODO()
 	switch parsedMessage.Header {
+	case "club_information":
+		var informationData models.Message[models.ClubInformation]
+		err = json.Unmarshal([]byte(message), &informationData.Body)
+		util.CheckError(err)
+
+		db.InsertItem(ctx, dbClient, db.CacheTable, informationData)
 	case "onboarding":
 		var onboardingData models.Message[[]models.Onboarding]
 		err = json.Unmarshal([]byte(message), &onboardingData)
-		if err != nil {
-			log.Fatal(err)
+		util.CheckError(err)
+
+		for _, i := range onboardingData.Body {
+			db.InsertItem(ctx, dbClient, db.OnboardingTable, i)
 		}
+	case "event":
+		var eventData models.Message[[]models.Event]
+		err = json.Unmarshal([]byte(message), &eventData)
+		util.CheckError(err)
 
-		for _, v := range onboardingData.Body {
-			db.InsertOnboarding(context.TODO(), dbClient, v)
+		for _, i := range eventData.Body {
+			db.InsertItem(ctx, dbClient, db.EventTable, i)
 		}
 	}
 }
@@ -41,9 +52,7 @@ func main() {
 	queueUrl := os.Getenv("QUEUE_URL")
 
 	cfg, err := config.LoadDefaultConfig(context.TODO())
-	if err != nil {
-		log.Fatal(err)
-	}
+	util.CheckError(err)
 
 	sqsClient := sqs.NewFromConfig(cfg)
 	dbClient := dynamodb.NewFromConfig(cfg)
@@ -53,32 +62,26 @@ func main() {
 		MaxNumberOfMessages: 5, // play around with these
 		WaitTimeSeconds:     5,
 	})
-	if err != nil {
-		log.Fatal(err)
-	}
+	util.CheckError(err)
 
 	// print and delete all messages in the queue
 	for len(response.Messages) > 0 {
 		for _, v := range response.Messages {
 
-			parseMessage(dbClient, *v.Body)
+			filterMessage(dbClient, *v.Body)
 			_, err = sqsClient.DeleteMessage(context.TODO(), &sqs.DeleteMessageInput{
 				QueueUrl:      &queueUrl,
 				ReceiptHandle: v.ReceiptHandle,
 			})
-			if err != nil {
-				log.Fatal(err)
-			}
+			util.CheckError(err)
 		}
 
 		response, err = sqsClient.ReceiveMessage(context.TODO(), &sqs.ReceiveMessageInput{
 			QueueUrl:            &queueUrl,
 			MaxNumberOfMessages: 5,
 			WaitTimeSeconds:     5,
 		})
-		if err != nil {
-			log.Fatal(err)
-		}
+		util.CheckError(err)
 	}
 
 	fmt.Println("Parsing complete, waiting to be killed.")

src/data_parser/models/models.go

@@ -12,3 +12,21 @@ type Onboarding struct {
 	ImageUrl       string `json:"ImageUrl" dynamodbav:"imageUrl"`
 	WebsiteKey     string `json:"WebsiteKey" dynamodbav:"websiteKey"`
 }
+
+type ClubInformation struct {
+	OrgId          int    `json:"OrgId" dynamodbav:"organizationId"`
+	Name           string `json:"Name" dynamodbav:"name"`
+	PrimaryContact string `json:"PrimaryContact" dynamodbav:"primaryContact"`
+	ImageUrl       string `json:"ImageUrl" dynamodbav:"imageUrl"`
+	WebsiteKey     string `json:"WebsiteKey" dynamodbav:"websiteKey"`
+	NumMembers     int    `json:"NumMembers" dynamodbav:"numMembers"`
+	Settings       string `json:"settings" dynamodbav:"settings"`
+}
+
+type Event struct {
+	LinkedOrgId int    `json:"LinkedOrgId" dynamodbav:"linkedOrgId"`
+	Name        string `json:"Name" dynamodbav:"name"`
+	Date        string `json:"Date" dynamodbav:"date"`
+	Time        string `json:"Time" dynamodbav:"time"`
+	Description string `json:"Description" dynamodbav:"description"`
+}

src/data_parser/util/util.go

@@ -0,0 +1,11 @@
+package util
+
+import (
+	"log"
+)
+
+func CheckError(err error) {
+	if err != nil {
+		log.Fatal(err)
+	}
+}