Updating handin

HANDIN.md

@@ -0,0 +1,44 @@
+# HANDIN for Git Collaboration Exercise
+
+## Links to PR-s:
+- [PR 1] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/1
+- [PR 2] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/2
+- [PR 3] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/3 (CLOSED)
+- [PR 4] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/4 (CLOSED)
+- [PR 5] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/5
+- [PR 6] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/6
+- [PR 7] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/7
+- [PR 8] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/8 (CLOSED)
+- [PR 9] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/9 (CLOSED)
+- [PR 10] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/10
+- [PR 11] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/11
+- [PR 12] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/12 (CLOSED)
+- [PR 13] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/13
+- [PR 14] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/14 (CLOSED)
+- [PR 15] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/15
+- [PR 16] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/16
+- [PR 17] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/17
+- [PR 18] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/18
+- [PR 19] https://github.com/taltech-vanemarendajaks/borsibaar-team12/pull/19
+
+## What each team member worked on
+Each teammember worked on creating feature branches, making commits and pull requests.
+
+We collaborated on .md files, intentionally created conflicts, and resolved them. We also experimented with different merge strategies using the VS Code terminal.
+
+## Explanation of the conflict you had and how it was resolved
+
+During our collaboration, we encountered several merge conflicts while working on the same TEAM.md file. 
+For instance, two team members edited the same section of a file simultaneously, leading to a conflict when merging their changes.
+
+## Strategies used to merge:
+Made in terminal, as well as in Github web interface:
+
+* a regular merge commit - just to commit sth
+* a squash merge - to take some commits together into one
+* a rebase-based merge - to keep history straight line
+
+Just to see how they differ in the commit history, and to practice using different methods.
+
+![2-1.png](public/team12_pictures/2_1.png)
+![2-6.png](public/team12_pictures/2_6.png)

TEAM.md

@@ -0,0 +1,55 @@
+# TalTech course "Vanemarendajaks 2026"
+
+## Teamname: 
+- Team-12
+
+## Team-members:
+
+- Eleri (ellucy)
+- Katlin (kat-lin)
+- Mari (marisaarevali)
+- Tiit (eriktiit)
+- Mihkel (vahermihkel)
+
+## Team Workflow Description
+
+### Branching strategy to organize collaboration
+
+**Main branches:**
+
+* main – holds the final production-ready version.
+
+* develop – integration branch for all completed features before final merge to main.
+
+**Feature branches:**
+
+* Each team member created (or creates) their own branch from develop, e.g., feature/homework1-katlin.
+* All feature development has been (and will be) done in these isolated branches.
+
+**Code review rules:**
+
+* Before merging into develop, each team member creates a pull request.
+* Another team member reviews the code and provides feedback or approval.
+
+## Team description:
+We are a diverse group of individuals with a shared passion for technology and innovation.
+Our team combines expertise in software development, design, and project management to deliver high-quality solutions.
+We value collaboration, creativity, and continuous learning, striving to push the boundaries of what's possible in our projects.
+
+Tere Maailm!
+Hello world!
+
+## Which merge strategies you used
+
+We used all three strategies:
+* regular merge
+* squash merge
+* rebase merge
+
+## Why we chose them
+
+We wanted to try them all for practice
+
+## What problems you encountered
+
+We had a lot of conflicts and mistakes by making pull requests to the wrong branches.

backend/src/main/java/com/borsibaar/service/SalesService.java

@@ -1,10 +1,8 @@
 package com.borsibaar.service;
 
 import com.borsibaar.dto.*;
-import com.borsibaar.entity.Category;
-import com.borsibaar.entity.Inventory;
-import com.borsibaar.entity.InventoryTransaction;
-import com.borsibaar.entity.Product;
+import com.borsibaar.entity.*;
+import com.borsibaar.repository.BarStationRepository;
 import com.borsibaar.repository.InventoryRepository;
 import com.borsibaar.repository.InventoryTransactionRepository;
 import com.borsibaar.repository.ProductRepository;
@@ -28,6 +26,7 @@ public class SalesService {
         private final InventoryRepository inventoryRepository;
         private final InventoryTransactionRepository inventoryTransactionRepository;
         private final ProductRepository productRepository;
+        private final BarStationRepository barStationRepository;
 
         @Transactional
         public SaleResponseDto processSale(SaleRequestDto request, UUID userId, Long organizationId) {
@@ -37,10 +36,16 @@ public SaleResponseDto processSale(SaleRequestDto request, UUID userId, Long org
                 List<SaleItemResponseDto> saleItems = new ArrayList<>();
                 BigDecimal totalAmount = BigDecimal.ZERO;
 
+                BarStation station = barStationRepository
+                        .findByOrganizationIdAndId(organizationId, request.barStationId())
+                        .orElseThrow(() -> new ResponseStatusException(
+                                HttpStatus.FORBIDDEN,
+                                "Bar station does not belong to your organization"));
+
                 // Process each item in the sale
                 for (SaleItemRequestDto item : request.items()) {
                         SaleItemResponseDto saleItem = processSaleItem(item, userId, organizationId, saleId,
-                                        request.barStationId());
+                                        station.getId());
                         saleItems.add(saleItem);
                         totalAmount = totalAmount.add(saleItem.totalPrice());
                 }

frontend/package.json

@@ -20,7 +20,7 @@
     "clsx": "^2.1.1",
     "d3": "^7.9.0",
     "lucide-react": "^0.544.0",
-    "next": "^15.5.7",
+    "next": "^15.5.9",
     "react": "^19.1.1",
     "react-dom": "^19.2.1",
     "swr": "^2.3.6",