Merge pull request #31 from FontysResIT/development

Development
FontysResIT · Jun 2, 2022 · 42a713b · 42a713b
2 parents 8f7055d + 0be9190
commit 42a713b
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 32 deletions.
diff --git a/docs/Analysis - ResIT.pdf b/docs/Analysis - ResIT.pdf
diff --git a/docs/Design - ResIT.pdf b/docs/Design - ResIT.pdf
diff --git a/docs/DevOps - ResIT.pdf b/docs/DevOps - ResIT.pdf
diff --git a/docs/Ethics Report.pdf b/docs/Ethics Report.pdf
diff --git a/docs/Test Plan - ResIT.pdf b/docs/Test Plan - ResIT.pdf
diff --git a/docs/presentations/Sprint 2 Delivery Presentation.pdf b/docs/presentations/Sprint 2 Delivery Presentation.pdf
diff --git a/docs/presentations/Sprint 3 Delivery Presentation.pdf b/docs/presentations/Sprint 3 Delivery Presentation.pdf
diff --git a/docs/presentations/Sprint 4 Delivery Presentation.pdf b/docs/presentations/Sprint 4 Delivery Presentation.pdf
diff --git a/docs/Research Plan - ResIT.pdf → docs/research/Research Plan - ResIT.pdf b/docs/Research Plan - ResIT.pdf → docs/research/Research Plan - ResIT.pdf
diff --git a/docs/Research Report - ResIT.pdf → .../research/Research Report - Appsemble.pdf b/docs/Research Report - ResIT.pdf → .../research/Research Report - Appsemble.pdf
diff --git a/docs/research/Research Report - Enterprise Architecture.pdf b/docs/research/Research Report - Enterprise Architecture.pdf
diff --git a/src/config_api/Dockerfile b/src/config_api/Dockerfile
@@ -1,21 +1,23 @@
-FROM golang:1.18.0-alpine as builder
+FROM golang:1.18.2-buster as builder
 
 ENV GO111MODULE=on
 WORKDIR /app
 COPY . .
 
-RUN apk --no-cache add git alpine-sdk build-base gcc
-
+# RUN apk --no-cache add git alpine-sdk build-base gcc
+RUN apt-get install -y ca-certificates
 RUN go get
 
-RUN go install github.com/swaggo/swag/cmd/swag@latest
-RUN swag init  --parseDependency --parseInternal
+# RUN go install github.com/swaggo/swag/cmd/swag@latest
+# RUN swag init  --parseDependency --parseInternal
 
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o ./build
+RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o ./build
 
-FROM scratch AS final
+FROM debian:10.3-slim AS final
 
 COPY --from=builder /app/build build
-COPY --from=builder /app/docs docs
-
+# COPY --from=builder /app/docs docs
+# COPY --from=builder /app/public public
+COPY --from=builder /etc/ssl/certs /etc/ssl/certs
 CMD ["/build"]
+
diff --git a/src/reservation_api/Dockerfile b/src/reservation_api/Dockerfile
@@ -5,18 +5,18 @@ WORKDIR /app
 COPY . .
 
 # RUN apk --no-cache add git alpine-sdk build-base gcc
-
+RUN apt-get install -y ca-certificates
 RUN go get
 
-RUN go install github.com/swaggo/swag/cmd/swag@latest
-RUN swag init  --parseDependency --parseInternal
+# RUN go install github.com/swaggo/swag/cmd/swag@latest
+# RUN swag init  --parseDependency --parseInternal
 
 RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o ./build
 
 FROM debian:10.3-slim AS final
 
 COPY --from=builder /app/build build
-COPY --from=builder /app/docs docs
-COPY --from=builder /app/public public
-
+# COPY --from=builder /app/docs docs
+# COPY --from=builder /app/public public
+COPY --from=builder /etc/ssl/certs /etc/ssl/certs
 CMD ["/build"]
diff --git a/src/reservation_api/repository/mongodb/reservation_repository.go b/src/reservation_api/repository/mongodb/reservation_repository.go
@@ -30,26 +30,13 @@ func (repo *MongoDBReservation) All() []model.ReservationReadDTO {
 	lookup2 := bson.D{{Key: "$lookup", Value: bson.D{{Key: "from", Value: "timeslots"}, {Key: "localField", Value: "datetime_slot.time_slot"}, {Key: "foreignField", Value: "_id"}, {Key: "as", Value: "datetime_slot.time_slot"}}}}
 	unwind2 := bson.D{{Key: "$unwind", Value: bson.D{{Key: "path", Value: "$datetime_slot.time_slot"}, {Key: "preserveNullAndEmptyArrays", Value: false}}}}
 	collection := repo.db.Collection("reservations")
-	//result, err := collection.Find(context.TODO(), bson.D{})
 	result, err := collection.Aggregate(context.TODO(), mongo.Pipeline{lookup, unwind, lookup2, unwind2})
 	if err != nil {
 		log.Error(err)
 	}
-	// for result.Next(context.TODO()) {
-
-	// 	// create a value into which the single document can be decoded
-	// 	var elem model.Reservation
-	// 	err := result.Decode(&elem)
-	// 	if err != nil {
-	// 		fmt.Println(err)
-	// 	}
-
-	// 	reservations = append(reservations, elem)
-	// }
 	if err = result.All(context.TODO(), &reservations); err != nil {
 		log.Error(err)
 	}
-	fmt.Println(reservations)
 	return reservations
 }
 

diff --git a/src/reservation_api/util/rewrite/convert_to_json.go b/src/reservation_api/util/rewrite/convert_to_json.go
@@ -2,7 +2,6 @@ package rewrite
 
 import (
 	"encoding/json"
-	"log"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -80,14 +79,12 @@ func StructToJson(res model.ReservationReadDTO) ([]byte, []byte) {
 	sr, sc := ReservationToModels(res)
 	final_res, err := json.Marshal(sr)
 	if err != nil {
-		log.Println("test_res", err)
 		return nil, nil
 	}
 	final_custs, err := json.Marshal(sc)
 	if err != nil {
-		log.Println("test_cust", err)
 		return nil, nil
 	}
-	log.Println("Test reservation:", string(final_res), "Test customers:", string(final_custs))
+
 	return final_res, final_custs
 }