changed api and scheme

backendV2/routes/api/api.database.js

@@ -21,7 +21,7 @@ export const getItemsFromDatabaseV2 = async () => {
 
 export const getLoanByCodeV2 = async (loan_code) => {
   const [result] = await pool.query(
-    "SELECT * FROM loans WHERE loan_code = ?;",
+    "SELECT username, returned_date, take_date, lockers FROM loans WHERE loan_code = ?;",
     [loan_code]
   );
   if (result.length > 0) {

backendV2/schemeV2.mock_data.sql

@@ -1,39 +1,120 @@
--- Mock data for borrow_system_new
 USE borrow_system_new;
 
-START TRANSACTION;
+-- Reset tables (no FKs defined, so order is safe)
+SET FOREIGN_KEY_CHECKS = 0;
+TRUNCATE TABLE loans;
+TRUNCATE TABLE apiKeys;
+TRUNCATE TABLE items;
+TRUNCATE TABLE users;
+SET FOREIGN_KEY_CHECKS = 1;
 
--- Users
+-- Users (roles 1–6, plain-text passwords)
-INSERT INTO users (username, password, email, first_name, last_name, role, is_admin, entry_created_at)
+INSERT INTO users (username, password, email, first_name, last_name, role, is_admin) VALUES
-VALUES
+('admin',  'adminpass', 'admin@example.com',  'System', 'Admin',   6, true),
-('admin', '$2b$12$adminhashedpasswordplaceholder0000000000', 'admin@example.com', 'System', 'Admin', 99, TRUE, '2025-01-01 08:00:00'),
+('alice',  'alice123',  'alice@example.com',  'Alice',  'Andersen',1, false),
-('alice', '$2b$12$alicehashedpasswordplaceholder0000000000', 'alice@example.com', 'Alice', 'Anderson', 1, FALSE, '2025-06-01 09:10:00'),
+('bob',    'bob12345',  'bob@example.com',    'Bob',    'Berg',    2, false),
-('bob',   '$2b$12$bobhashedpasswordplaceholder000000000000',   'bob@example.com',   'Bob',   'Brown',    2, FALSE, '2025-06-02 10:15:00'),
+('carol',  'carol123',  'carol@example.com',  'Carol',  'Christensen', 3, false),
-('carol', '$2b$12$carolhashedpasswordplaceholder00000000000',  'carol@example.com', 'Carol', 'Clark',   0, FALSE, '2025-06-03 11:20:00');
+('dave',   'dave123',   'dave@example.com',   'Dave',   'Dahl',    4, false),
+('erin',   'erin123',   'erin@example.com',   'Erin',   'Enevoldsen', 5, false),
+('frank',  'frank123',  'frank@example.com',  'Frank',  'Fisher',  2, false),
+('grace',  'grace123',  'grace@example.com',  'Grace',  'Gundersen',1, false),
+('heidi',  'heidi123',  'heidi@example.com',  'Heidi',  'Hansen',  4, false),
+('tech',   'techpass',  'tech@example.com',   'Tech',   'User',    5, true);
 
--- Items (ids will start at 1)
+-- Items (safe_nr is two digits or NULL; currently_borrowing aligns with active loans)
-INSERT INTO items (item_name, can_borrow_role, in_safe, entry_created_at, last_borrowed_person, currently_borrowing)
+INSERT INTO items (item_name, can_borrow_role, in_safe, safe_nr, last_borrowed_person, currently_borrowing) VALUES
-VALUES
+('Laptop A',           2, false, NULL, 'grace',  'bob'),
-('MacBook Pro 16\"', 1, TRUE,  '2025-05-01 09:00:00', 'alice', NULL),
+('Laptop B',           2, true,  '01', NULL,     NULL),
-('Projector Epson X200', 2, TRUE, '2025-04-20 10:00:00', 'bob', NULL),
+('Camera Canon',       3, true,  '02', 'erin',   NULL),
-('Canon EOS R6', 1, TRUE,      '2025-03-15 14:30:00', NULL, NULL),
+('Microphone Rode',    1, true,  '03', 'grace',  NULL),
-('Wireless Microphone', 0, TRUE,'2025-05-10 12:00:00', 'carol', NULL),
+('Tripod Manfrotto',   1, true,  '04', 'frank',  NULL),
-('USB-C Charger', 0, FALSE,    '2025-05-11 12:30:00', 'alice', 'alice');
+('Oscilloscope Tek',   4, true,  '05', NULL,     NULL),
+('VR Headset',         3, false, NULL, 'heidi',  'carol'),
+('Keycard Programmer', 6, true,  '06', 'admin',  NULL);
 
--- Loans
+-- Loans (JSON arrays, 6-digit numeric loan_code)
-INSERT INTO loans (username, loan_code, start_date, end_date, take_date, returned_date, created_at, loaned_items_id, loaned_items_name, deleted, note)
+-- Assumes the items above have ids 1..8 in insert order
-VALUES
+INSERT INTO loans (
-('alice', '000101', '2025-06-10 09:00:00', '2025-06-17 09:00:00', '2025-06-10 09:05:00', NULL, '2025-06-10 09:00:00',
+  username,
- JSON_ARRAY(1,5), JSON_ARRAY('MacBook Pro 16\"','USB-C Charger'), FALSE, 'For project work'),
+  lockers,
-('bob',   '000102', '2025-06-01 14:00:00', '2025-06-04 12:00:00', '2025-06-01 14:10:00', '2025-06-04 11:50:00', '2025-06-01 14:00:00',
+  loan_code,
- JSON_ARRAY(2), JSON_ARRAY('Projector Epson X200'), FALSE, NULL),
+  start_date,
-('carol', '000103', '2025-06-05 08:00:00', '2025-06-06 18:00:00', NULL, NULL, '2025-06-05 08:00:00',
+  end_date,
- JSON_ARRAY(4), JSON_ARRAY('Wireless Microphone'), FALSE, 'Reserved for event');
+  take_date,
+  returned_date,
+  loaned_items_id,
+  loaned_items_name,
+  deleted,
+  note
+) VALUES
+-- Active loan: bob has Laptop A
+('bob',
+  '["01"]',
+  '123456',
+  '2025-11-15 09:00:00',
+  '2025-11-22 17:00:00',
+  '2025-11-15 09:15:00',
+  NULL,
+  '[1]',
+  '["Laptop A"]',
+  false,
+  'Active loan - Laptop A'
+),
+-- Returned loan: frank had Tripod Manfrotto
+('frank',
+  '["04"]',
+  '234567',
+  '2025-10-01 10:00:00',
+  '2025-10-07 16:00:00',
+  '2025-10-01 10:05:00',
+  '2025-10-05 15:30:00',
+  '[5]',
+  '["Tripod Manfrotto"]',
+  false,
+  'Completed loan'
+),
+-- Future reservation: dave will take Oscilloscope Tek
+('dave',
+  '["05"]',
+  '345678',
+  '2025-12-10 09:00:00',
+  '2025-12-12 17:00:00',
+  NULL,
+  NULL,
+  '[6]',
+  '["Oscilloscope Tek"]',
+  false,
+  'Reserved'
+),
+-- Active loan: carol has VR Headset
+('carol',
+  '["02"]',
+  '456789',
+  '2025-11-10 13:00:00',
+  '2025-11-20 12:00:00',
+  '2025-11-10 13:10:00',
+  NULL,
+  '[7]',
+  '["VR Headset"]',
+  false,
+  'Active loan - VR Headset'
+),
+-- Soft-deleted historic loan: grace had Microphone + Tripod
+('grace',
+  '["03","04"]',
+  '567890',
+  '2025-09-01 09:00:00',
+  '2025-09-03 17:00:00',
+  '2025-09-01 09:10:00',
+  '2025-09-03 16:45:00',
+  '[4,5]',
+  '["Microphone Rode","Tripod Manfrotto"]',
+  true,
+  'Canceled/soft-deleted record'
+);
 
--- API keys (15 digits)
+-- API keys (8-digit numeric keys)
-INSERT INTO apiKeys (api_key, entry_name, entry_created_at, last_used_at)
+INSERT INTO apiKeys (api_key, entry_name, last_used_at) VALUES
-VALUES
+('12345678', 'CI token',     '2025-11-15 08:00:00'),
-('000000000000001', 'internal-service-key', '2025-01-02 07:00:00', NULL),
+('87654321', 'Local dev',    NULL),
-('123456789012345', 'ci-pipeline', '2025-02-15 08:30:00', '2025-06-10 09:00:00');
+('00000001', 'Monitoring',   '2025-11-10 12:30:00');
-
-COMMIT;

backendV2/schemeV2.sql

@@ -17,6 +17,7 @@ CREATE TABLE users (
 CREATE TABLE loans (
   id int NOT NULL AUTO_INCREMENT,
   username varchar(100) NOT NULL,
+  lockers json NOT NULL DEFAULT ('[]'),
   loan_code Char(6) NOT NULL UNIQUE,
   start_date timestamp NOT NULL,
   end_date timestamp NOT NULL,
@@ -36,19 +37,21 @@ CREATE TABLE items (
   item_name varchar(255) NOT NULL UNIQUE,
   can_borrow_role INT NOT NULL,
   in_safe bool NOT NULL DEFAULT true,
+  safe_nr CHAR(2) DEFAULT NULL,
   entry_created_at timestamp NULL DEFAULT CURRENT_TIMESTAMP,
   entry_updated_at timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   last_borrowed_person varchar(255) DEFAULT NULL,
   currently_borrowing varchar(255) DEFAULT NULL,
-  PRIMARY KEY (id)
+  PRIMARY KEY (id),
-);
+  CHECK (safe_nr REGEXP '^[0-9]{2}$' OR safe_nr IS NULL)
+) ENGINE=InnoDB;
 
 CREATE TABLE apiKeys (
   id INT NOT NULL AUTO_INCREMENT,
-  api_key CHAR(15) NOT NULL UNIQUE,
+  api_key CHAR(8) NOT NULL UNIQUE,
   entry_name VARCHAR(100) NOT NULL,
   last_used_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   entry_created_at TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (id),
-  CHECK (api_key REGEXP '^[0-9]{15}$')
+  CHECK (api_key REGEXP '^[0-9]{8}$')
 ) ENGINE=InnoDB;