diff --git a/README.md b/README.md index 40c88581..f041887f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Project Overview -Börsibaar is a full-stack web application with a Spring Boot backend and Next.js frontend. It provides inventory management, transaction tracking, and price optimization features for stock bar themed events. There is also a public page for seeing drink prices in a format that is similar to the stock market. +Trying to stir up some conflictBörsibaar is a full-stack web application with a Spring Boot backend and Next.js frontend. It provides inventory management, transaction tracking, and price optimization features for stock bar themed events. There is also a public page for seeing drink prices in a format that is similar to the stock market. ## Architecture diff --git a/TEAM.md b/TEAM.md new file mode 100644 index 00000000..ce860fa5 --- /dev/null +++ b/TEAM.md @@ -0,0 +1,17 @@ +Team name: +team-06 + +Team members: +- Kristina B @megakrista +- Joonas K @JoMarkit +- Holger P @holgerpart +- Marju T @tammmarju +- Triinu M @triinum + +Mentor: +- Tavo A @kilpkonn + +Workflow: +All development is done in feature branches created from main. +Changes are merged into main via pull requests after review. +Pull requests are reviewed by at least one team member. diff --git a/backend/src/main/java/com/borsibaar/service/BarStationService.java b/backend/src/main/java/com/borsibaar/service/BarStationService.java index ced4bb64..31b44b86 100644 --- a/backend/src/main/java/com/borsibaar/service/BarStationService.java +++ b/backend/src/main/java/com/borsibaar/service/BarStationService.java @@ -49,7 +49,7 @@ public BarStationResponseDto createStation(Long organizationId, BarStationReques boolean nameExists = existingStations.stream() .anyMatch(s -> s.getName().equalsIgnoreCase(request.name())); if (nameExists) { - throw new DuplicateResourceException("A bar station with this name already exists"); + throw new DuplicateResourceException("Bar station with this name already exists"); } BarStation station = BarStation.builder() @@ -79,7 +79,7 @@ public BarStationResponseDto updateStation(Long organizationId, Long stationId, boolean nameExists = existingStations.stream() .anyMatch(s -> !s.getId().equals(stationId) && s.getName().equalsIgnoreCase(request.name())); if (nameExists) { - throw new DuplicateResourceException("A bar station with this name already exists"); + throw new DuplicateResourceException("Bar station with this name already exists"); } station.setName(request.name()); @@ -117,10 +117,10 @@ public void deleteStation(Long organizationId, Long stationId) { @Transactional(readOnly = true) public List getUserStations(UUID userId, Long organizationId) { User user = userRepository.findById(userId) - .orElseThrow(() -> new NotFoundException("User not found")); + .orElseThrow(() -> new NotFoundException("User was not found")); if (!user.getOrganizationId().equals(organizationId)) { - throw new BadRequestException("User does not belong to this organization"); + throw new BadRequestException("User " + userId + "Sdoes not belong to this organization"); } List userStations = user.getBarStations().stream().toList(); diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 61dae07c..14739158 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2475,6 +2475,7 @@ "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -2485,6 +2486,7 @@ "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "devOptional": true, "license": "MIT", + "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -2535,6 +2537,7 @@ "integrity": "sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.48.1", "@typescript-eslint/types": "8.48.1", @@ -3021,6 +3024,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3843,6 +3847,7 @@ "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", "license": "ISC", + "peer": true, "engines": { "node": ">=12" } @@ -4328,6 +4333,7 @@ "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -4501,6 +4507,7 @@ "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@rtsao/scc": "^1.1.0", "array-includes": "^3.1.9", @@ -6661,6 +6668,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.2.1.tgz", "integrity": "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -6670,6 +6678,7 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.1.tgz", "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==", "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -7458,6 +7467,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -7617,6 +7627,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver"