add support for color printing (#277)

* update print schema

* add support for color printing quota

Author: sophiebsw

ocflib/printing/ocfprinting.sql

@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `refunds` (
     `pages` int NOT NULL,
     `staffer` varchar(255) NOT NULL,
     `reason` varchar(510) NOT NULL,
+    `color` BOOLEAN NOT NULL,
     PRIMARY KEY(`id`)
 ) ENGINE=InnoDB;
 
@@ -85,13 +86,29 @@ CREATE VIEW jobs_semester AS
     WHERE DATE(jobs.time) >= semester_start(CURDATE())
     GROUP BY user;
 
+DROP VIEW IF EXISTS jobs_color;
+CREATE VIEW jobs_color AS
+    SELECT user, SUM(pages) AS pages
+    FROM jobs
+    WHERE DATE(jobs.time) >= semester_start(CURDATE())
+    AND `queue` = 'admin-only'
+    GROUP BY user;
+
 DROP VIEW IF EXISTS refunds_semester;
 CREATE VIEW refunds_semester AS
     SELECT user, SUM(pages) AS pages
     FROM refunds
     WHERE DATE(refunds.time) >= semester_start(CURDATE())
     GROUP BY user;
 
+DROP VIEW IF EXISTS refunds_color;
+CREATE VIEW refunds_color AS
+    SELECT user, SUM(pages) AS pages
+    FROM refunds
+    WHERE DATE(refunds.time) >= semester_start(CURDATE())
+    AND refunds.color = 1
+    GROUP BY user;
+
 DROP VIEW IF EXISTS printed_semester;
 CREATE VIEW `printed_semester` AS
     SELECT
@@ -114,15 +131,40 @@ CREATE VIEW `printed_semester` AS
 
     ORDER BY user;
 
+DROP VIEW IF EXISTS printed_color;
+CREATE VIEW `printed_color` AS
+    SELECT
+        jobs_color.user AS user,
+        COALESCE(jobs_color.pages, 0) - COALESCE(refunds_color.pages, 0) AS color
+    FROM jobs_color
+    LEFT OUTER JOIN refunds_color
+    ON jobs_color.user = refunds_color.user
+    GROUP BY jobs_color.user
+
+    UNION
+
+    SELECT
+        refunds_color.user AS user,
+        COALESCE(jobs_color.pages, 0) - COALESCE(refunds_color.pages, 0) AS color
+    FROM jobs_color
+    RIGHT OUTER JOIN refunds_color
+    ON jobs_color.user = refunds_color.user
+    GROUP BY refunds_color.user
+
+    ORDER BY user;
+
 DROP VIEW IF EXISTS printed;
 CREATE VIEW `printed` AS
     SELECT
         printed_semester.user AS user,
         COALESCE(printed_today.today, 0) AS today,
-        COALESCE(printed_semester.semester, 0) AS semester
+        COALESCE(printed_semester.semester, 0) AS semester,
+        COALESCE(printed_color.color, 0) AS color
     FROM printed_today
     RIGHT OUTER JOIN printed_semester
     ON printed_today.user = printed_semester.user
+    LEFT OUTER JOIN printed_color
+    ON printed_semester.user = printed_color.user
     ORDER BY user;
 
 DROP VIEW IF EXISTS public_jobs;

ocflib/printing/quota.py

@@ -10,6 +10,7 @@
 WEEKDAY_QUOTA = 30
 WEEKEND_QUOTA = 30
 SEMESTERLY_QUOTA = 200
+COLOR_QUOTA = 10
 
 # Per BoD decision of 2017-04-24, the rules for making changes to the printing
 # quota, (non-normatively) summarized, are:
@@ -32,6 +33,7 @@
     'user',
     'daily',
     'semesterly',
+    'color',
 ))
 
 
@@ -51,6 +53,7 @@
     'pages',
     'staffer',
     'reason',
+    'color',
 ))
 
 
@@ -73,24 +76,25 @@ def daily_quota(day=None):
 def get_quota(c, user):
     """Return a UserQuota representing the user's quota."""
     if is_in_group(user, 'opstaff'):
-        return UserQuota(user, 500, 500)
+        return UserQuota(user, 500, 500, 500)
 
     if not user_exists(user) or user_is_group(user):
-        return UserQuota(user, 0, 0)
+        return UserQuota(user, 0, 0, 0)
 
     c.execute(
-        'SELECT `today`, `semester` FROM `printed` WHERE `user` = %s',
+        'SELECT `today`, `semester`, `color` FROM `printed` WHERE `user` = %s',
         (user,)
     )
 
     row = c.fetchone()
     if not row:
-        row = {'today': 0, 'semester': 0}
+        row = {'today': 0, 'semester': 0, 'color': 0}
     semesterly = SEMESTERLY_QUOTA - int(row['semester'])
     return UserQuota(
         user=user,
         daily=min(semesterly, daily_quota() - int(row['today'])),
         semesterly=semesterly,
+        color=min(semesterly, COLOR_QUOTA - int(row['color'])),
     )
 
 

tests/printing/quota_test.py

@@ -18,10 +18,12 @@
 from ocflib.printing.quota import UserQuota
 from ocflib.printing.quota import WEEKDAY_QUOTA
 from ocflib.printing.quota import WEEKEND_QUOTA
+from ocflib.printing.quota import COLOR_QUOTA
 
 
 FAKE_DAILY_QUOTA = 1000
 FAKE_SEMESTERLY_QUOTA = 10000
+FAKE_COLOR_QUOTA = 1000
 
 TODAY = datetime.today()
 YESTERDAY = TODAY - timedelta(days=1)
@@ -42,6 +44,7 @@
     pages=3,
     staffer='ckuehl',
     reason='just because',
+    color=0,
 )
 
 
@@ -84,7 +87,7 @@ def assert_quota(c, user, diff_daily, diff_semesterly):
             mock.patch('ocflib.printing.quota.SEMESTERLY_QUOTA', start[1]):
         assert (
             get_quota(c, user) ==
-            UserQuota(user, FAKE_DAILY_QUOTA + diff_daily, FAKE_SEMESTERLY_QUOTA + diff_semesterly)
+            UserQuota(user, FAKE_DAILY_QUOTA + diff_daily, FAKE_SEMESTERLY_QUOTA + diff_semesterly, min(COLOR_QUOTA, FAKE_SEMESTERLY_QUOTA + diff_semesterly))
         )
 
 
@@ -96,21 +99,21 @@ def test_quota_user_not_in_db(user, mysql_connection):
 def test_desk_staff_have_infinite_quota(mysql_connection):
     assert (
         get_quota(mysql_connection, 'testopstaff') ==
-        UserQuota('testopstaff', 500, 500)
+        UserQuota('testopstaff', 500, 500, 500)
     )
 
 
 def test_groups_have_zero_quota(mysql_connection):
     assert (
         get_quota(mysql_connection, 'ggroup') ==
-        UserQuota('ggroup', 0, 0)
+        UserQuota('ggroup', 0, 0, 0)
     )
 
 
 def test_non_existent_users_have_zero_quota(mysql_connection):
     assert (
         get_quota(mysql_connection, 'nonexist') ==
-        UserQuota('nonexist', 0, 0)
+        UserQuota('nonexist', 0, 0, 0)
     )