use scanner

modules/utils/globals.go

@@ -33,6 +33,7 @@ const (
 	SentCmdUpdateAllUsersUserAvatar = 10
 	SentCmdNewScanner               = 11
 	SentCmdDeleteScanner            = 12
+	SentCmdUpdateScannerUsedBy      = 13
 )
 
 // commands received from web clients

routers/router/api/v1/jxscanner/scanner.go

@@ -102,3 +102,29 @@ func DeleteScanner(c *fiber.Ctx) error {
 
 	return c.SendStatus(fiber.StatusOK)
 }
+
+func UpdateScannerUsedByUserId(c *fiber.Ctx) error {
+	scannerId := c.Params("scannerId")
+
+	if len(scannerId) != 36 {
+		log.Error().Msgf("Error parsing scanner id: %v", scannerId)
+		return c.SendStatus(fiber.StatusBadRequest)
+	}
+
+	usedByUserId := c.Locals("userId").(string)
+
+	database.DB.Model(&structs.Scanner{}).Where("id = ?", scannerId).Updates(structs.Scanner{UsedByUserId: usedByUserId})
+
+	socketclients.BroadcastMessage(structs.SendSocketMessage{
+		Cmd: utils.SentCmdUpdateScannerUsedBy,
+		Body: struct {
+			ScannerId    string
+			UsedByUserId string
+		}{
+			ScannerId:    scannerId,
+			UsedByUserId: usedByUserId,
+		},
+	})
+
+	return c.SendStatus(fiber.StatusOK)
+}

routers/router/api/v1/user/auth.go

@@ -65,8 +65,6 @@ func UserLogin(c *fiber.Ctx) error {
 		UserId:        user.Id,
 		UserAgent:     string(c.Context().UserAgent())})
 
-	log.Info().Msg("Login user: " + user.Email)
-
 	return c.JSON(structs.UserLoginResponse{Session: session})
 }
 

routers/router/api/v1/user/avatar.go

@@ -15,8 +15,6 @@ import (
 )
 
 func UpdateAvatar(c *fiber.Ctx) error {
-	log.Info().Msg("update avatar")
-
 	fileHeader, err := c.FormFile("file")
 
 	if err != nil {
@@ -29,14 +27,10 @@ func UpdateAvatar(c *fiber.Ctx) error {
 		return c.SendStatus(fiber.StatusRequestEntityTooLarge)
 	}
 
-	log.Debug().Msgf("userid", c.Locals("userId"))
-
 	user := structs.User{Id: c.Locals("userId").(string)}
 
 	database.DB.First(&user)
 
-	log.Debug().Msgf("Found user %s", user.Avatar)
-
 	if user.Avatar != "" {
 		os.Remove("./public/avatars/" + user.Avatar)
 	}

routers/router/router.go

@@ -23,6 +23,7 @@ func SetupRoutes(app *fiber.App) {
 	s.Post("/", jxscanner.AddScanner)
 	s.Post("/scan", scannerSessionValidation, jxscanner.ScanResult)
 	s.Delete("/", scannerSessionValidation, jxscanner.DeleteScanner)
+	s.Patch("/:scannerId", userSessionValidation, jxscanner.UpdateScannerUsedByUserId)
 
 	app.Static("/", "./public")
 }