From 30cb1b91b02edc9445c2fd046dacb5460bb22b08 Mon Sep 17 00:00:00 2001 From: Fathi Kahin Date: Fri, 17 May 2024 12:39:44 +0100 Subject: [PATCH] Read me updated, All queries are written in SQL --- Big-Spender/readme.md | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/Big-Spender/readme.md b/Big-Spender/readme.md index dc6cf9a2..4450f486 100644 --- a/Big-Spender/readme.md +++ b/Big-Spender/readme.md @@ -48,7 +48,9 @@ You are working with Claire and Farnoosh, who are trying to complete a missing r **You:** Absolutely. Here's the SQL query you need: ```sql -INSERT YOUR QUERY HERE +SELECT amount +FROM spends +WHERE amount BETWEEN 30000 AND 31000; ``` **Claire:** That's great, thanks. Hey, what about transactions that include the word 'fee' in their description? @@ -68,7 +70,9 @@ INSERT YOUR QUERY HERE **You:** Then here's the query for that: ```sql -INSERT YOUR QUERY HERE +SELECT * +FROM spends +WHERE description LIKE '%fee%'; ``` **Farnoosh:** Hi, it's me again. It turns out we also need the transactions that have the expense area of 'Better Hospital Food'. Can you help us with that one? @@ -76,7 +80,10 @@ INSERT YOUR QUERY HERE **You:** No worries. Here's the query for that: ```sql -INSERT YOUR QUERY HERE +SELECT sp.date, sp.description, expense.expense_area +FROM spends sp +JOIN expense_areas expense ON (sp.expense_area_id = expense.id) +WHERE expense.expense_area LIKE '%Better Hospital Food%'; ``` **Claire:** Great, that's very helpful. How about the total amount spent for each month? @@ -92,7 +99,9 @@ CREATE YOUR QUERY HERE **You:** Sure thing. Here's the query for that: ```sql -INSERT YOUR QUERY HERE +SELECT to_char(date,'YYYY-MM') AS month, sum(amount) +FROM spends +GROUP BY month; ``` **Farnoosh:** Oh, how do I know who these suppliers are? There's only numbers here. @@ -100,7 +109,9 @@ INSERT YOUR QUERY HERE **You:** Whoops! I gave you ids to key the totals, but let me give you names instead. ```sql -INSERT YOUR QUERY HERE +SELECT sp.amount, sup.supplier +FROM spends sp +JOIN suppliers sup ON (sp.supplier_id = sup.id); ``` **Claire:** Thanks, that's really helpful. I can't quite figure out...what is the total amount spent on each of these two dates (1st March 2021 and 1st April 2021)? @@ -112,7 +123,10 @@ INSERT YOUR QUERY HERE **You:** Then you need an extra clause. Here's the query: ```sql -CREATE YOUR QUERY HERE +SELECT date, SUM(amount) +FROM spends +WHERE date IN ('2021-03-01', '2021-04-01') +GROUP BY date; ``` **Farnoosh:** Fantastic. One last thing, looks like we missed something. Can we add a new transaction to the spends table with a description of 'Computer Hardware Dell' and an amount of £32,000? @@ -124,7 +138,8 @@ CREATE YOUR QUERY HERE **You:** Sure thing. To confirm, the date is August 19, 2021, the transaction number is 38104091, the supplier invoice number is 3780119655, the supplier is 'Dell', the expense type is 'Hardware' and the expense area is 'IT'. Here's the query for that: ```sql -INSERT YOUR QUERIES HERE +INSERT INTO spends (expense_type_id, expense_area_id, supplier_id, date, transaction_no, supplier_inv_no, description, amount) +VALUES (7, 18, 16, '2021-08-19', 38104091, '3780119655', 'Computer Hardware Dell', 32000); ``` @@ -134,7 +149,7 @@ INSERT YOUR QUERIES HERE ## Acceptance Criteria -- [ ] All user stories are satisfied -- [ ] All queries are written in SQL -- [ ] All queries are correct and I have tested them in the database -- [ ] I have opened a pull request with my answers written directly into this README.md file +- [X] All user stories are satisfied +- [X] All queries are written in SQL +- [X] All queries are correct and I have tested them in the database +- [X] I have opened a pull request with my answers written directly into this README.md file