RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into web-products

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-03-30 09:50:57 -06:00
parent 00c5198c47 686bf1793f
commit 84c70a1568
140 changed files with 7952 additions and 1650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/resources/application.yml
View File

@@ -36,6 +36,7 @@ spring:
server:
port: ${SERVER_PORT:8080}
address: ${SERVER_ADDRESS:0.0.0.0}
servlet:
context-path: /

3
backend/src/main/resources/db/migration/V10__remove_debit_payment_method.sql Normal file
View File

@@ -0,0 +1,3 @@
UPDATE sale
SET paymentMethod = 'Card'
WHERE LOWER(paymentMethod) = 'debit';

6
backend/src/main/resources/db/migration/V2__seed_data.sql
View File

@@ -128,7 +128,7 @@ VALUES
('2026-01-05 09:15:00', 125.00, 'Card', 1, 1, 1),
('2026-01-08 11:30:00', 200.00, 'Card', 2, 1, 2),
('2026-01-12 14:20:00', 60.00, 'Cash', 3, 2, 3),
('2026-01-15 10:45:00', 150.00, 'Debit', 1, 1, 1),
('2026-01-15 10:45:00', 150.00, 'Card', 1, 1, 1),
('2026-01-18 16:30:00', 80.00, 'Card', 4, 3, 2),
('2026-01-22 13:15:00', 95.00, 'Cash', 2, 2, NULL),
('2026-01-25 15:40:00', 240.00, 'Card', 5, 4, 4),
@@ -136,12 +136,12 @@ VALUES
('2026-02-01 09:00:00', 175.00, 'Card', 3, 3, 1),
('2026-02-03 11:20:00', 120.00, 'Card', 2, 1, 3),
('2026-02-05 14:50:00', 45.00, 'Cash', 4, 2, NULL),
('2026-02-08 16:15:00', 160.00, 'Debit', 1, 1, 2),
('2026-02-08 16:15:00', 160.00, 'Card', 1, 1, 2),
('2026-02-10 10:25:00', 100.00, 'Card', 5, 4, NULL),
('2026-02-12 13:45:00', 50.00, 'Cash', 2, 2, 1),
('2026-02-15 15:30:00', 85.00, 'Card', 3, 3, NULL),
('2026-02-18 11:10:00', 200.00, 'Card', 1, 1, 4),
('2026-02-20 14:35:00', 155.00, 'Debit', 4, 3, NULL),
('2026-02-20 14:35:00', 155.00, 'Card', 4, 3, NULL),
('2026-02-22 16:50:00', 75.00, 'Cash', 2, 1, 2),
('2026-02-24 10:15:00', 140.00, 'Card', 5, 4, NULL),
(NOW(), 95.00, 'Card', 1, 1, 1);

91
backend/src/main/resources/db/migration/V9__backfill_user_accounts.sql Normal file
View File

@@ -0,0 +1,91 @@
INSERT INTO users (username, password, email, fullName, phone, role, active, tokenVersion)
SELECT
CONCAT('customer_', c.customerId) AS username,
'$2a$10$mE0D/HrnCuqFeEqMy0NJwuy2jkoRYjQ7GrKcc/7QQ0r2AqnZTvyGq' AS password,
CASE
WHEN c.email IS NOT NULL
AND c.email <> ''
AND (SELECT COUNT(*) FROM customer c2 WHERE c2.email = c.email) = 1
AND NOT EXISTS (SELECT 1 FROM employee e2 WHERE e2.email = c.email)
AND NOT EXISTS (SELECT 1 FROM users u WHERE u.email = c.email)
THEN c.email
ELSE CONCAT('customer_', c.customerId, '@petshop.local')
END AS email,
CONCAT(c.firstName, ' ', c.lastName) AS fullName,
CONCAT('200-000-', LPAD(c.customerId, 4, '0')) AS phone,
'CUSTOMER' AS role,
FALSE AS active,
0 AS tokenVersion
FROM customer c
WHERE c.user_id IS NULL
AND NOT EXISTS (
SELECT 1
FROM users u
WHERE u.username = CONCAT('customer_', c.customerId)
);
INSERT INTO users (username, password, email, fullName, phone, role, active, tokenVersion)
SELECT
CONCAT('employee_', e.employeeId) AS username,
'$2a$10$mE0D/HrnCuqFeEqMy0NJwuy2jkoRYjQ7GrKcc/7QQ0r2AqnZTvyGq' AS password,
CASE
WHEN e.email IS NOT NULL
AND e.email <> ''
AND (SELECT COUNT(*) FROM employee e2 WHERE e2.email = e.email) = 1
AND NOT EXISTS (SELECT 1 FROM customer c2 WHERE c2.email = e.email)
AND NOT EXISTS (SELECT 1 FROM users u WHERE u.email = e.email)
THEN e.email
ELSE CONCAT('employee_', e.employeeId, '@petshop.local')
END AS email,
CONCAT(e.firstName, ' ', e.lastName) AS fullName,
CONCAT('300-000-', LPAD(e.employeeId, 4, '0')) AS phone,
CASE
WHEN UPPER(e.role) = 'MANAGER' THEN 'ADMIN'
ELSE 'STAFF'
END AS role,
FALSE AS active,
0 AS tokenVersion
FROM employee e
WHERE e.user_id IS NULL
AND NOT EXISTS (
SELECT 1
FROM users u
WHERE u.username = CONCAT('employee_', e.employeeId)
);
UPDATE customer c
JOIN users u ON u.username = CONCAT('customer_', c.customerId)
AND u.role = 'CUSTOMER'
SET c.user_id = u.id
WHERE c.user_id IS NULL;
UPDATE employee e
JOIN users u ON u.username = CONCAT('employee_', e.employeeId)
AND u.role IN ('STAFF', 'ADMIN')
SET e.user_id = u.id
WHERE e.user_id IS NULL;
UPDATE users
SET
fullName = CASE
WHEN fullName IS NULL OR fullName = '' THEN username
ELSE fullName
END,
email = CASE
WHEN email IS NULL OR email = '' THEN CONCAT(username, '@petshop.local')
ELSE email
END,
phone = CASE
WHEN phone IS NULL OR phone = '' THEN CONCAT('000-000-', LPAD(id, 4, '0'))
ELSE phone
END,
active = COALESCE(active, TRUE),
tokenVersion = COALESCE(tokenVersion, 0)
WHERE fullName IS NULL
OR fullName = ''
OR email IS NULL
OR email = ''
OR phone IS NULL
OR phone = ''
OR active IS NULL
OR tokenVersion IS NULL;

226
backend/src/main/resources/dev/expand_pet_product_seed.sql Normal file
View File

@@ -0,0 +1,226 @@
-- Expand pet and product seed data
INSERT INTO pet (petName, petSpecies, petBreed, petAge, petStatus, petPrice)
VALUES
('Rocky', 'Dog', 'German Shepherd', 1, 'Available', 475.00),
('Daisy', 'Dog', 'Poodle', 2, 'Available', 512.00),
('Cooper', 'Dog', 'Bulldog', 3, 'Available', 560.00),
('Ruby', 'Dog', 'Boxer', 4, 'Available', 575.00),
('Tucker', 'Dog', 'Dachshund', 5, 'Available', 634.00),
('Rosie', 'Dog', 'Shih Tzu', 1, 'Available', 660.00),
('Bear', 'Dog', 'Rottweiler', 2, 'Available', 686.00),
('Maggie', 'Dog', 'Corgi', 3, 'Available', 745.00),
('Leo', 'Dog', 'Husky', 4, 'Available', 749.00),
('Penny', 'Dog', 'Border Collie', 5, 'Available', 808.00),
('Jax', 'Dog', 'German Shepherd', 1, 'Available', 823.00),
('Nala', 'Dog', 'Poodle', 2, 'Available', 871.00),
('Finn', 'Dog', 'Bulldog', 3, 'Available', 447.00),
('Sadie', 'Dog', 'Boxer', 4, 'Available', 495.00),
('Ace', 'Dog', 'Dachshund', 5, 'Available', 510.00),
('Zoe', 'Dog', 'Shih Tzu', 1, 'Available', 547.00),
('Ollie', 'Dog', 'Rottweiler', 2, 'Available', 606.00),
('Millie', 'Dog', 'Corgi', 3, 'Available', 654.00),
('Murphy', 'Dog', 'Husky', 4, 'Available', 691.00),
('Willow', 'Dog', 'Border Collie', 5, 'Available', 728.00),
('Bentley', 'Dog', 'German Shepherd', 1, 'Available', 776.00),
('Lily', 'Dog', 'Poodle', 2, 'Available', 780.00),
('Scout', 'Dog', 'Bulldog', 3, 'Available', 828.00),
('Gracie', 'Dog', 'Boxer', 4, 'Available', 876.00),
('Ranger', 'Dog', 'Dachshund', 5, 'Available', 452.00),
('Hazel', 'Dog', 'Shih Tzu', 1, 'Available', 478.00),
('Moose', 'Dog', 'Rottweiler', 2, 'Available', 515.00),
('Mia', 'Dog', 'Corgi', 3, 'Available', 530.00),
('Simba', 'Cat', 'Ragdoll', 1, 'Available', 295.00),
('Cleo', 'Cat', 'Bengal', 2, 'Available', 321.00),
('Oreo', 'Cat', 'British Shorthair', 3, 'Available', 358.00),
('Pepper', 'Cat', 'Sphynx', 4, 'Available', 417.00),
('Jasper', 'Cat', 'Scottish Fold', 5, 'Available', 454.00),
('Phoebe', 'Cat', 'Russian Blue', 1, 'Available', 491.00),
('Shadow', 'Cat', 'Abyssinian', 2, 'Available', 528.00),
('Mochi', 'Cat', 'Birman', 3, 'Available', 554.00),
('Louie', 'Cat', 'Ragdoll', 4, 'Available', 591.00),
('Ivy', 'Cat', 'Bengal', 5, 'Available', 606.00),
('Theo', 'Cat', 'British Shorthair', 1, 'Available', 654.00),
('Piper', 'Cat', 'Sphynx', 2, 'Available', 251.00),
('Nova', 'Cat', 'Scottish Fold', 3, 'Available', 277.00),
('Archie', 'Cat', 'Russian Blue', 4, 'Available', 336.00),
('Olive', 'Cat', 'Abyssinian', 5, 'Available', 362.00),
('Boots', 'Cat', 'Birman', 1, 'Available', 399.00),
('Maple', 'Cat', 'Ragdoll', 2, 'Available', 436.00),
('Gizmo', 'Cat', 'Bengal', 3, 'Available', 473.00),
('Nina', 'Cat', 'British Shorthair', 4, 'Available', 499.00),
('Salem', 'Cat', 'Sphynx', 5, 'Available', 547.00),
('Stella', 'Cat', 'Scottish Fold', 1, 'Available', 595.00),
('Kiki', 'Cat', 'Russian Blue', 2, 'Available', 610.00),
('Sunny', 'Cat', 'Abyssinian', 3, 'Available', 658.00),
('Mabel', 'Cat', 'Birman', 4, 'Available', 244.00),
('Coco', 'Bird', 'Cockatiel', 1, 'Available', 119.00),
('Sky', 'Bird', 'Parakeet', 2, 'Available', 145.00),
('Sunny', 'Bird', 'Canary', 3, 'Available', 204.00),
('Kiwi', 'Bird', 'Lovebird', 1, 'Available', 230.00),
('Pico', 'Bird', 'Finch', 2, 'Available', 81.00),
('Blue', 'Bird', 'Conure', 3, 'Available', 118.00),
('Rio', 'Bird', 'Cockatiel', 1, 'Available', 144.00),
('Angel', 'Bird', 'Parakeet', 2, 'Available', 203.00),
('Chirpy', 'Bird', 'Canary', 3, 'Available', 251.00),
('Peach', 'Bird', 'Lovebird', 1, 'Available', 91.00),
('Mango', 'Bird', 'Finch', 2, 'Available', 128.00),
('Pearl', 'Bird', 'Conure', 3, 'Available', 165.00),
('Bubbles', 'Fish', 'Goldfish', 1, 'Available', 30.00),
('Splash', 'Fish', 'Betta', 2, 'Available', 56.00),
('Coral', 'Fish', 'Guppy', 1, 'Available', 23.00),
('Neptune', 'Fish', 'Molly', 2, 'Available', 23.00),
('Marlin', 'Fish', 'Tetra', 1, 'Available', 49.00),
('Finley', 'Fish', 'Angelfish', 2, 'Available', 27.00),
('Pebble', 'Fish', 'Goldfish', 1, 'Available', 64.00),
('Wave', 'Fish', 'Betta', 2, 'Available', 20.00),
('Aqua', 'Fish', 'Guppy', 1, 'Available', 57.00),
('Flash', 'Fish', 'Molly', 2, 'Available', 46.00),
('Nemo', 'Fish', 'Tetra', 1, 'Available', 13.00),
('Pearl', 'Fish', 'Angelfish', 2, 'Available', 61.00),
('Thumper', 'Rabbit', 'Mini Lop', 1, 'Adopted', 147.00),
('Clover', 'Rabbit', 'Netherland Dwarf', 2, 'Adopted', 138.00),
('Biscuit', 'Rabbit', 'Lionhead', 3, 'Adopted', 177.00),
('Hazel', 'Rabbit', 'Rex', 1, 'Adopted', 91.00),
('Juniper', 'Rabbit', 'Mini Lop', 2, 'Adopted', 83.00),
('Poppy', 'Rabbit', 'Netherland Dwarf', 3, 'Adopted', 111.00),
('Snowball', 'Rabbit', 'Lionhead', 1, 'Adopted', 172.00),
('Maple', 'Rabbit', 'Rex', 2, 'Adopted', 150.00),
('Peanut', 'Hamster', 'Syrian', 1, 'Adopted', 29.00),
('Nibbles', 'Hamster', 'Dwarf', 2, 'Adopted', 42.00),
('Pumpkin', 'Hamster', 'Roborovski', 1, 'Pending', 49.00),
('Mocha', 'Hamster', 'Syrian', 2, 'Pending', 48.00),
('Buttons', 'Hamster', 'Dwarf', 1, 'Pending', 61.00),
('Teddy', 'Hamster', 'Roborovski', 2, 'Pending', 35.00),
('Pip', 'Hamster', 'Syrian', 1, 'Pending', 39.00),
('Toffee', 'Hamster', 'Dwarf', 2, 'Pending', 52.00),
('Sprout', 'Hamster', 'Roborovski', 1, 'Available', 26.00),
('Bean', 'Hamster', 'Syrian', 2, 'Available', 28.00);
INSERT INTO product (prodName, prodPrice, categoryId, prodDesc)
VALUES
('Chicken Recipe Dog Food', 42.00, 1, 'Nutritious food and treats for dogs'),
('Beef Feast Dog Food', 51.00, 1, 'Nutritious food and treats for dogs'),
('Salmon Blend Dog Food', 17.00, 1, 'Nutritious food and treats for dogs'),
('Lamb Dinner Dog Food', 28.00, 1, 'Nutritious food and treats for dogs'),
('Puppy Starter Kibble', 39.00, 1, 'Nutritious food and treats for dogs'),
('Senior Care Dog Food', 40.00, 1, 'Nutritious food and treats for dogs'),
('Small Breed Kibble', 44.00, 1, 'Nutritious food and treats for dogs'),
('Large Breed Kibble', 57.00, 1, 'Nutritious food and treats for dogs'),
('Grain Free Dog Food', 68.00, 1, 'Nutritious food and treats for dogs'),
('Turkey Rice Formula', 79.00, 1, 'Nutritious food and treats for dogs'),
('Duck Sweet Potato Meal', 25.00, 1, 'Nutritious food and treats for dogs'),
('Venison Protein Blend', 36.00, 1, 'Nutritious food and treats for dogs'),
('Healthy Weight Dog Food', 48.00, 1, 'Nutritious food and treats for dogs'),
('Sensitive Stomach Kibble', 62.00, 1, 'Nutritious food and treats for dogs'),
('High Energy Dog Food', 72.00, 1, 'Nutritious food and treats for dogs'),
('Organic Dog Biscuits', 18.00, 1, 'Nutritious food and treats for dogs'),
('Peanut Butter Dog Treats', 33.00, 1, 'Nutritious food and treats for dogs'),
('Dental Chew Sticks', 38.00, 1, 'Nutritious food and treats for dogs'),
('Training Treat Bites', 48.00, 1, 'Nutritious food and treats for dogs'),
('Soft Chicken Treats', 57.00, 1, 'Nutritious food and treats for dogs'),
('Pumpkin Fiber Treats', 70.00, 1, 'Nutritious food and treats for dogs'),
('Joint Support Biscuits', 14.00, 1, 'Nutritious food and treats for dogs'),
('Mini Breed Dinner', 17.00, 1, 'Nutritious food and treats for dogs'),
('Farmhouse Dog Meal', 30.00, 1, 'Nutritious food and treats for dogs'),
('Feather Teaser Wand', 30.00, 2, 'Play items for active cats'),
('Catnip Mouse Toy', 24.00, 2, 'Play items for active cats'),
('Jingle Ball Set', 18.00, 2, 'Play items for active cats'),
('Scratching Post Small', 6.00, 2, 'Play items for active cats'),
('Crinkle Tunnel', 31.00, 2, 'Play items for active cats'),
('Laser Pointer Toy', 6.00, 2, 'Play items for active cats'),
('Plush Fish Toy', 19.00, 2, 'Play items for active cats'),
('Spring Coil Pack', 20.00, 2, 'Play items for active cats'),
('Hanging Door Toy', 12.00, 2, 'Play items for active cats'),
('Interactive Puzzle Toy', 22.00, 2, 'Play items for active cats'),
('Catnip Kicker Toy', 20.00, 2, 'Play items for active cats'),
('Rolling Bell Ball', 20.00, 2, 'Play items for active cats'),
('Ribbon Chase Toy', 19.00, 2, 'Play items for active cats'),
('Mini Plush Mouse', 21.00, 2, 'Play items for active cats'),
('Treat Dispensing Ball', 16.00, 2, 'Play items for active cats'),
('Double Pom Toy', 12.00, 2, 'Play items for active cats'),
('Window Perch Toy', 10.00, 2, 'Play items for active cats'),
('Scratch Pad Refill', 8.00, 2, 'Play items for active cats'),
('Rainbow Wand Toy', 23.00, 2, 'Play items for active cats'),
('Carpet Scratcher', 23.00, 2, 'Play items for active cats'),
('Bird Perch Set', 27.00, 3, 'Care supplies for pet birds'),
('Parakeet Seed Mix', 40.00, 3, 'Care supplies for pet birds'),
('Canary Food Blend', 53.00, 3, 'Care supplies for pet birds'),
('Mineral Cuttlebone', 57.00, 3, 'Care supplies for pet birds'),
('Bird Ladder Toy', 68.00, 3, 'Care supplies for pet birds'),
('Mirror Bell Combo', 80.00, 3, 'Care supplies for pet birds'),
('Clip On Food Cup', 92.00, 3, 'Care supplies for pet birds'),
('Bird Cage Liner Pack', 108.00, 3, 'Care supplies for pet birds'),
('Nesting Material Pack', 121.00, 3, 'Care supplies for pet birds'),
('Treat Spray Millet', 8.00, 3, 'Care supplies for pet birds'),
('Wooden Swing Perch', 22.00, 3, 'Care supplies for pet birds'),
('Foraging Ball Toy', 32.00, 3, 'Care supplies for pet birds'),
('Cage Cleaning Spray', 47.00, 3, 'Care supplies for pet birds'),
('Parrot Rope Perch', 54.00, 3, 'Care supplies for pet birds'),
('Bird Bath Dish', 54.00, 3, 'Care supplies for pet birds'),
('Songbird Vitamin Drops', 78.00, 3, 'Care supplies for pet birds'),
('Aquarium Filter Cartridge', 36.00, 4, 'Essential aquarium equipment and accessories'),
('Decorative Aquarium Gravel', 49.00, 4, 'Essential aquarium equipment and accessories'),
('Fish Net Medium', 34.00, 4, 'Essential aquarium equipment and accessories'),
('Water Conditioner', 45.00, 4, 'Essential aquarium equipment and accessories'),
('Aquarium Thermometer', 59.00, 4, 'Essential aquarium equipment and accessories'),
('LED Tank Light', 67.00, 4, 'Essential aquarium equipment and accessories'),
('Air Stone Pack', 76.00, 4, 'Essential aquarium equipment and accessories'),
('Aquarium Heater 50W', 92.00, 4, 'Essential aquarium equipment and accessories'),
('Aquarium Heater 100W', 106.00, 4, 'Essential aquarium equipment and accessories'),
('Fish Flake Food', 95.00, 4, 'Essential aquarium equipment and accessories'),
('Algae Scraper', 105.00, 4, 'Essential aquarium equipment and accessories'),
('Aquarium Plant Set', 122.00, 4, 'Essential aquarium equipment and accessories'),
('Bubble Curtain Kit', 136.00, 4, 'Essential aquarium equipment and accessories'),
('Breeder Box Insert', 149.00, 4, 'Essential aquarium equipment and accessories'),
('Filter Sponge Pack', 164.00, 4, 'Essential aquarium equipment and accessories'),
('Aquarium Background Roll', 183.00, 4, 'Essential aquarium equipment and accessories'),
('Glass Lid Clips', 174.00, 4, 'Essential aquarium equipment and accessories'),
('Submersible Pump', 191.00, 4, 'Essential aquarium equipment and accessories'),
('Hamster Bedding Pack', 50.00, 5, 'Supplies for small pets'),
('Rabbit Hay Bundle', 49.00, 5, 'Supplies for small pets'),
('Guinea Pig Pellets', 15.00, 5, 'Supplies for small pets'),
('Small Pet Water Bottle', 31.00, 5, 'Supplies for small pets'),
('Hamster Hideout Hut', 40.00, 5, 'Supplies for small pets'),
('Chew Stick Bundle', 48.00, 5, 'Supplies for small pets'),
('Rabbit Litter Tray', 58.00, 5, 'Supplies for small pets'),
('Exercise Ball Large', 68.00, 5, 'Supplies for small pets'),
('Small Pet Food Bowl', 20.00, 5, 'Supplies for small pets'),
('Timothy Hay Cubes', 28.00, 5, 'Supplies for small pets'),
('Guinea Pig Tunnel', 38.00, 5, 'Supplies for small pets'),
('Hamster Nesting Fluff', 47.00, 5, 'Supplies for small pets'),
('Rabbit Grooming Brush', 60.00, 5, 'Supplies for small pets'),
('Small Pet Carrier', 7.00, 5, 'Supplies for small pets'),
('Hay Rack Feeder', 11.00, 5, 'Supplies for small pets'),
('Wooden Chew Blocks', 27.00, 5, 'Supplies for small pets');
INSERT INTO productSupplier (supId, prodId, cost)
SELECT CASE MOD(p.prodId - 7, 5)
WHEN 0 THEN 1
WHEN 1 THEN 2
WHEN 2 THEN 3
WHEN 3 THEN 4
ELSE 5
END,
p.prodId,
ROUND(p.prodPrice * (0.62 + (MOD(p.prodId - 7, 5) * 0.03)), 2)
FROM product p
WHERE p.prodId >= 7
AND NOT EXISTS (
SELECT 1 FROM productSupplier ps WHERE ps.prodId = p.prodId
);
INSERT INTO inventory (prodId, quantity)
SELECT p.prodId,
CASE p.categoryId
WHEN 1 THEN 120 + MOD((p.prodId - 7) * 17, 60)
WHEN 2 THEN 180 + MOD((p.prodId - 7) * 17, 60)
WHEN 3 THEN 70 + MOD((p.prodId - 7) * 17, 60)
WHEN 4 THEN 45 + MOD((p.prodId - 7) * 17, 60)
ELSE 95 + MOD((p.prodId - 7) * 17, 60)
END
FROM product p
WHERE p.prodId >= 7
AND NOT EXISTS (
SELECT 1 FROM inventory i WHERE i.prodId = p.prodId
);