Some cleanup, 404 for not found

Author: gsweene2

aws-golang-rest-api-with-dynamodb/serverless.yml

@@ -1,4 +1,3 @@
-org: garrettdsweeney
 app: aws-golang-rest-api-with-dynamodb
 service: aws-golang-rest-api-with-dynamodb
 

aws-golang-rest-api-with-dynamodb/todos/create.go

@@ -30,30 +30,38 @@ func Handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespo
 	// Create DynamoDB client
 	svc := dynamodb.New(sess)
 
+	// New uuid for item id
 	itemUuid := uuid.New().String()
 
 	fmt.Println("Generated new item uuid:", itemUuid)
 
+	// Unmarshal to Item to access object properties
 	itemString := request.Body
 	itemStruct := Item{}
 	json.Unmarshal([]byte(itemString), &itemStruct)
 
+	if itemStruct.Title == "" {
+		return events.APIGatewayProxyResponse{StatusCode: 400}, nil
+	}
+
+	// Create new item of type item
 	item := Item{
 		Id:      itemUuid,
 		Title:   itemStruct.Title,
 		Details: itemStruct.Details,
 	}
 
+	// Marshal to dynamobb item
 	av, err := dynamodbattribute.MarshalMap(item)
 	if err != nil {
 		fmt.Println("Error marshalling item: ", err.Error())
-		return events.APIGatewayProxyResponse{Body: "Yikes", StatusCode: 500}, nil
+		return events.APIGatewayProxyResponse{StatusCode: 500}, nil
 	}
 
 	tableName := os.Getenv("DYNAMODB_TABLE")
 
+	// Build put item input
 	fmt.Println("Putting item: %v", av)
-
 	input := &dynamodb.PutItemInput{
 		Item:      av,
 		TableName: aws.String(tableName),
@@ -65,15 +73,16 @@ func Handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespo
 	// Checking for errors, return error
 	if err != nil {
 		fmt.Println("Got error calling PutItem: ", err.Error())
-		return events.APIGatewayProxyResponse{Body: "Yikes", StatusCode: 500}, nil
+		return events.APIGatewayProxyResponse{StatusCode: 500}, nil
 	}
 
-	item_marshalled, err := json.Marshal(item)
+	// Marshal item to return
+	itemMarshalled, err := json.Marshal(item)
 
-	fmt.Println("Returning item: ", string(item_marshalled))
+	fmt.Println("Returning item: ", string(itemMarshalled))
 
 	//Returning response with AWS Lambda Proxy Response
-	return events.APIGatewayProxyResponse{Body: string(item_marshalled), StatusCode: 200}, nil
+	return events.APIGatewayProxyResponse{Body: string(itemMarshalled), StatusCode: 200}, nil
 }
 
 func main() {

aws-golang-rest-api-with-dynamodb/todos/delete.go

@@ -44,7 +44,7 @@ func Handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespo
 	// Checking for errors, return error
 	if err != nil {
 		fmt.Println("Got error calling DeleteItem: ", err.Error())
-		return events.APIGatewayProxyResponse{Body: "Yikes", StatusCode: 500}, nil
+		return events.APIGatewayProxyResponse{StatusCode: 500}, nil
 	}
 
 	return events.APIGatewayProxyResponse{StatusCode: 204}, nil

aws-golang-rest-api-with-dynamodb/todos/get.go

@@ -47,9 +47,14 @@ func Handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespo
 	// Checking for errors, return error
 	if err != nil {
 		fmt.Println(err.Error())
-		return events.APIGatewayProxyResponse{Body: "Yikes", StatusCode: 500}, nil
+		return events.APIGatewayProxyResponse{StatusCode: 500}, nil
 	}
 
+	// Checking type
+	if len(result.Item) == 0 {
+        return events.APIGatewayProxyResponse{StatusCode: 404}, nil
+    }
+
 	// Created item of type Item
 	item := Item{}
 

aws-golang-rest-api-with-dynamodb/todos/list.go

@@ -40,7 +40,7 @@ func Handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespo
 	// Checking for errors, return error
 	if err != nil {
 		fmt.Println("Query API call failed: ", err.Error())
-		return events.APIGatewayProxyResponse{Body: "Yikes", StatusCode: 500}, nil
+		return events.APIGatewayProxyResponse{StatusCode: 500}, nil
 	}
 
 	var itemArray []Item
@@ -55,7 +55,7 @@ func Handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespo
 
 		if err != nil {
 			fmt.Println("Got error unmarshalling: ", err.Error())
-			return events.APIGatewayProxyResponse{Body: "Yikes", StatusCode: 500}, nil
+			return events.APIGatewayProxyResponse{StatusCode: 500}, nil
 		}
 
 		itemArray = append(itemArray, item)
@@ -66,7 +66,7 @@ func Handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespo
 	itemArrayString, err := json.Marshal(itemArray)
 	if err != nil {
 		fmt.Println("Got error marshalling result: ", err.Error())
-		return events.APIGatewayProxyResponse{Body: "Yikes", StatusCode: 500}, nil
+		return events.APIGatewayProxyResponse{StatusCode: 500}, nil
 	}
 
 	return events.APIGatewayProxyResponse{Body: string(itemArrayString), StatusCode: 200}, nil

aws-golang-rest-api-with-dynamodb/todos/update.go

@@ -68,10 +68,10 @@ func Handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespo
 	// Checking for errors, return error
 	if err != nil {
 		fmt.Println(err.Error())
-		return events.APIGatewayProxyResponse{Body: "Yikes", StatusCode: 500}, nil
+		return events.APIGatewayProxyResponse{StatusCode: 500}, nil
 	}
 
-	return events.APIGatewayProxyResponse{Body: string("Done"), StatusCode: 200}, nil
+	return events.APIGatewayProxyResponse{StatusCode: 204}, nil
 }
 
 func main() {