Merge branch 'main' into feature/PizzaPriceRestock

CETEN-OpenBar · Dec 20, 2024 · cb5a5f1 · cb5a5f1
2 parents ba3c8f6 + fda83fa
commit cb5a5f1
Show file tree

Hide file tree

Showing 22 changed files with 2,200 additions and 1,499 deletions.
diff --git a/backend/api/restock.go b/backend/api/restock.go
@@ -76,7 +76,6 @@ func (s *Server) CreateRestock(c echo.Context) error {
 			CreatedBy:     usr.Id,
 			CreatedByName: usr.Name(),
 		},
-		CreatedAt: time.Now().Unix(),
 	}
 
 	_, err = s.DBackend.WithTransaction(c.Request().Context(), func(ctx mongo.SessionContext) (interface{}, error) {

diff --git a/backend/autogen/bar.gen.go b/backend/autogen/bar.gen.go
diff --git a/backend/internal/db/mongo/restock_crud.go b/backend/internal/db/mongo/restock_crud.go
@@ -14,7 +14,7 @@ func (b *Backend) CreateRestock(ctx context.Context, tx *models.Restock) error {
 	ctx, cancel := b.TimeoutContext(ctx)
 	defer cancel()
 
-	tx.CreatedAt = time.Now().Unix()
+	tx.CreatedAt = uint64(time.Now().Unix())
 
 	_, err := b.db.Collection(RestocksCollection).InsertOne(ctx, tx)
 	if err != nil {

diff --git a/backend/internal/models/restocks.go b/backend/internal/models/restocks.go
@@ -11,8 +11,6 @@ type (
 	Restock struct {
 		PrivateID       primitive.ObjectID `bson:"_id,omitempty" json:"-"`
 		autogen.Restock `bson:",inline"`
-
-		CreatedAt int64 `bson:"created_at" json:"created_at"`
 	}
 )
 

diff --git a/bar.openapi.yml b/bar.openapi.yml
@@ -4806,8 +4806,8 @@ components:
       example: student
       enum:
         - coutant
-        - privilegies
         - staff_bar
+        - privilegies
         - menu
         - ceten
         - externe

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,37 +1,41 @@
 # flake.nix
 {
-  inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; };
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
 
-  outputs = { nixpkgs, ... }:
+  outputs =
+    { nixpkgs, ... }:
     let
       system = "x86_64-linux";
       #       ↑ Swap it for your system if needed
       #       "aarch64-linux" / "x86_64-darwin" / "aarch64-darwin"
 
       pkgs = nixpkgs.legacyPackages.${system};
-    in {
+    in
+    {
       devShells.${system}.default =
         pkgs.mkShell # .override { stdenv = pkgs.clangStdenv; } # for C dev
-        {
-          packages = with pkgs; [
-            # svelte dev
-            nodejs
-            nodePackages.typescript
-            nodePackages.typescript-language-server
-            nodePackages_latest.svelte-language-server
+          {
+            packages = with pkgs; [
+              # svelte dev
+              nodejs
+              nodePackages.typescript
+              nodePackages.typescript-language-server
+              nodePackages_latest.svelte-language-server
+              nodePackages_latest.svelte-check
 
-            #go dev
-            go
-            gopls
-            gofumpt
+              #go dev
+              go
+              gopls
+              gofumpt
 
-            go-task
+              go-task
 
-            #openapicli
-            openapi-generator-cli
-          ];
-          shellHook = "";
-        };
+              openapi-generator-cli
+            ];
+            shellHook = "";
+          };
 
     };
 }