a lot of progress on items as well as get/find/create on project.

internal/database/mysql/queries/item.sql

@@ -12,31 +12,36 @@ WHERE pr.project_id = ?;
 SELECT i.*, pr.project_id FROM item i
 LEFT JOIN project_requirement pr ON pr.id = i.project_requirement_id
 WHERE i.acquired_time >= ?
-  AND i.acquired_time < ?
-  AND i.scope_id = ?;
+  AND i.acquired_time <= ?
+  AND i.scope_id = ?
+ORDER BY acquired_time DESC, created_time DESC;
 
 -- name: ListItemsScheduledBetween :many
 SELECT i.*, pr.project_id FROM item i
 LEFT JOIN project_requirement pr ON pr.id = i.project_requirement_id
 WHERE i.scheduled_date >= ?
-  AND i.scheduled_date < ?
-  AND i.scope_id = ?;
+  AND i.scheduled_date <= ?
+  AND i.scope_id = ?
+ORDER BY scheduled_date, created_time;
 
 -- name: ListItemsCreatedBetween :many
 SELECT i.*, pr.project_id FROM item i
 LEFT JOIN project_requirement pr ON pr.id = i.project_requirement_id
 WHERE i.created_time >= ?
-  AND i.created_time < ?
-  AND i.scope_id = ?;
+  AND i.created_time <= ?
+  AND i.scope_id = ?
+ORDER BY created_time DESC;
 
 -- name: ListItemsLooseBetween :many
 SELECT i.*, pr.project_id FROM item i
 LEFT JOIN project_requirement pr ON pr.id = i.project_requirement_id
 WHERE i.created_time >= ?
-  AND i.created_time < ?
+  AND i.created_time <= ?
   AND i.scope_id = ?
   AND i.scheduled_date IS NULL
-  AND i.acquired_time IS NULL;
+  AND i.acquired_time IS NULL
+  AND i.project_requirement_id IS NULL
+ORDER BY created_time DESC;
 
 -- name: ListItemsScheduledBetweenNoScope :many
 SELECT i.*, pr.project_id FROM item i
@@ -94,6 +99,12 @@ WHERE id = ?;
 -- name: DeleteItem :exec
 DELETE FROM item WHERE id = ?;
 
+-- name: DeleteItemForRequirement :exec
+DELETE FROM item WHERE project_requirement_id = ?;
+
+-- name: ClearItemProjectRequirement :exec
+UPDATE item SET project_requirement_id = NULL WHERE project_requirement_id = ?;
+
 -- name: ReplaceItemStatProgress :exec
 REPLACE INTO item_stat_progress (item_id, stat_id, acquired, required)
 VALUES (?, ?, ?, ?);

internal/database/mysql/queries/project.sql

@@ -1,11 +1,48 @@
 -- name: ListProjectEntries :many
-SELECT id, name, status FROM project
+SELECT id, name, status, created_time, author_id FROM project
 WHERE scope_id = ?
 ORDER BY status, created_time;
 
 -- name: GetProject :one
 SELECT * FROM project WHERE id = ?;
 
+-- name: GetProjectRequirement :one
+SELECT * FROM project_requirement WHERE id = ?;
+
 -- name: ListProjectRequirementsByProjectID :many
 SELECT * FROM project_requirement WHERE project_id = ?;
 
+-- name: ListProjectRequirementStats :many
+SELECT prs.required, s.id, s.name, s.weight FROM project_requirement_stat prs
+RIGHT JOIN stat s ON s.id = prs.stat_id
+WHERE project_requirement_id = ?;
+
+-- name: InsertProject :execresult
+INSERT INTO project (scope_id, author_id, name, status, description, created_time)
+VALUES (?, ?, ?, ?, ?, ?);
+
+-- name: UpdateProject :exec
+UPDATE project
+SET name = ?,
+    status = ?,
+    description = ?
+WHERE id = ?;
+
+-- name: DeleteProject :exec
+DELETE FROM project WHERE id = ?;
+
+-- name: InsertProjectRequirement :execresult
+INSERT INTO project_requirement (scope_id, project_id, name, status, description)
+VALUES (?, ?, ?, ?, ?);
+
+-- name: UpdateProjectRequirement :exec
+UPDATE project_requirement
+SET name = ?,
+    status = ?,
+    description = ?
+WHERE id = ?;
+
+-- name: DeleteProjectRequirement :exec
+DELETE FROM project_requirement WHERE id = ?;
+
+