Added dayna's changes for db; updated object defs for reviewer and model

Author: dgisolfi

database/war.sql

@@ -48,12 +48,12 @@ create table PeopleReviews(
 
 --Models--
 create table Models(
-	modelId   SERIAL PRIMARY KEY,
-    modelVersion SERIAL,
+    modelId SERIAL PRIMARY KEY,
+    modelVersion text not null,
 	balAccuracy  decimal not null,
-	loc          text not null,
-	dateAdded    timestamp not null
-    UNIQUE(modelId, modelVersion)
+	isActive     boolean not null,
+	dateAdded    timestamp not null,
+    ruleId       integer not null references Rules(ruleId)
 );
 
 --Model Reviews--
@@ -146,20 +146,20 @@ returns int as $$
   end;
 $$ language 'plpgsql';
 
-create function getCorrectReviewsCount(sentence int)
+create or replace function getCorrectReviewsCount(sentence int)
 returns int as $$
   begin
-    return(select count(pr.rulereview)
+    return(select count(pr.rulereview)/5
             from peoplereviews pr inner join sentencerules sr on pr.sentenceid = sr.sentenceid
             where pr.sentenceid = 1 and pr.rulereviewid = sr.taggedruleid and pr.rulereview = 1
             group by pr.rulereviewid);
   end;
 $$ language 'plpgsql';
 
-create function getIncorrectReviewsCount(sentence int)
+create or replace function getIncorrectReviewsCount(sentence int)
 returns int as $$
   begin
-    return(select count(pr.rulereview)
+    return(select count(pr.rulereview)/5
             from peoplereviews pr inner join sentencerules sr on pr.sentenceid = sr.sentenceid
             where pr.sentenceid = 1 and pr.rulereviewid = sr.taggedruleid and pr.rulereview = 0
             group by pr.rulereviewid);
@@ -169,23 +169,28 @@ $$ language 'plpgsql';
 CREATE OR REPLACE PROCEDURE getSentenceReviewStatus(sentence int)
 AS $$
   begin
-    if (getTotalCountOfReviews(sentence) == 5) then
-      if (getCorrectReviewsCount(sentence) == 5) or (getIncorrectReviewsCount(sentence) == 5) then
+    if (getTotalCountOfReviews(sentence) = 5) then
+      if (getCorrectReviewsCount(sentence) = 5) or (getIncorrectReviewsCount(sentence) == 5) then
         perform sendToDataset(sentence);
       end if;
     elsif (getTotalCountOfReviews(sentence) > 5) then
       if ((getCorrectReviewsCount(sentence) / getIncorrectReviewsCount(sentence)) >= .75 and
           (getCorrectReviewsCount(sentence) / getIncorrectReviewsCount(sentence)) < 1) then
           perform sendToDataset(sentence);
+		  update sentenceRules
+		  set status = 'Corrected'
+		  where sentenceid = sentence;
       elsif ((getIncorrectReviewsCount(sentence) / getCorrectReviewsCount(sentence)) >= .75 and
                 (getIncorrectReviewsCount(sentence) / getCorrectReviewsCount(sentence)) < 1) then
          perform sendToDataset(sentence);
+		 update sentenceRules
+		  set status = 'Corrected'
+		  where sentenceid = sentence;
       end if;
     end if;
   end;
 $$ language plpgsql;
 
-
 create function getSentenceFromID(sentID int)
 returns text as $$
 begin
@@ -205,4 +210,73 @@ BEGIN
      group by rulereviewid; 
 END
 $$ 
-LANGUAGE plpgsql;
+LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION SentenceToBeReviewed (userID INT)
+RETURNS TABLE(sentenceid INT) AS $$
+    BEGIN
+        RETURN QUERY select sr.sentenceid
+        from sentencerules sr inner join rules r on sr.taggedruleid = r.ruleid
+        where sr.sentenceid not in (select sentenceid
+                            from peoplereviews 
+                            where reviewerid = userID)
+        and sr.status = 'In Review'
+        order by priority desc
+        limit 1;
+    END;
+$$ LANGUAGE 'plpgsql';
+
+create or replace procedure updatePriority()
+as $$ 
+declare temprow rules%rowtype;
+declare counter int := 1;
+  begin
+    for temprow in select ruleid, count(sr.sentenceid) filter (where sr.status = 'Corrected')
+                   from rules r left outer join sentencerules sr on r.ruleid = sr.taggedruleid
+                   group by r.ruleid
+                   order by count(sr.sentenceid) desc
+    loop
+	  update rules
+	  set priority = counter
+	  where ruleid = temprow.ruleid;
+	  counter := counter + 1;
+  end loop;
+  end;
+$$ language plpgsql;
+
+create or replace function getRuleGrade(sentid int)
+returns decimal as $$
+  begin 
+    return (select td.rulecorrect
+            from trainingdataset td inner join sentencerules sr on td.sentenceid = sr.sentenceid
+            where td.rulecorrectid = sr.taggedruleid
+            and td.sentenceid = sentid);
+  end;
+$$ language plpgsql;
+
+
+CREATE OR REPLACE PROCEDURE updateReputation(sentID int)
+LANGUAGE sql
+AS $$
+  UPDATE reviewers r
+  SET reputation = reputation + (CASE WHEN 
+      (getRuleGrade(sentID) > .5)
+    THEN
+	  CASE WHEN pr.rulereview = 1 THEN
+        +10
+      ELSE
+        -10
+	  END
+	ELSE
+	  CASE WHEN pr.rulereview = 0 THEN
+        +10
+      ELSE
+        -10
+	  END
+    END)
+  FROM peoplereviews pr
+  INNER JOIN sentencerules sr ON (pr.sentenceid = sr.sentenceid
+                                  AND pr.rulereviewid = sr.taggedruleid)
+  WHERE pr.reviewerid = r.reviewerid
+    AND pr.sentenceid = sentID;
+$$;

swagger_server/models/model.py

@@ -15,41 +15,46 @@ class Model(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, model_id: int=None, model_version: int=None, bal_accuracy: float=None, location: str=None, date_added: str=None):  # noqa: E501
+    def __init__(self, model_id: int=None, model_version: str=None, bal_accuracy: float=None, is_active: bool=None, date_added: str=None, rule_id: int=None):  # noqa: E501
         """Model - a model defined in Swagger
 
         :param model_id: The model_id of this Model.  # noqa: E501
         :type model_id: int
         :param model_version: The model_version of this Model.  # noqa: E501
-        :type model_version: int
+        :type model_version: str
         :param bal_accuracy: The bal_accuracy of this Model.  # noqa: E501
         :type bal_accuracy: float
-        :param location: The location of this Model.  # noqa: E501
-        :type location: str
+        :param is_active: The is_active of this Model.  # noqa: E501
+        :type is_active: bool
         :param date_added: The date_added of this Model.  # noqa: E501
         :type date_added: str
+        :param rule_id: The rule_id of this Model.  # noqa: E501
+        :type rule_id: int
         """
         self.swagger_types = {
             'model_id': int,
-            'model_version': int,
+            'model_version': str,
             'bal_accuracy': float,
-            'location': str,
-            'date_added': str
+            'is_active': bool,
+            'date_added': str,
+            'rule_id': int
         }
 
         self.attribute_map = {
             'model_id': 'modelID',
             'model_version': 'modelVersion',
             'bal_accuracy': 'balAccuracy',
-            'location': 'location',
-            'date_added': 'dateAdded'
+            'is_active': 'isActive',
+            'date_added': 'dateAdded',
+            'rule_id': 'ruleId'
         }
 
         self._model_id = model_id
         self._model_version = model_version
         self._bal_accuracy = bal_accuracy
-        self._location = location
+        self._is_active = is_active
         self._date_added = date_added
+        self._rule_id = rule_id
 
     @classmethod
     def from_dict(cls, dikt) -> 'Model':
@@ -86,24 +91,24 @@ def model_id(self, model_id: int):
         self._model_id = model_id
 
     @property
-    def model_version(self) -> int:
+    def model_version(self) -> str:
         """Gets the model_version of this Model.
 
         Version of the model  # noqa: E501
 
         :return: The model_version of this Model.
-        :rtype: int
+        :rtype: str
         """
         return self._model_version
 
     @model_version.setter
-    def model_version(self, model_version: int):
+    def model_version(self, model_version: str):
         """Sets the model_version of this Model.
 
         Version of the model  # noqa: E501
 
         :param model_version: The model_version of this Model.
-        :type model_version: int
+        :type model_version: str
         """
         if model_version is None:
             raise ValueError("Invalid value for `model_version`, must not be `None`")  # noqa: E501
@@ -136,29 +141,29 @@ def bal_accuracy(self, bal_accuracy: float):
         self._bal_accuracy = bal_accuracy
 
     @property
-    def location(self) -> str:
-        """Gets the location of this Model.
+    def is_active(self) -> bool:
+        """Gets the is_active of this Model.
 
-        absolute path to model on disk  # noqa: E501
+        is the current model in use for a given rule  # noqa: E501
 
-        :return: The location of this Model.
-        :rtype: str
+        :return: The is_active of this Model.
+        :rtype: bool
         """
-        return self._location
+        return self._is_active
 
-    @location.setter
-    def location(self, location: str):
-        """Sets the location of this Model.
+    @is_active.setter
+    def is_active(self, is_active: bool):
+        """Sets the is_active of this Model.
 
-        absolute path to model on disk  # noqa: E501
+        is the current model in use for a given rule  # noqa: E501
 
-        :param location: The location of this Model.
-        :type location: str
+        :param is_active: The is_active of this Model.
+        :type is_active: bool
         """
-        if location is None:
-            raise ValueError("Invalid value for `location`, must not be `None`")  # noqa: E501
+        if is_active is None:
+            raise ValueError("Invalid value for `is_active`, must not be `None`")  # noqa: E501
 
-        self._location = location
+        self._is_active = is_active
 
     @property
     def date_added(self) -> str:
@@ -184,3 +189,28 @@ def date_added(self, date_added: str):
             raise ValueError("Invalid value for `date_added`, must not be `None`")  # noqa: E501
 
         self._date_added = date_added
+
+    @property
+    def rule_id(self) -> int:
+        """Gets the rule_id of this Model.
+
+        The Rule ID for the corresponding rule in the rules table  # noqa: E501
+
+        :return: The rule_id of this Model.
+        :rtype: int
+        """
+        return self._rule_id
+
+    @rule_id.setter
+    def rule_id(self, rule_id: int):
+        """Sets the rule_id of this Model.
+
+        The Rule ID for the corresponding rule in the rules table  # noqa: E501
+
+        :param rule_id: The rule_id of this Model.
+        :type rule_id: int
+        """
+        if rule_id is None:
+            raise ValueError("Invalid value for `rule_id`, must not be `None`")  # noqa: E501
+
+        self._rule_id = rule_id

swagger_server/models/reviewer.py

@@ -15,7 +15,7 @@ class Reviewer(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, reviewer_id: int=None, email_address: str=None, first_name: str=None, last_name: str=None, admin: bool=None, reputation: int=None):  # noqa: E501
+    def __init__(self, reviewer_id: int=None, email_address: str=None, first_name: str=None, last_name: str=None, is_admin: bool=None, reputation: int=None):  # noqa: E501
         """Reviewer - a model defined in Swagger
 
         :param reviewer_id: The reviewer_id of this Reviewer.  # noqa: E501
@@ -26,8 +26,8 @@ def __init__(self, reviewer_id: int=None, email_address: str=None, first_name: s
         :type first_name: str
         :param last_name: The last_name of this Reviewer.  # noqa: E501
         :type last_name: str
-        :param admin: The admin of this Reviewer.  # noqa: E501
-        :type admin: bool
+        :param is_admin: The is_admin of this Reviewer.  # noqa: E501
+        :type is_admin: bool
         :param reputation: The reputation of this Reviewer.  # noqa: E501
         :type reputation: int
         """
@@ -36,7 +36,7 @@ def __init__(self, reviewer_id: int=None, email_address: str=None, first_name: s
             'email_address': str,
             'first_name': str,
             'last_name': str,
-            'admin': bool,
+            'is_admin': bool,
             'reputation': int
         }
 
@@ -45,15 +45,15 @@ def __init__(self, reviewer_id: int=None, email_address: str=None, first_name: s
             'email_address': 'emailAddress',
             'first_name': 'firstName',
             'last_name': 'lastName',
-            'admin': 'admin',
+            'is_admin': 'isAdmin',
             'reputation': 'reputation'
         }
 
         self._reviewer_id = reviewer_id
         self._email_address = email_address
         self._first_name = first_name
         self._last_name = last_name
-        self._admin = admin
+        self._is_admin = is_admin
         self._reputation = reputation
 
     @classmethod
@@ -166,27 +166,29 @@ def last_name(self, last_name: str):
         self._last_name = last_name
 
     @property
-    def admin(self) -> bool:
-        """Gets the admin of this Reviewer.
+    def is_admin(self) -> bool:
+        """Gets the is_admin of this Reviewer.
 
         Denotes wether this user has admin privileges  # noqa: E501
 
-        :return: The admin of this Reviewer.
+        :return: The is_admin of this Reviewer.
         :rtype: bool
         """
-        return self._admin
+        return self._is_admin
 
-    @admin.setter
-    def admin(self, admin: bool):
-        """Sets the admin of this Reviewer.
+    @is_admin.setter
+    def is_admin(self, is_admin: bool):
+        """Sets the is_admin of this Reviewer.
 
         Denotes wether this user has admin privileges  # noqa: E501
 
-        :param admin: The admin of this Reviewer.
-        :type admin: bool
+        :param is_admin: The is_admin of this Reviewer.
+        :type is_admin: bool
         """
+        if is_admin is None:
+            raise ValueError("Invalid value for `is_admin`, must not be `None`")  # noqa: E501
 
-        self._admin = admin
+        self._is_admin = is_admin
 
     @property
     def reputation(self) -> int: