Change UserId to name when set_in_for another user

cmd/telegram/http/main.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/col/whosinbot/dynamodb"
-	whttp "github.com/col/whosinbot/http"
-	"github.com/col/whosinbot/whosinbot"
+	"whosinbot/dynamodb"
+	whttp "whosinbot/http"
+	"whosinbot/whosinbot"
 	"net/http"
 )
 

cmd/telegram/lambda/main.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"github.com/aws/aws-lambda-go/events"
 	"github.com/aws/aws-lambda-go/lambda"
-	"github.com/col/whosinbot/dynamodb"
-	"github.com/col/whosinbot/telegram"
-	"github.com/col/whosinbot/whosinbot"
+	"whosinbot/dynamodb"
+	"whosinbot/telegram"
+	"whosinbot/whosinbot"
 	"log"
 	"strings"
 )

domain/types.go

@@ -29,7 +29,7 @@ func (c Command) ParamsStringExceptFirst() string {
 }
 
 type User struct {
-	UserID int64
+	UserID string
 	Name   string
 }
 
@@ -82,17 +82,21 @@ func (r *RollCall) AddResponse(response RollCallResponse) {
 
 type RollCallResponse struct {
 	ChatID int64
-	UserID int64
+	UserID string
 	Name   string
 	Status string
 	Reason string
 	Date   time.Time
 }
 
-func NewRollCallResponse(command Command, name string, status string, reason string) RollCallResponse {
+func NewRollCallResponse(command Command, name string, status string, reason string, isSetStatusFor bool) RollCallResponse {
+	var userId = command.From.UserID
+	if isSetStatusFor {
+		userId = name
+	}
 	return RollCallResponse{
 		ChatID: command.ChatID,
-		UserID: command.From.UserID,
+		UserID: userId,
 		Name:   name,
 		Status: status,
 		Reason: reason,

dynamodb/data_store.go

@@ -4,7 +4,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/dynamodb"
-	"github.com/col/whosinbot/domain"
+	"whosinbot/domain"
 	"log"
 	"os"
 	"sort"
@@ -139,11 +139,6 @@ func (d DynamoDataStore) getRollCallResponses(chatID int64) ([]domain.RollCallRe
 
 	var responses = []domain.RollCallResponse{}
 	for _, item := range result.Items {
-		userID, err := strconv.Atoi(*item["user_id"].N)
-		if err != nil {
-			log.Println(err.Error())
-			return nil, err
-		}
 
 		reason := *item["reason"].S
 		if reason == EmptyString {
@@ -159,7 +154,7 @@ func (d DynamoDataStore) getRollCallResponses(chatID int64) ([]domain.RollCallRe
 
 		response := domain.RollCallResponse{
 			ChatID: chatID,
-			UserID: int64(userID),
+			UserID: *item["user_id"].S,
 			Name:   *item["name"].S,
 			Status: *item["status"].S,
 			Reason: reason,
@@ -322,13 +317,13 @@ func getRollCallKey(chatID int64) map[string]*dynamodb.AttributeValue {
 	}
 }
 
-func getResponseKey(chatID int64, userID int64) map[string]*dynamodb.AttributeValue {
+func getResponseKey(chatID int64, userID string) map[string]*dynamodb.AttributeValue {
 	return map[string]*dynamodb.AttributeValue{
 		"chat_id": {
 			N: aws.String(strconv.Itoa(int(chatID))),
 		},
 		"user_id": {
-			N: aws.String(strconv.Itoa(int(userID))),
+			N: aws.String(userID),
 		},
 	}
 }

dynamodb/data_store_test.go

@@ -2,7 +2,7 @@ package dynamodb
 
 import (
 	"github.com/aws/aws-sdk-go/service/dynamodb"
-	"github.com/col/whosinbot/domain"
+	"whosinbot/domain"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

http/webhook_handler.go

@@ -1,8 +1,8 @@
 package http
 
 import (
-	"github.com/col/whosinbot/telegram"
-	"github.com/col/whosinbot/whosinbot"
+	"whosinbot/telegram"
+	"whosinbot/whosinbot"
 	"io/ioutil"
 	"net/http"
 	"os"

serverless.yml

@@ -93,7 +93,7 @@ resources:
             AttributeType: N
           -
             AttributeName: user_id
-            AttributeType: N
+            AttributeType: S
         KeySchema:
           -
             AttributeName: chat_id

telegram/helpers.go

@@ -2,9 +2,10 @@ package telegram
 
 import (
 	"encoding/json"
-	"github.com/col/whosinbot/domain"
+	"whosinbot/domain"
 	"gopkg.in/telegram-bot-api.v4"
 	"strings"
+	"strconv"
 )
 
 func ParseUpdate(requestBody []byte) (domain.Command, error) {
@@ -19,7 +20,7 @@ func ParseUpdate(requestBody []byte) (domain.Command, error) {
 		Name:   update.Message.Command(),
 		Params: strings.Fields(update.Message.CommandArguments()),
 		From: domain.User{
-			UserID: int64(update.Message.From.ID),
+			UserID: strconv.Itoa(update.Message.From.ID),
 			Name:   update.Message.From.FirstName,
 		},
 	}

telegram/telegram.go

@@ -3,7 +3,7 @@ package telegram
 import (
 	"errors"
 	"fmt"
-	"github.com/col/whosinbot/domain"
+	"whosinbot/domain"
 	"gopkg.in/telegram-bot-api.v4"
 	"os"
 )

whosinbot/whos_in_bot.go

@@ -2,7 +2,7 @@ package whosinbot
 
 import (
 	"fmt"
-	"github.com/col/whosinbot/domain"
+	"whosinbot/domain"
 	"log"
 	"strings"
 )
@@ -130,17 +130,17 @@ func (b *WhosInBot) handleWhosIn(command domain.Command) (*domain.Response, erro
 }
 
 func (b *WhosInBot) handleResponse(command domain.Command, status string) (*domain.Response, error) {
-	return b.setAttendanceFor(command, command.From.Name, status, command.ParamsString())
+	return b.setAttendanceFor(command, command.From.Name, status, command.ParamsString(), false)
 }
 
 func (b *WhosInBot) handleResponseFor(command domain.Command, status string) (*domain.Response, error) {
 	if len(command.FirstParam()) == 0 {
 		return &domain.Response{ChatID: command.ChatID, Text: "Please provide the persons first name."}, nil
 	}
-	return b.setAttendanceFor(command, command.FirstParam(), status, command.ParamsStringExceptFirst())
+	return b.setAttendanceFor(command, command.FirstParam(), status, command.ParamsStringExceptFirst(), true)
 }
 
-func (b *WhosInBot) setAttendanceFor(command domain.Command, name string, status string, reason string) (*domain.Response, error) {
+func (b *WhosInBot) setAttendanceFor(command domain.Command, name string, status string, reason string, isSetStatusFor bool) (*domain.Response, error) {
 	rollCall, err := b.DataStore.GetRollCall(command.ChatID)
 	if err != nil {
 		return nil, err
@@ -149,7 +149,7 @@ func (b *WhosInBot) setAttendanceFor(command domain.Command, name string, status
 		return &domain.Response{Text: "No roll call in progress", ChatID: command.ChatID}, nil
 	}
 
-	rollCallResponse := domain.NewRollCallResponse(command, name, status, reason)
+	rollCallResponse := domain.NewRollCallResponse(command, name, status, reason, isSetStatusFor)
 	b.DataStore.SetResponse(rollCallResponse)
 
 	err = b.DataStore.LoadRollCallResponses(rollCall)