jtfb · jtfb · Sep 11, 2024 · Sep 12, 2024 · Sep 12, 2024 · Sep 12, 2024
diff --git a/02_activities/assignments/design_a_logical_model.md b/02_activities/assignments/design_a_logical_model.md
@@ -15,15 +15,19 @@ _Hint, search type 1 vs type 2 slowly changing dimensions._
 
 Bonus: Are there privacy implications to this, why or why not?
 ```
-Your answer...
+Yes, As in type 2, the store will keep and track of all the address from a customer so if there is any data leak, customers will be exposed to that. In type 1, we would keep only the latest address which will also have privacy implications. 
 ```
 
 ## Question 4
 Review the AdventureWorks Schema [here](https://i.stack.imgur.com/LMu4W.gif)
 
 Highlight at least two differences between it and your ERD. Would you change anything in yours?
 ```
-Your answer...
+- Arrows are pointing to a direction which is a good point. 
+- Different departments have different colours, which makes that better for visualization
+- There are other nomenclatures as U1, U2, U3 which I don't know what means
+- Some items are in bold style
+- There are much more tables and items such as: ProductReview, ProductPhoto, SalesPerson, PersonCreditCars,... 
 ```
 
 # Criteria
@@ -44,9 +48,9 @@ Your answer...
     * Open a private window in your browser. Copy and paste the link to your pull request into the address bar. Make sure you can see your pull request properly. This helps the technical facilitator and learning support staff review your submission easily.
 
 Checklist:
-- [ ] Create a branch called `model-design`.
-- [ ] Ensure that the repository is public.
-- [ ] Review [the PR description guidelines](https://github.com/UofT-DSI/onboarding/blob/main/onboarding_documents/submissions.md#guidelines-for-pull-request-descriptions) and adhere to them.
-- [ ] Verify that the link is accessible in a private browser window.
+- [x] Create a branch called `model-design`.
+- [x] Ensure that the repository is public.
+- [x] Review [the PR description guidelines](https://github.com/UofT-DSI/onboarding/blob/main/onboarding_documents/submissions.md#guidelines-for-pull-request-descriptions) and adhere to them.
+- [x] Verify that the link is accessible in a private browser window.
 
 If you encounter any difficulties or have questions, please don't hesitate to reach out to our team via our Slack at `#cohort-4-help`. Our Technical Facilitators and Learning Support staff are here to help you navigate any challenges.
diff --git a/02_activities/assignments/store_ERD_type1.jpg b/02_activities/assignments/store_ERD_type1.jpg
diff --git a/02_activities/assignments/store_ERD_type2.jpg b/02_activities/assignments/store_ERD_type2.jpg
diff --git a/02_activities/homework/homework_1.jpg b/02_activities/homework/homework_1.jpg
diff --git a/02_activities/homework/homework_2.sql b/02_activities/homework/homework_2.sql
@@ -1,42 +1,74 @@
 --SELECT
 /* 1. Write a query that returns everything in the customer table. */
-
-
+SELECT *
+FROM customer
 
 /* 2. Write a query that displays all of the columns and 10 rows from the cus- tomer table, 
 sorted by customer_last_name, then customer_first_ name. */
-
-
-
+SELECT *
+FROM customer
+ORDER BY customer_last_name, customer_first_name
+LIMIT 10
 
 --WHERE
 /* 1. Write a query that returns all customer purchases of product IDs 4 and 9. */
 -- option 1
-
+SELECT *
+FROM customer_purchases
+WHERE customer_id IN (4,9)
 -- option 2
+SELECT *
+FROM customer_purchases
+WHERE customer_id = 4 OR customer_id = 9
 
 /*2. Write a query that returns all customer purchases and a new calculated column 'price' (quantity * cost_to_customer_per_qty), 
 filtered by vendor IDs between 8 and 10 (inclusive) using either:
 	1.  two conditions using AND
 	2.  one condition using BETWEEN
 */
 -- option 1
-
+SELECT *, (quantity * cost_to_customer_per_qty) AS new_column
+FROM customer_purchases
+WHERE vendor_id >= 8
+   AND vendor_id <= 10
 
 -- option 2
+SELECT *, (quantity * cost_to_customer_per_qty) AS new_column
+FROM customer_purchases
+WHERE vendor_id BETWEEN 8 AND 10
 
 --CASE
 /* 1. Products can be sold by the individual unit or by bulk measures like lbs. or oz. 
 Using the product table, write a query that outputs the product_id and product_name
 columns and add a column called prod_qty_type_condensed that displays the word “unit” 
 if the product_qty_type is “unit,” and otherwise displays the word “bulk.” */
-
+SELECT *,
+CASE WHEN product_qty_type = 'unit'
+ THEN 'unit'
+ ELSE 'bulk'
+ END as prod_qty_type_condensed
+ FROM product
 
 /* 2. We want to flag all of the different types of pepper products that are sold at the market. 
 add a column to the previous query called pepper_flag that outputs a 1 if the product_name 
 contains the word “pepper” (regardless of capitalization), and otherwise outputs 0. */
-
+SELECT *,
+CASE WHEN product_qty_type = 'unit'
+ THEN 'unit'
+ ELSE 'bulk'
+ END as prod_qty_type_condensed
+
+,CASE WHEN product_name LIKE '%pepper%'
+  THEN 1
+  ELSE 0
+  END as pepper_flag
+FROM product
 
 --JOIN
 /* 1. Write a query that INNER JOINs the vendor table to the vendor_booth_assignments table on the 
 vendor_id field they both have in common, and sorts the result by vendor_name, then market_date. */
+SELECT DISTINCT *
+FROM vendor as v
+INNER JOIN vendor_booth_assignments as vba
+  ON v.vendor_id = vba.vendor_id
+ORDER BY vendor_name, market_date
diff --git a/02_activities/homework/homework_3.sql b/02_activities/homework/homework_3.sql
@@ -1,15 +1,26 @@
 -- AGGREGATE
 /* 1. Write a query that determines how many times each vendor has rented a booth 
 at the farmer’s market by counting the vendor booth assignments per vendor_id. */
-
+SELECT vendor_id, count(vendor_id)
+FROM vendor_booth_assignments
+GROUP BY vendor_id
 
 
 /* 2. The Farmer’s Market Customer Appreciation Committee wants to give a bumper 
 sticker to everyone who has ever spent more than $2000 at the market. Write a query that generates a list 
 of customers for them to give stickers to, sorted by last name, then first name. 
 
 HINT: This query requires you to join two tables, use an aggregate function, and use the HAVING keyword. */
+SELECT c.customer_last_name, c.customer_first_name, total_spent
+
+FROM customer as c 
+INNER JOIN (
+		SELECT customer_id, sum(quantity*cost_to_customer_per_qty) as total_spent
 
+		FROM customer_purchases as cp
+		GROUP by customer_id
+		HAVING total_spent > 2000
+) x ON c.customer_id = x.customer_id
 
 
 --Temp Table

diff --git a/05_src/sql/farmersmarket.db b/05_src/sql/farmersmarket.db