SS-885 removed copied Mutexes

server/httpserver.go

@@ -26,10 +26,10 @@ func GetStockbyItemUUID(w http.ResponseWriter, req *http.Request) {
 	storagename := req.Form.Get("storagename")
 	var request interface{}
 
-	request = oc.RequestObject{Itemuuid: itemuuid, Storagename: storagename, Client: uuid}
-	parsedRequest := request.(oc.RequestObject)
+	request = &oc.RequestObject{Itemuuid: itemuuid, Storagename: storagename, Client: uuid}
+	parsedRequest := request.(*oc.RequestObject)
 	if auth {
-		response = oh.GetStockbyItemAndStorageName(context.Background(), &parsedRequest)
+		response = oh.GetStockbyItemAndStorageName(context.Background(), parsedRequest)
 	} else {
 		response = AccessDeniedResponse()
 	}
@@ -45,10 +45,10 @@ func GetStockbyItemnumber(w http.ResponseWriter, req *http.Request) {
 	storagename := req.Form.Get("storagename")
 	var request interface{}
 
-	request = oc.RequestObject{Itemnumber: itemuuid, Storagename: storagename, Client: uuid}
-	parsedRequest := request.(oc.RequestObject)
+	request = &oc.RequestObject{Itemnumber: itemuuid, Storagename: storagename, Client: uuid}
+	parsedRequest := request.(*oc.RequestObject)
 	if auth {
-		response = oh.GetStockbyItemAndStorageName(context.Background(), &parsedRequest)
+		response = oh.GetStockbyItemAndStorageName(context.Background(), parsedRequest)
 	} else {
 		response = AccessDeniedResponse()
 	}
@@ -56,7 +56,7 @@ func GetStockbyItemnumber(w http.ResponseWriter, req *http.Request) {
 }
 
 func GetFreeStorageplaces(w http.ResponseWriter, req *http.Request) {
-	var response oc.StorageplaceResponse
+	var response *oc.StorageplaceResponse
 	uuid := clientUUIDFromHeader(req)
 	pkFromUuid, err := backend.GetPkFromUuid(uuid)
 	if err != nil {
@@ -72,18 +72,18 @@ func GetFreeStorageplaces(w http.ResponseWriter, req *http.Request) {
 
 	var request interface{}
 
-	request = oc.RequestObject{
+	request = &oc.RequestObject{
 		Itemuuid:    "",
 		Itemnumber:  itemnumber,
 		Storagename: storagename,
 		Client:      uuid,
 		Quantity:    int64(quantityInt),
 	}
-	parsedRequest := request.(oc.RequestObject)
+	parsedRequest := request.(*oc.RequestObject)
 	if auth {
-		response = *oh.GetFreeStorageplacesforItem(context.Background(), &parsedRequest, pkFromUuid)
+		response = oh.GetFreeStorageplacesforItem(context.Background(), parsedRequest, pkFromUuid)
 	} else {
-		response = *AccessDeniedStorageplaceResponse()
+		response = AccessDeniedStorageplaceResponse()
 	}
 	sendStorageplaceResponse(w, response)
 }
@@ -101,7 +101,7 @@ func PutStock(w http.ResponseWriter, req *http.Request) {
 
 	var request interface{}
 
-	request = oc.PutRequestObject{
+	request = &oc.PutRequestObject{
 		Itemuuid:    itemuuid,
 		Itemnumber:  "",
 		Storagename: "",
@@ -116,14 +116,13 @@ func PutStock(w http.ResponseWriter, req *http.Request) {
 		Quantity:    int64(quantityInt),
 	}
 	clientpk, _ := backend.GetPkFromUuid(uuid)
-	storageplaceResponse := *oh.GetFreeStorageplacesforItem(context.Background(), &requestObjectForStoragecalc, clientpk)
-	parsedRequest := request.(oc.PutRequestObject)
-	if len(storageplaceResponse.Storageplaces) > 0 {
+	storageplaceResponse := oh.GetFreeStorageplacesforItem(context.Background(), &requestObjectForStoragecalc, clientpk)
+	parsedRequest := request.(*oc.PutRequestObject)
+	if storageplaceResponse != nil && len(storageplaceResponse.Storageplaces) > 0 {
 		parsedRequest.Storagename = storageplaceResponse.Storageplaces[0].Name
-
 	}
 	if auth {
-		response = oh.PutStockForItemUUIDandStoraplace(context.Background(), &parsedRequest, authToken(req), uuid)
+		response = oh.PutStockForItemUUIDandStoraplace(context.Background(), parsedRequest, authToken(req), uuid)
 	} else {
 		response = AccessDeniedResponse()
 	}
@@ -138,10 +137,10 @@ func GetSellableStockbyItemUUID(w http.ResponseWriter, req *http.Request) {
 	itemuuid, _ := mux.Vars(req)["itemuuid"]
 	var request interface{}
 
-	request = oc.RequestObject{Itemuuid: itemuuid, Client: uuid}
-	parsedRequest := request.(oc.RequestObject)
+	request = &oc.RequestObject{Itemuuid: itemuuid, Client: uuid}
+	parsedRequest := request.(*oc.RequestObject)
 	if auth {
-		response = oh.GetSellableStockbyItem(context.Background(), &parsedRequest)
+		response = oh.GetSellableStockbyItem(context.Background(), parsedRequest)
 	} else {
 		response = AccessDeniedResponse()
 	}
@@ -156,10 +155,10 @@ func GetSellableStockbyItemnumber(w http.ResponseWriter, req *http.Request) {
 	itemuuid, _ := mux.Vars(req)["itemnumber"]
 	var request interface{}
 
-	request = oc.RequestObject{Itemnumber: itemuuid, Client: uuid}
-	parsedRequest := request.(oc.RequestObject)
+	request = &oc.RequestObject{Itemnumber: itemuuid, Client: uuid}
+	parsedRequest := request.(*oc.RequestObject)
 	if auth {
-		response = oh.GetSellableStockbyItem(context.Background(), &parsedRequest)
+		response = oh.GetSellableStockbyItem(context.Background(), parsedRequest)
 	} else {
 		response = AccessDeniedResponse()
 	}
@@ -174,10 +173,10 @@ func GetReservedStockbyItemUUID(w http.ResponseWriter, req *http.Request) {
 	itemuuid, _ := mux.Vars(req)["itemuuid"]
 	var request interface{}
 
-	request = oc.RequestObject{Itemnumber: itemuuid, Client: uuid}
-	parsedRequest := request.(oc.RequestObject)
+	request = &oc.RequestObject{Itemnumber: itemuuid, Client: uuid}
+	parsedRequest := request.(*oc.RequestObject)
 	if auth {
-		response = oh.GetReservedStockbyItem(context.Background(), &parsedRequest)
+		response = oh.GetReservedStockbyItem(context.Background(), parsedRequest)
 	} else {
 		response = AccessDeniedResponse()
 	}
@@ -192,10 +191,10 @@ func GetReservedStockbyItemnumber(w http.ResponseWriter, req *http.Request) {
 	itemuuid, _ := mux.Vars(req)["itemnumber"]
 	var request interface{}
 
-	request = oc.RequestObject{Itemnumber: itemuuid, Client: uuid}
-	parsedRequest := request.(oc.RequestObject)
+	request = &oc.RequestObject{Itemnumber: itemuuid, Client: uuid}
+	parsedRequest := request.(*oc.RequestObject)
 	if auth {
-		response = oh.GetReservedStockbyItem(context.Background(), &parsedRequest)
+		response = oh.GetReservedStockbyItem(context.Background(), parsedRequest)
 	} else {
 		response = AccessDeniedResponse()
 	}
@@ -203,20 +202,20 @@ func GetReservedStockbyItemnumber(w http.ResponseWriter, req *http.Request) {
 }
 
 func GetItemStockOverview(w http.ResponseWriter, req *http.Request) {
-	var response oc.StockOverviewResponse
+	var response *oc.StockOverviewResponse
 	uuid := clientUUIDFromHeader(req)
 	auth, _ := hAuth.CanAccess(authToken(req), uuid)
 	req.ParseForm()
 	number, _ := mux.Vars(req)["itemnumber"]
 	var request interface{}
 
-	request = oc.RequestObject{Itemnumber: number, Client: uuid}
-	parsedRequest := request.(oc.RequestObject)
+	request = &oc.RequestObject{Itemnumber: number, Client: uuid}
+	parsedRequest := request.(*oc.RequestObject)
 	clientPk, _ := backend.GetPkFromUuid(uuid)
 	if auth {
-		response = *oh.GetItemStockOverview(&parsedRequest, clientPk)
+		response = oh.GetItemStockOverview(parsedRequest, clientPk)
 	} else {
-		response = *AccessDeniedStockOverviewResponse()
+		response = AccessDeniedStockOverviewResponse()
 	}
 	sendStockOverviewResponse(w, response)
 }
@@ -288,7 +287,7 @@ func sendStorageResponse(w http.ResponseWriter, response *oc.StorageResponse) {
 	w.Write(jsonString)
 }
 
-func sendStorageplaceResponse(w http.ResponseWriter, response oc.StorageplaceResponse) {
+func sendStorageplaceResponse(w http.ResponseWriter, response *oc.StorageplaceResponse) {
 	var status int
 	if response.Success == false {
 		switch response.ErrorType {
@@ -304,13 +303,13 @@ func sendStorageplaceResponse(w http.ResponseWriter, response oc.StorageplaceRes
 	} else {
 		status = http.StatusOK
 	}
-	json, _ := json.Marshal(response)
+	jsonString, _ := json.Marshal(response)
 
 	w.WriteHeader(status)
-	w.Write(json)
+	w.Write(jsonString)
 }
 
-func sendStockOverviewResponse(w http.ResponseWriter, response oc.StockOverviewResponse) {
+func sendStockOverviewResponse(w http.ResponseWriter, response *oc.StockOverviewResponse) {
 	var status int
 	if response.Success == false {
 		switch response.ErrorType {
@@ -326,10 +325,10 @@ func sendStockOverviewResponse(w http.ResponseWriter, response oc.StockOverviewR
 	} else {
 		status = http.StatusOK
 	}
-	json, _ := json.Marshal(response)
+	jsonString, _ := json.Marshal(response)
 
 	w.WriteHeader(status)
-	w.Write(json)
+	w.Write(jsonString)
 }
 
 // swagger:response response

server/storagecalculation.go

@@ -12,7 +12,7 @@ import (
 const CALCULATION_PUFFER = 1.1
 
 func (oh *StockHandler) GetFreeStorageplacesforItem(ctx context.Context, requestObject *oc.RequestObject, client int) *oc.StorageplaceResponse {
-	var response oc.StorageplaceResponse
+	response := &oc.StorageplaceResponse{}
 	var freeStorageplaces []do.StorageplaceDto
 	storageplaceResponse, validationFailed := validateStorageplaceRequest(requestObject)
 	if validationFailed {
@@ -50,9 +50,9 @@ func (oh *StockHandler) GetFreeStorageplacesforItem(ctx context.Context, request
 	freeStorageplaces2 := oh.checkPlacesIfFreeEnough(volumeItem, freeStorageplaces)
 	freeStorageplaces3 := oh.checkSizesOfStorage(freeStorageplaces2, itemWidth, requestObject, itemHeight, itemLength)
 	if len(freeStorageplaces3) > 0 {
-		response = mapToStorageplaceResponse(freeStorageplaces3, response)
+		mapToStorageplaceResponse(freeStorageplaces3, response)
 		response.Success = true
-		return &response
+		return response
 	}
 
 	storageplaceDtosNoItem, errWithoutItems := oh.Db.GetStorageplacesWithItem(itemDto, true, requestObject.Storagename, client)
@@ -65,9 +65,9 @@ func (oh *StockHandler) GetFreeStorageplacesforItem(ctx context.Context, request
 	freeStorageplaces5 := oh.checkSizesOfStorage(freeStorageplaces4, itemWidth, requestObject, itemHeight, itemLength)
 
 	if len(freeStorageplaces5) > 0 {
-		response = mapToStorageplaceResponse(freeStorageplaces5, response)
+		mapToStorageplaceResponse(freeStorageplaces5, response)
 		response.Success = true
-		return &response
+		return response
 	}
 
 	storageplaceDtosEmpty, errEmpty := oh.Db.GetFreeStorageplaces(requestObject.Storagename, client)
@@ -79,15 +79,15 @@ func (oh *StockHandler) GetFreeStorageplacesforItem(ctx context.Context, request
 	freeStorageplaces6 := oh.checkPlacesIfFreeEnough(volumeItem, freeStorageplacesFit)
 	freeStorageplaces7 := oh.checkSizesOfStorage(freeStorageplaces6, itemWidth, requestObject, itemHeight, itemLength)
 	if len(freeStorageplaces7) > 0 {
-		response = mapToStorageplaceResponse(freeStorageplaces7, response)
+		mapToStorageplaceResponse(freeStorageplaces7, response)
 		response.Success = true
-		return &response
+		return response
 	}
 
 	response.Success = false
 	response.ErrorMessage = "No storageplaces can be found"
 	response.ErrorType = "NoData"
-	return &response
+	return response
 }
 
 func (oh *StockHandler) checkSizesOfStorage(freeStorageplaces []do.StorageplaceDto, itemWidth float32, requestObject *oc.RequestObject, itemHeight float32, itemLength float32) []do.StorageplaceDto {
@@ -122,7 +122,7 @@ func validateStorageplaceRequest(requestObject *oc.RequestObject) (*oc.Storagepl
 	return nil, false
 }
 
-func mapToStorageplaceResponse(freeStorageplaces []do.StorageplaceDto, response oc.StorageplaceResponse) oc.StorageplaceResponse {
+func mapToStorageplaceResponse(freeStorageplaces []do.StorageplaceDto, response *oc.StorageplaceResponse) {
 	var responsePlaces []*oc.Storageplace
 	for _, storageplaceDto := range freeStorageplaces {
 		uuidfromPk, err := backend.GetUuidfromPk(storageplaceDto.Pk)
@@ -143,7 +143,6 @@ func mapToStorageplaceResponse(freeStorageplaces []do.StorageplaceDto, response
 		responsePlaces = append(responsePlaces, &mapped)
 	}
 	response.Storageplaces = responsePlaces
-	return response
 }
 
 func (oh *StockHandler) checkPlacesIfFreeEnough(volumeItem float32, freeStorageplaces []do.StorageplaceDto) []do.StorageplaceDto {