@@ -312,7 +312,7 @@ export default function ConfirmationModal({requestId, openModal, handleModal, st
diff --git a/forms-flow-web/src/components/FOI/customComponents/ConfirmationModal/util.js b/forms-flow-web/src/components/FOI/customComponents/ConfirmationModal/util.js
index 5cd9c4e31..c24c79a58 100644
--- a/forms-flow-web/src/components/FOI/customComponents/ConfirmationModal/util.js
+++ b/forms-flow-web/src/components/FOI/customComponents/ConfirmationModal/util.js
@@ -67,9 +67,9 @@ import { getFullnameList } from "../../../../helper/FOI/helper";
case StateEnum.review.name.toLowerCase():
if(!allowStateChange)
return {title: "Changing the state", body: `Unable to change state until fee estimate actuals have been completed.`};
- else if (!isAnyAmountPaid && _saveRequestObject.requeststatuslabel === StateEnum.callforrecords.label)
+ else if (!isAnyAmountPaid && _saveRequestObject.requeststatusid === StateEnum.callforrecords.id)
return {title: "Review Request", body: `Upload completed Call for Records form (if required) to change the state.`};
- else if (_saveRequestObject.requeststatuslabel === StateEnum.harms.label)
+ else if (_saveRequestObject.requeststatusid === StateEnum.harms.id)
return {title: "Review Request", body: `Upload completed Call for Records form (if required) to change the state.`};
else
return {title: "Changing the state", body: `Are you sure you want to change Request #${_requestNumber} to ${StateEnum.review.name}?`};
@@ -122,7 +122,7 @@ import { getFullnameList } from "../../../../helper/FOI/helper";
body: <>Are you sure you want to change Request #{_requestNumber} to on hold?
This will stop the clock and automatically email the applicant the fee estimate. };
}
case StateEnum.response.name.toLowerCase():
- if (_saveRequestObject.requeststatuslabel === StateEnum.signoff.label)
+ if (_saveRequestObject.requeststatusid === StateEnum.signoff.id)
return {title: "Ministry Sign Off", body: `Upload eApproval Logs, and enter in required approval fields to verify Ministry Approval and then change the state.`};
else
return {title: "Changing the state", body: `Are you sure you want to change Request #${_requestNumber} to ${StateEnum.response.name}?`};
diff --git a/forms-flow-web/src/constants/FOI/statusEnum.js b/forms-flow-web/src/constants/FOI/statusEnum.js
index 6f226fa09..aae8ef2ae 100644
--- a/forms-flow-web/src/constants/FOI/statusEnum.js
+++ b/forms-flow-web/src/constants/FOI/statusEnum.js
@@ -188,27 +188,27 @@ const MinistryStateList = Object.freeze({
// This corresponds to rows in the FOIRequestStatuses table on the backend
const StateEnum = Object.freeze({
- open: { name: "Open", label: "open" },
- callforrecords: { name: "Call For Records", label: "callforrecords" },
- callforrecordsoverdue: { name: "Call For Records Overdue", label: "callforrecordsoverdue" },
- closed: { name: "Closed", label: "closed" },
- redirect: { name: "Redirect", label: "redirect" },
- unopened: { name: "Unopened", label: "unopened" },
- intakeinprogress: { name: "Intake in Progress", label: "intakeinprogress" },
- review: { name: "Records Review", label: "recordsreview" },
- feeassessed: { name: "Fee Estimate", label: "feeestimate" },
- consult: { name: "Consult", label: "consult" },
- signoff: { name: "Ministry Sign Off", label: "ministrysignoff" },
- onhold: { name: "On Hold", label: "onhold" },
- deduplication: { name: "Deduplication", label: "deduplication" },
- harms: { name: "Harms Assessment", label: "harmsassessment" },
- response: { name: "Response", label: "response" },
- archived: { name: "Archived", label: "archived" },
- peerreview: { name: "Peer Review", label: "peerreview" },
- tagging: { name: "Tagging", label: "tagging" },
- readytoscan: { name: "Ready to Scan", label: "readytoscan" },
- appfeeowing: { name: "App Fee Owing", label: "appfeeowing" },
- section5pending: { name: "Section 5 Pending", label: "section5pending" },
+ open: { name: "Open", id: 1 },
+ callforrecords: { name: "Call For Records", id: 2 },
+ callforrecordsoverdue: { name: "Call For Records Overdue", id: -100 },
+ closed: { name: "Closed", id: 3 },
+ redirect: { name: "Redirect", id: 4 },
+ unopened: { name: "Unopened", id: 5 },
+ intakeinprogress: { name: "Intake in Progress", id: 6 },
+ review: { name: "Records Review", id: 7 },
+ feeassessed: { name: "Fee Estimate", id: 8 },
+ consult: { name: "Consult", id: 9 },
+ signoff: { name: "Ministry Sign Off", id: 10 },
+ onhold: { name: "On Hold", id: 11 },
+ deduplication: { name: "Deduplication", id: 12 },
+ harms: { name: "Harms Assessment", id: 13 },
+ response: { name: "Response", id: 14 },
+ archived: { name: "Archived", id: 15 },
+ peerreview: { name: "Peer Review", id: 16 },
+ tagging: { name: "Tagging", id: 17 },
+ readytoscan: { name: "Ready to Scan", id: 18 },
+ appfeeowing: { name: "App Fee Owing", id: 19 },
+ section5pending: { name: "Section 5 Pending", id: 20 },
});
const StateTransitionCategories = Object.freeze({
diff --git a/forms-flow-web/src/services/UserService.js b/forms-flow-web/src/services/UserService.js
index c20850123..5b309bfa2 100644
--- a/forms-flow-web/src/services/UserService.js
+++ b/forms-flow-web/src/services/UserService.js
@@ -19,6 +19,7 @@ import {
isFlexTeam,
} from "../helper/FOI/helper";
+const jwt = require("jsonwebtoken");
const tokenRefreshInterval = 180000; // how often we should check for token expiry --> 180000 = 3 mins
const tokenUpdateThreshold = 600; // if token expires in less than 10 minutes (600 seconds), refresh token
diff --git a/notification-manager/common/notificationtypes.json b/notification-manager/common/notificationtypes.json
deleted file mode 100644
index 5c04ecec7..000000000
--- a/notification-manager/common/notificationtypes.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "state": {
- "notificationtypeid": 1,
- "name": "State",
- "description": "State",
- "active": true,
- "notificationtypelabel": "state"
- },
- "division": {
- "notificationtypeid": 2,
- "name": "Division",
- "description": "Division",
- "active": true,
- "notificationtypelabel": "division"
- },
- "newusercomments": {
- "notificationtypeid": 3,
- "name": "New User Comments",
- "description": "New User Comments",
- "active": true,
- "notificationtypelabel": "newusercomments"
- },
- "extension": {
- "notificationtypeid": 4,
- "name": "Extension",
- "description": "Extension",
- "active": true,
- "notificationtypelabel": "extension"
- },
- "iaoassignment": {
- "notificationtypeid": 5,
- "name": "IAO Assignment",
- "description": "IAO Assignment",
- "active": true,
- "notificationtypelabel": "iaoassignment"
- },
- "ministryassignment": {
- "notificationtypeid": 6,
- "name": "Ministry Assignment",
- "description": "Ministry Assignment",
- "active": true,
- "notificationtypelabel": "ministryassignment"
- },
- "cfrduereminder": {
- "notificationtypeid": 7,
- "name": "CFR Due Reminder",
- "description": "CFR Due Reminder",
- "active": true,
- "notificationtypelabel": "cfrduereminder"
- },
- "legislativeduereminder": {
- "notificationtypeid": 8,
- "name": "Legislative Due Reminder",
- "description": "Legislative Due Reminder",
- "active": true,
- "notificationtypelabel": "legislativeduereminder"
- },
- "replyusercomments": {
- "notificationtypeid": 9,
- "name": "Reply User Comments",
- "description": "Reply User Comments",
- "active": true,
- "notificationtypelabel": "replyusercomments"
- },
- "taggedusercomments": {
- "notificationtypeid": 10,
- "name": "Tagged User Comments",
- "description": "Tagged User Comments",
- "active": true,
- "notificationtypelabel": "taggedusercomments"
- },
- "cfrfeeform": {
- "notificationtypeid": 11,
- "name": "CFR Fee Form",
- "description": "CFR Fee Form",
- "active": true,
- "notificationtypelabel": "cfrfeeform"
- },
- "groupmembers": {
- "notificationtypeid": 12,
- "name": "Group Members",
- "description": "Group Members",
- "active": true,
- "notificationtypelabel": "groupmembers"
- },
- "divisionduereminder": {
- "notificationtypeid": 13,
- "name": "Division Due Reminder",
- "description": "Division Due Reminder",
- "active": true,
- "notificationtypelabel": "divisionduereminder"
- },
- "watcher": {
- "notificationtypeid": 14,
- "name": "Watcher",
- "description": "Watcher",
- "active": true,
- "notificationtypelabel": "watcher"
- },
- "userassignmentremoval": {
- "notificationtypeid": 15,
- "name": "User Assignment Removal",
- "description": "User Assignment Removal",
- "active": true,
- "notificationtypelabel": "userassignmentremoval"
- },
- "emailfailure": {
- "notificationtypeid": 16,
- "name": "Email Failure",
- "description": "Email Failure",
- "active": true,
- "notificationtypelabel": "emailfailure"
- },
- "payment": {
- "notificationtypeid": 17,
- "name": "Payment",
- "description": "Payment",
- "active": true,
- "notificationtypelabel": "payment"
- },
- "records": {
- "notificationtypeid": 18,
- "name": "Records",
- "description": "Records",
- "active": true,
- "notificationtypelabel": "records"
- },
- "pdfstitch": {
- "notificationtypeid": 19,
- "name": "PDFStitch",
- "description": "PDFStitch",
- "active": true,
- "notificationtypelabel": "pdfstitch"
- },
- "section5pendingreminder": {
- "notificationtypeid": 20,
- "name": "Section 5 Pending Reminder",
- "description": "Section 5 Pending Reminder",
- "active": true,
- "notificationtypelabel": "section5pendingreminder"
- }
-}
diff --git a/notification-manager/common/notificationusertypes.json b/notification-manager/common/notificationusertypes.json
deleted file mode 100644
index 0ea835c44..000000000
--- a/notification-manager/common/notificationusertypes.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "watcher": {
- "notificationusertypeid": 1,
- "name": "Watcher",
- "description": "Watcher",
- "isactive": true,
- "notificationusertypelabel": "watcher"
- },
- "assignee": {
- "notificationusertypeid": 2,
- "name": "Assignee",
- "description": "Assignee",
- "isactive": true,
- "notificationusertypelabel": "assignee"
- },
- "commentuser": {
- "notificationusertypeid": 3,
- "name": "Comment User",
- "description": "Comment User",
- "isactive": true,
- "notificationusertypelabel": "commentuser"
- },
- "triggereduser": {
- "notificationusertypeid": 4,
- "name": "Triggered User",
- "description": "Triggered User",
- "isactive": true,
- "notificationusertypelabel": "triggereduser"
- }
-}
diff --git a/notification-manager/docker-compose.yml b/notification-manager/docker-compose.yml
index ec64f12e1..893e4ec32 100644
--- a/notification-manager/docker-compose.yml
+++ b/notification-manager/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
notification-manager:
build:
- context: ./
+ context: ./notification-manager
dockerfile: dockerfile.local
image: foinotificationmanager
container_name: aot_foi_notification_manager
@@ -30,7 +30,6 @@ services:
- NOTIFICATION_REDIS_HEALTHCHECK_INT=${NOTIFICATION_REDIS_HEALTHCHECK_INT}
- NOTIFICATION_STREAM_KEY=${NOTIFICATION_STREAM_KEY}
- DIVISION_PDF_STITCH_SERVICE_KEY=${DIVISION_PDF_STITCH_SERVICE_KEY}
- - MUTE_NOTIFICATION=${MUTE_NOTIFICATION}
volumes:
dbdata:
networks:
diff --git a/notification-manager/notification_api/dao/models/FOIMinistryRequest.py b/notification-manager/notification_api/dao/models/FOIMinistryRequest.py
index 4dc3f732a..e1550b884 100644
--- a/notification-manager/notification_api/dao/models/FOIMinistryRequest.py
+++ b/notification-manager/notification_api/dao/models/FOIMinistryRequest.py
@@ -11,16 +11,11 @@ def getrequest(cls, ministryrequestid):
try:
conn = getconnection()
cursor = conn.cursor()
- cursor.execute("""select foiministryrequestid, filenumber, foirequest_id, fr."version" , axisrequestid, assignedministryperson, assignedto, f.requesttype, p.bcgovcode, assignedministrygroup, fs.name as requeststatus
- from "FOIMinistryRequests" fr
- inner join "FOIRequests" f on f.foirequestid = fr.foirequest_id and f.version = fr.foirequestversion_id
- inner join "ProgramAreas" p on p.programareaid = fr.programareaid
- inner join "FOIRequestStatuses" fs on fs.requeststatusid = fr.requeststatusid
- where foiministryrequestid = {0} order by fr."version" desc limit 1""".format(ministryrequestid))
-
+ cursor.execute("""select foiministryrequestid, filenumber, foirequest_id, "version" , axisrequestid, assignedministryperson, assignedto
+ from "FOIMinistryRequests" fr where foiministryrequestid = {0} order by "version" desc limit 1""".format(ministryrequestid))
row = cursor.fetchone()
if row is not None:
- return {"foiministryrequestid": str(row[0]), "filenumber": row[1], "foirequest_id": row[2], "version": row[3], "axisrequestid": row[4], "assignedministryperson": row[5], "assignedto": row[6], "requesttype": row[7], "bcgovcode": row[8], "assignedministrygroup": row[9], "requeststatus": row[10]}
+ return {"foiministryrequestid": str(row[0]), "filenumber": row[1], "foirequest_id": row[2], "version": row[3], "axisrequestid": row[4], "assignedministryperson": row[5], "assignedto": row[6]}
cursor.close()
return None
except(Exception) as error:
diff --git a/notification-manager/notification_api/dao/models/FOIRequestNotificationUsers.py b/notification-manager/notification_api/dao/models/FOIRequestNotificationUsers.py
index ecf341c6f..4c34a759a 100644
--- a/notification-manager/notification_api/dao/models/FOIRequestNotificationUsers.py
+++ b/notification-manager/notification_api/dao/models/FOIRequestNotificationUsers.py
@@ -11,20 +11,18 @@ class Meta: # pylint: disable=too-few-public-methods
unknown = EXCLUDE
notificationid = fields.Int(data_key="notificationid")
userid = fields.Str(data_key="userid")
- notificationusertypelabel = fields.Str(data_key="notificationusertypelabel")
- notificationusertypeid = fields.Int(data_key="notificationusertypeid")
+ notificationusertypeid = fields.Int(data_key="notificationusertypeid")
createdby = fields.Str(data_key="createdby")
created_at = fields.Str(data_key="created_at")
- isdeleted = fields.Boolean(data_key="isdeleted")
def savenotificationuser(self, notificationuser):
conn = None
try:
conn = getconnection()
cursor = conn.cursor()
- cursor.execute('INSERT INTO public."FOIRequestNotificationUsers" (notificationid, userid, notificationusertypeid, notificationusertypelabel, createdby, created_at, isdeleted) \
- VALUES(%s::integer, %s, %s::integer, %s, %s, %s, %s::boolean)',
- (int(notificationuser.notificationid), str(notificationuser.userid), int(notificationuser.notificationusertypeid), str(notificationuser.notificationusertypelabel), str(notificationuser.createdby), datetime.now(), int(notificationuser.isdeleted)))
+ cursor.execute('INSERT INTO public."FOIRequestNotificationUsers" (notificationid, userid, notificationusertypeid, createdby, created_at) \
+ VALUES(%s::integer,%s, %s::integer, %s,%s)',
+ (int(notificationuser.notificationid), str(notificationuser.userid), int(notificationuser.notificationusertypeid), str(notificationuser.createdby), datetime.now()))
conn.commit()
cursor.close()
except(Exception) as error:
diff --git a/notification-manager/notification_api/dao/models/FOIRequestNotifications.py b/notification-manager/notification_api/dao/models/FOIRequestNotifications.py
index df7db942a..7cfa7b643 100644
--- a/notification-manager/notification_api/dao/models/FOIRequestNotifications.py
+++ b/notification-manager/notification_api/dao/models/FOIRequestNotifications.py
@@ -13,7 +13,7 @@ class Meta: # pylint: disable=too-few-public-methods
requestid = fields.Int(data_key="requestid")
idnumber = fields.Str(data_key="idnumber")
foirequestid = fields.Int(data_key="foirequestid")
- notificationtypelabel = fields.Int(data_key="notificationtypelabel")
+ notificationtypeid = fields.Int(data_key="notificationtypeid")
axisnumber = fields.Str(data_key="axisnumber")
version = fields.Int(data_key="version")
notification = fields.Str(data_key="notification")
@@ -26,9 +26,9 @@ def savenotification(self, notificationschema):
id_of_new_row = None
conn = getconnection()
cursor = conn.cursor()
- cursor.execute('INSERT INTO public."FOIRequestNotifications" (notification, notificationtypelabel, requestid, "version", idnumber, axisnumber, foirequestid, createdby, created_at) \
+ cursor.execute('INSERT INTO public."FOIRequestNotifications" (notification, notificationtypeid, requestid, "version", idnumber, axisnumber, foirequestid, createdby, created_at) \
VALUES(%s::json,%s::integer, %s::integer, %s::integer,%s,%s,%s::integer,%s,%s) RETURNING notificationid',
- (json.dumps(notificationschema.notification), int(notificationschema.notificationtypelabel), int(notificationschema.requestid), int(notificationschema.version),
+ (json.dumps(notificationschema.notification), int(notificationschema.notificationtypeid), int(notificationschema.requestid), int(notificationschema.version),
str(notificationschema.idnumber), str(notificationschema.axisnumber), int(notificationschema.foirequestid), str(notificationschema.createdby), datetime.now()))
conn.commit()
diff --git a/notification-manager/notification_api/dao/models/NotificationTypes.py b/notification-manager/notification_api/dao/models/NotificationTypes.py
index e2db41f92..7fdc577b3 100644
--- a/notification-manager/notification_api/dao/models/NotificationTypes.py
+++ b/notification-manager/notification_api/dao/models/NotificationTypes.py
@@ -11,7 +11,7 @@ def getid(self, name):
_notificationtypes = []
conn = getconnection()
cursor = conn.cursor()
- cursor.execute("""select notificationtypelabel from "NotificationTypes" nt where isactive = true and name = '{0}'""".format(name))
+ cursor.execute("""select notificationtypeid from "NotificationTypes" nt where isactive = true and name = '{0}'""".format(name))
data = cursor.fetchone()
if data is not None:
return data[0]
diff --git a/notification-manager/notification_api/dao/models/NotificationUserTypes.py b/notification-manager/notification_api/dao/models/NotificationUserTypes.py
deleted file mode 100644
index ee9719aac..000000000
--- a/notification-manager/notification_api/dao/models/NotificationUserTypes.py
+++ /dev/null
@@ -1,27 +0,0 @@
-'''
-This file is used in the notification manager container
-to fetch the data models for the NotificationUserTypes table
-'''
-from datetime import datetime
-from notification_api.dao.db import getconnection
-import logging
-
-class NotificationUserType(object):
- def getid(self, name):
- conn = None
- try:
- _notificationusertypes = []
- conn = getconnection()
- cursor = conn.cursor()
- cursor.execute("""select notificationusertypelabel from "NotificationUserTypes" nt where isactive = true and name = '{0}'""".format(name))
- data = cursor.fetchone()
- if data is not None:
- return data[0]
-
- cursor.close()
- return _notificationusertypes
- except(Exception) as error:
- logging.error(error)
- finally:
- if conn:
- conn.close()
diff --git a/notification-manager/notification_api/services/notifications/notificationconfig.py b/notification-manager/notification_api/services/notifications/notificationconfig.py
index 4c6ed8179..16e9413e6 100644
--- a/notification-manager/notification_api/services/notifications/notificationconfig.py
+++ b/notification-manager/notification_api/services/notifications/notificationconfig.py
@@ -4,7 +4,6 @@
import json
import os
from notification_api.dao.models.NotificationTypes import NotificationType
-from notification_api.dao.models.NotificationUserTypes import NotificationUserType
class notificationconfig:
""" Notfication config
@@ -12,23 +11,30 @@ class notificationconfig:
"""
def getnotificationtypeid(self, notificationtype):
- notificationid = NotificationType().getid(notificationtype)
- if notificationid is not None:
- return notificationid
+
+ if "IAO Assignment" in notificationtype:
+ return 5
+ elif "Ministry Assignment" in notificationtype:
+ return 6
+ else:
+ notificationid = NotificationType().getid(notificationtype)
+ if notificationid is not None:
+ return notificationid
+ return 0
- def getnotficationusertypelabel(self, notificationusertype):
- notificationuserid = NotificationUserType().getid(notificationusertype)
- if notificationuserid is not None:
- return notificationuserid
+ def getnotificationusertypeid(self, notificationusertype):
+ if notificationusertype.lower() == "watcher":
+ return 1
+ elif notificationusertype.lower() == "assignee" or "comment" or "group members" in notificationusertype.lower():
+ return 2
+ elif notificationusertype.lower() == "comment user":
+ return 3
+ elif notificationusertype.lower() == "triggered user":
+ return 4
+ return 0
def getnotificationdays(self):
if 'FOI_NOTIFICATION_DAYS' in os.environ and os.getenv('FOI_NOTIFICATION_DAYS') != '':
return os.getenv('FOI_NOTIFICATION_DAYS')
else:
- return str(14)
-
- def getmutenotifications(self):
- if 'MUTE_NOTIFICATION' in os.environ and os.getenv('MUTE_NOTIFICATION') != '':
- return json.loads(os.getenv('MUTE_NOTIFICATION'))
- else:
- return {}
\ No newline at end of file
+ return str(14)
\ No newline at end of file
diff --git a/notification-manager/notification_api/services/notifications/notificationuser.py b/notification-manager/notification_api/services/notifications/notificationuser.py
index 49e02c48a..4618dc4d3 100644
--- a/notification-manager/notification_api/services/notifications/notificationuser.py
+++ b/notification-manager/notification_api/services/notifications/notificationuser.py
@@ -54,33 +54,33 @@ def __istaggeduser(self, notificationuser, foicomment, notificationtype):
def __gettriggereduser(self, userid, notificationtype):
notificationusers = []
if notificationtype in ["Records", "PDFStitch"]:
- notificationusers.append({"userid":userid, "usertype":notificationconfig().getnotficationusertypelabel("triggered user")})
+ notificationusers.append({"userid":userid, "usertype":notificationconfig().getnotificationusertypeid("triggered user")})
return notificationusers
def __getwatchers(self, notificationtype, foirequest, requesttype, requestjson=None):
notificationusers = []
if notificationtype == "Watcher":
- notificationusers.append({"userid": requestjson['watchedby'], "usertype":notificationconfig().getnotficationusertypelabel("Watcher")})
+ notificationusers.append({"userid": requestjson['watchedby'], "usertype":notificationconfig().getnotificationusertypeid("Watcher")})
else:
if requesttype == "ministryrequest":
watchers = FOIMinistryRequest().getwatchers(foirequest["foiministryrequestid"])
else:
watchers = FOIRawRequest().getwatchers(foirequest['requestid'])
for watcher in watchers:
- notificationusers.append({"userid":watcher["watchedby"], "usertype":notificationconfig().getnotficationusertypelabel("Watcher")})
+ notificationusers.append({"userid":watcher["watchedby"], "usertype":notificationconfig().getnotificationusertypeid("Watcher")})
return notificationusers
def __getassignees(self, foirequest, requesttype, notificationtype, requestjson=None):
notificationusers = []
- notificationtypelabel = notificationconfig().getnotficationusertypelabel("Assignee")
+ notificationtypeid = notificationconfig().getnotificationusertypeid("Assignee")
if notificationtype == 'User Assignment Removal':
- notificationusers.append({"userid": requestjson['userid'], "usertype":notificationtypelabel})
+ notificationusers.append({"userid": requestjson['userid'], "usertype":notificationtypeid})
else:
if requesttype == "ministryrequest" and foirequest["assignedministryperson"] is not None and (notificationtype == 'Ministry Assignment' or 'Assignment' not in notificationtype):
- notificationusers.append({"userid":foirequest["assignedministryperson"], "usertype":notificationtypelabel})
+ notificationusers.append({"userid":foirequest["assignedministryperson"], "usertype":notificationtypeid})
if foirequest["assignedto"] is not None and foirequest["assignedto"] != '' and (notificationtype == 'IAO Assignment' or 'Assignment' not in notificationtype):
- notificationusers.append({"userid":foirequest["assignedto"], "usertype":notificationtypelabel})
+ notificationusers.append({"userid":foirequest["assignedto"], "usertype":notificationtypeid})
return notificationusers
def __getcommentusers(self, foirequest, comment, requesttype):
@@ -105,7 +105,7 @@ def __getcommentusertype(self, userid, requestusers):
for requestuser in requestusers:
if requestuser["userid"] == userid:
return requestuser["usertype"]
- return notificationconfig().getnotficationusertypelabel("comment user")
+ return notificationconfig().getnotificationusertypeid("comment user")
def __getrelatedusers(self, comment, requesttype):
if requesttype == "ministryrequest":
@@ -121,14 +121,14 @@ def __gettaggedusers(self, comment):
def __preparetaggeduser(self, data):
taggedusers = []
for entry in data:
- taggedusers.append({"userid":entry["username"], "usertype":notificationconfig().getnotficationusertypelabel("comment tagged user")})
+ taggedusers.append({"userid":entry["username"], "usertype":notificationconfig().getnotificationusertypeid("comment tagged user")})
return taggedusers
def __getgroupmembers(self,groupid):
notificationusers = []
- notificationtypelabel = notificationconfig().getnotficationusertypelabel("Group Members")
+ notificationtypeid = notificationconfig().getnotificationusertypeid("Group Members")
usergroupfromkeycloak= KeycloakAdminService().getmembersbygroupname(groupid)
for user in usergroupfromkeycloak[0].get("members"):
- notificationusers.append({"userid":user["username"], "usertype":notificationtypelabel})
+ notificationusers.append({"userid":user["username"], "usertype":notificationtypeid})
return notificationusers
\ No newline at end of file
diff --git a/notification-manager/notification_api/services/notificationservice.py b/notification-manager/notification_api/services/notificationservice.py
index d4871ce3f..467df3ba3 100644
--- a/notification-manager/notification_api/services/notificationservice.py
+++ b/notification-manager/notification_api/services/notificationservice.py
@@ -8,7 +8,6 @@
from notification_api.dao.models.FOIRequestNotificationUsers import FOIRequestNotificationUser
from notification_api.dao.models.FOIMinistryRequest import FOIMinistryRequest
-from notification_api.services.external.keycloakadminservice import KeycloakAdminService
from notification_api.default_method_result import DefaultMethodResult
from datetime import datetime
from dateutil.parser import parse
@@ -28,20 +27,8 @@ def createnotification(self, requesttype, requestid, message, notificationtype,
if notificationusers is not None and len(notificationusers) > 0:
#Create notification
notificationid = self.__createnotification(message, requesttype, notificationtype, userid, foirequest)
-
- #mute notifications for ministry users
- ministryusers = []
- if requesttype == "ministryrequest":
- mutenotification = self.__mutenotification(requesttype, notificationtype, foirequest)
- usergroupfromkeycloak = KeycloakAdminService().getmembersbygroupname(foirequest["assignedministrygroup"])
- if usergroupfromkeycloak is not None and len(usergroupfromkeycloak) > 0:
- for user in usergroupfromkeycloak[0].get("members"):
- ministryusers.append(user["username"])
- else:
- mutenotification = False
-
#Create notification users
- return self.__createnotificationusers(requesttype, notificationid, notificationusers, userid, mutenotification, ministryusers)
+ return self.__createnotificationusers(requesttype, notificationid, notificationusers, userid)
return DefaultMethodResult(True,'No change',requestid)
def __createnotification(self, message, requesttype, notificationtype, userid, foirequest):
@@ -50,10 +37,10 @@ def __createnotification(self, message, requesttype, notificationtype, userid, f
return FOIRequestNotification().savenotification(notification)
return None
- def __createnotificationusers(self, requesttype, notificationid, notificationusers, userid, mute=False, ministryusers=[]):
+ def __createnotificationusers(self, requesttype, notificationid, notificationusers, userid):
for notificationuser in notificationusers:
- if requesttype == "ministryrequest":
- user = self.__preparenotificationuser(notificationid, notificationuser, userid, mute, ministryusers)
+ user = self.__preparenotificationuser(requesttype, notificationid, notificationuser, userid)
+ if requesttype == "ministryrequest":
FOIRequestNotificationUser().savenotificationuser(user)
return DefaultMethodResult(True,'Notification users added',notificationid)
@@ -65,7 +52,7 @@ def __preparenotification(self, message, requesttype, notificationtype, userid,
notification.requestid = foirequest["foiministryrequestid"]
notification.idnumber = foirequest["filenumber"]
notification.foirequestid = foirequest["foirequest_id"]
- notification.notificationtypelabel = notificationconfig().getnotificationtypelabel(notificationtype)
+ notification.notificationtypeid = notificationconfig().getnotificationtypeid(notificationtype)
notification.axisnumber = foirequest["axisrequestid"]
notification.version = foirequest["version"]
notification.createdby = userid
@@ -73,13 +60,10 @@ def __preparenotification(self, message, requesttype, notificationtype, userid,
return notification
- def __preparenotificationuser(self, notificationid, notificationuser, userid, mute, ministryusers):
- user = FOIRequestNotificationUser()
- if notificationuser["userid"] in ministryusers:
- user.isdeleted = mute
- else:
- user.isdeleted = False
- user.notificationusertypelabel = notificationuser["usertype"]
+ def __preparenotificationuser(self, requesttype, notificationid, notificationuser, userid):
+ if requesttype == "ministryrequest":
+ user = FOIRequestNotificationUser()
+ user.notificationusertypeid = notificationuser["usertype"]
user.notificationid = notificationid
user.userid = notificationuser["userid"]
user.createdby = userid
@@ -90,16 +74,3 @@ def getrequest(self, requestid, requesttype):
if requesttype == "ministryrequest":
return FOIMinistryRequest.getrequest(requestid)
- def __mutenotification(self, requesttype, notificationtype, request):
- #get mute conditions from env
- mutenotifications = notificationconfig().getmutenotifications()
- bcgovcode = request["bcgovcode"].upper()
- if requesttype == "ministryrequest" and bcgovcode in mutenotifications:
- if request["requesttype"].upper() in (_requesttype.upper() for _requesttype in mutenotifications[bcgovcode]["request_types"]):
- if request["requeststatus"].upper() in (_state.upper() for _state in mutenotifications[bcgovcode]["state_exceptions"]):
- return False
- if notificationtype.upper() in (_notificationtype.upper() for _notificationtype in mutenotifications[bcgovcode]["type_exceptions"]):
- return False
- return True
-
- return False
\ No newline at end of file
diff --git a/notification-manager/sample.env b/notification-manager/sample.env
index 8898ee81e..43896df46 100644
--- a/notification-manager/sample.env
+++ b/notification-manager/sample.env
@@ -19,4 +19,3 @@ NOTIFICATION_REDIS_PORT=
NOTIFICATION_REDIS_PASSWORD=
NOTIFICATION_REDIS_HEALTHCHECK_INT=10
NOTIFICATION_STREAM_KEY=FOINOTIFICATION
-MUTE_NOTIFICATION={"MCF": {"request_types": ["Personal"], "state_exceptions": ["Call For Records", "Ministry Sign Off"], "type_exceptions":["Reply User Comments", "Tagged User Comments"]}}
\ No newline at end of file
diff --git a/request-management-api/common/notificationtypes.json b/request-management-api/common/notificationtypes.json
deleted file mode 100644
index 5c04ecec7..000000000
--- a/request-management-api/common/notificationtypes.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "state": {
- "notificationtypeid": 1,
- "name": "State",
- "description": "State",
- "active": true,
- "notificationtypelabel": "state"
- },
- "division": {
- "notificationtypeid": 2,
- "name": "Division",
- "description": "Division",
- "active": true,
- "notificationtypelabel": "division"
- },
- "newusercomments": {
- "notificationtypeid": 3,
- "name": "New User Comments",
- "description": "New User Comments",
- "active": true,
- "notificationtypelabel": "newusercomments"
- },
- "extension": {
- "notificationtypeid": 4,
- "name": "Extension",
- "description": "Extension",
- "active": true,
- "notificationtypelabel": "extension"
- },
- "iaoassignment": {
- "notificationtypeid": 5,
- "name": "IAO Assignment",
- "description": "IAO Assignment",
- "active": true,
- "notificationtypelabel": "iaoassignment"
- },
- "ministryassignment": {
- "notificationtypeid": 6,
- "name": "Ministry Assignment",
- "description": "Ministry Assignment",
- "active": true,
- "notificationtypelabel": "ministryassignment"
- },
- "cfrduereminder": {
- "notificationtypeid": 7,
- "name": "CFR Due Reminder",
- "description": "CFR Due Reminder",
- "active": true,
- "notificationtypelabel": "cfrduereminder"
- },
- "legislativeduereminder": {
- "notificationtypeid": 8,
- "name": "Legislative Due Reminder",
- "description": "Legislative Due Reminder",
- "active": true,
- "notificationtypelabel": "legislativeduereminder"
- },
- "replyusercomments": {
- "notificationtypeid": 9,
- "name": "Reply User Comments",
- "description": "Reply User Comments",
- "active": true,
- "notificationtypelabel": "replyusercomments"
- },
- "taggedusercomments": {
- "notificationtypeid": 10,
- "name": "Tagged User Comments",
- "description": "Tagged User Comments",
- "active": true,
- "notificationtypelabel": "taggedusercomments"
- },
- "cfrfeeform": {
- "notificationtypeid": 11,
- "name": "CFR Fee Form",
- "description": "CFR Fee Form",
- "active": true,
- "notificationtypelabel": "cfrfeeform"
- },
- "groupmembers": {
- "notificationtypeid": 12,
- "name": "Group Members",
- "description": "Group Members",
- "active": true,
- "notificationtypelabel": "groupmembers"
- },
- "divisionduereminder": {
- "notificationtypeid": 13,
- "name": "Division Due Reminder",
- "description": "Division Due Reminder",
- "active": true,
- "notificationtypelabel": "divisionduereminder"
- },
- "watcher": {
- "notificationtypeid": 14,
- "name": "Watcher",
- "description": "Watcher",
- "active": true,
- "notificationtypelabel": "watcher"
- },
- "userassignmentremoval": {
- "notificationtypeid": 15,
- "name": "User Assignment Removal",
- "description": "User Assignment Removal",
- "active": true,
- "notificationtypelabel": "userassignmentremoval"
- },
- "emailfailure": {
- "notificationtypeid": 16,
- "name": "Email Failure",
- "description": "Email Failure",
- "active": true,
- "notificationtypelabel": "emailfailure"
- },
- "payment": {
- "notificationtypeid": 17,
- "name": "Payment",
- "description": "Payment",
- "active": true,
- "notificationtypelabel": "payment"
- },
- "records": {
- "notificationtypeid": 18,
- "name": "Records",
- "description": "Records",
- "active": true,
- "notificationtypelabel": "records"
- },
- "pdfstitch": {
- "notificationtypeid": 19,
- "name": "PDFStitch",
- "description": "PDFStitch",
- "active": true,
- "notificationtypelabel": "pdfstitch"
- },
- "section5pendingreminder": {
- "notificationtypeid": 20,
- "name": "Section 5 Pending Reminder",
- "description": "Section 5 Pending Reminder",
- "active": true,
- "notificationtypelabel": "section5pendingreminder"
- }
-}
diff --git a/request-management-api/common/notificationusertypes.json b/request-management-api/common/notificationusertypes.json
deleted file mode 100644
index db1796c0e..000000000
--- a/request-management-api/common/notificationusertypes.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "watcher": {
- "notificationusertypeid": 1,
- "name": "Watcher",
- "description": "Watcher",
- "isactive": true,
- "notificationusertypelabel": "watcher"
- },
- "assignee": {
- "notificationusertypeid": 2,
- "name": "Assignee",
- "description": "Assignee",
- "isactive": true,
- "notificationusertypelabel": "assignee"
- },
- "groupmembers": {
- "notificationusertypeid": 2,
- "name": "Group Members",
- "description": "Assignee",
- "isactive": true,
- "notificationusertypelabel": "assignee"
- },
- "groupmember": {
- "notificationusertypeid": 2,
- "name": "groupmembers",
- "description": "Assignee",
- "isactive": true,
- "notificationusertypelabel": "assignee"
- },
- "comment": {
- "notificationusertypeid": 2,
- "name": "Comment",
- "description": "Assignee",
- "isactive": true,
- "notificationusertypelabel": "assignee"
- },
- "commentuser": {
- "notificationusertypeid": 3,
- "name": "Comment User",
- "description": "Comment User",
- "isactive": true,
- "notificationusertypelabel": "commentuser"
- },
- "triggereduser": {
- "notificationusertypeid": 4,
- "name": "Triggered User",
- "description": "Triggered User",
- "isactive": true,
- "notificationusertypelabel": "triggereduser"
- }
-}
diff --git a/request-management-api/migrations/versions/29b44e8dc305_.py b/request-management-api/migrations/versions/29b44e8dc305_.py
deleted file mode 100644
index f940d1dcc..000000000
--- a/request-management-api/migrations/versions/29b44e8dc305_.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""empty message
-
-Revision ID: 29b44e8dc305
-Revises:
-Create Date: 2021-07-08 10:08:53.028617
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '29b44e8dc305'
-down_revision = 'd185518c3661'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- # ### commands auto generated by Alembic - please adjust! ###
- op.execute('ALTER TABLE public."NotificationTypes" ADD COLUMN notificationtypelabel VARCHAR(50);')
- op.execute('UPDATE public."NotificationTypes" SET notificationtypelabel = REPLACE(LOWER(name), \' \', \'\');')
- op.execute('ALTER TABLE public."NotificationTypes" ALTER COLUMN notificationtypelabel SET NOT NULL;')
- op.execute('ALTER TABLE public."NotificationTypes" ADD CONSTRAINT unique_notificationtypelabel UNIQUE (notificationtypelabel);')
-
- op.execute('ALTER TABLE public."NotificationUserTypes" ADD COLUMN notificationusertypelabel VARCHAR(50);')
- op.execute('UPDATE public."NotificationUserTypes" SET notificationusertypelabel = REPLACE(LOWER(name), \' \', \'\');')
- op.execute('ALTER TABLE public."NotificationUserTypes" ALTER COLUMN notificationusertypelabel SET NOT NULL;')
- op.execute('ALTER TABLE public."NotificationUserTypes" ADD CONSTRAINT unique_notificationusertypelabel UNIQUE (notificationusertypelabel);')
-
- op.execute('ALTER TABLE public."FOIRequestNotifications" ADD COLUMN notificationtypelabel VARCHAR(50);')
- op.execute('UPDATE public."FOIRequestNotifications" AS mr SET notificationtypelabel = st.notificationtypelabel FROM public."NotificationTypes" AS st WHERE mr.notificationtypeid = st.notificationtypeid;')
- op.execute('ALTER TABLE public."FOIRequestNotifications" ALTER COLUMN notificationtypelabel SET NOT NULL;')
- op.execute('ALTER TABLE public."FOIRequestNotifications" ALTER COLUMN notificationtypeid DROP NOT NULL;')
-
- op.execute('ALTER TABLE public."FOIRawRequestNotifications" ADD COLUMN notificationtypelabel VARCHAR(50);')
- op.execute('UPDATE public."FOIRawRequestNotifications" AS mr SET notificationtypelabel = st.notificationtypelabel FROM public."NotificationTypes" AS st WHERE mr.notificationtypeid = st.notificationtypeid;')
- op.execute('ALTER TABLE public."FOIRawRequestNotifications" ALTER COLUMN notificationtypelabel SET NOT NULL;')
- op.execute('ALTER TABLE public."FOIRawRequestNotifications" ALTER COLUMN notificationtypeid DROP NOT NULL;')
-
- op.execute('ALTER TABLE public."FOIRequestNotificationUsers" ADD COLUMN notificationusertypelabel VARCHAR(50);')
- op.execute('UPDATE public."FOIRequestNotificationUsers" AS mr SET notificationusertypelabel = st.notificationusertypelabel FROM public."NotificationUserTypes" AS st WHERE mr.notificationusertypeid = st.notificationusertypeid;')
- op.execute('ALTER TABLE public."FOIRequestNotificationUsers" ALTER COLUMN notificationusertypelabel SET NOT NULL;')
- op.execute('ALTER TABLE public."FOIRequestNotificationUsers" ALTER COLUMN notificationusertypelabel DROP NOT NULL;')
-
- op.execute('ALTER TABLE public."FOIRawRequestNotificationUsers" ADD COLUMN notificationusertypelabel VARCHAR(50);')
- op.execute('UPDATE public."FOIRawRequestNotificationUsers" AS mr SET notificationusertypelabel = st.notificationusertypelabel FROM public."NotificationUserTypes" AS st WHERE mr.notificationusertypeid = st.notificationusertypeid;')
- op.execute('ALTER TABLE public."FOIRawRequestNotificationUsers" ALTER COLUMN notificationusertypelabel SET NOT NULL;')
- op.execute('ALTER TABLE public."FOIRawRequestNotificationUsers" ALTER COLUMN notificationusertypelabel DROP NOT NULL;')
-
- # ### end Alembic commands ###
-
-
-def downgrade():
- # ### commands auto generated by Alembic - please adjust! ###
- op.execute('ALTER TABLE public."FOIRequestNotifications" drop column notificationtypelabel;')
- op.execute('ALTER TABLE public."FOIRequestNotificationUsers" drop column notificationusertypelabel;')
- op.execute('ALTER TABLE public."FOIRawRequestNotifications" drop column notificationtypelabel;')
- op.execute('ALTER TABLE public."FOIRawRequestNotificationUsers" drop column notificationusertypelabel;')
- op.execute('ALTER TABLE public."NotificationTypes" drop column notificationtypelabel;')
- op.execute('ALTER TABLE public."NotificationUserTypes" drop column notificationusertypelabel;')
- # ### end Alembic commands ###
-
diff --git a/request-management-api/migrations/versions/d185518c3661_ state_label.py b/request-management-api/migrations/versions/d185518c3661_ state_label.py
deleted file mode 100644
index 9b1dd55ae..000000000
--- a/request-management-api/migrations/versions/d185518c3661_ state_label.py
+++ /dev/null
@@ -1,227 +0,0 @@
-"""empty message
-
-Revision ID: d185518c3661
-Revises: 7fa7236d06fb
-Create Date: 2023-06-01 22:31:24.595281
-
-"""
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = 'd185518c3661'
-down_revision = '7fa7236d06fb'
-
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
- # ### commands auto generated by Alembic - please adjust! ###
- op.execute('ALTER TABLE public."FOIRequestStatuses" ADD COLUMN statuslabel VARCHAR(50);')
- op.execute('UPDATE public."FOIRequestStatuses" SET statuslabel = REPLACE(LOWER(name), \' \', \'\');')
- op.execute('ALTER TABLE public."FOIRequestStatuses" ALTER COLUMN statuslabel SET NOT NULL;')
- op.execute('ALTER TABLE public."FOIRequestStatuses" ADD CONSTRAINT unique_statuslabel UNIQUE (statuslabel);')
-
- op.execute('ALTER TABLE public."FOIMinistryRequests" ADD COLUMN requeststatuslabel VARCHAR(50);')
- op.execute('UPDATE public."FOIMinistryRequests" AS mr SET requeststatuslabel = st.statuslabel FROM public."FOIRequestStatuses" AS st WHERE mr.requeststatusid = st.requeststatusid;')
- op.execute('ALTER TABLE public."FOIMinistryRequests" ALTER COLUMN requeststatuslabel SET NOT NULL;')
- op.execute('DROP INDEX "FOIMinistryRequests_event";')
- op.execute('CREATE INDEX "FOIMinistryRequests_event" ON "FOIMinistryRequests"(axisrequestid, assignedto, assignedgroup, assignedministryperson, assignedministrygroup, requeststatusid, requeststatuslabel);')
-
- op.execute('ALTER TABLE public."FOIRawRequests" ADD COLUMN requeststatuslabel VARCHAR(50);')
- op.execute('UPDATE public."FOIRawRequests" SET requeststatuslabel = REPLACE(LOWER(status), \' \', \'\');')
- op.execute('ALTER TABLE public."FOIRawRequests" ALTER COLUMN requeststatuslabel SET NOT NULL;')
- op.execute('DROP INDEX "FOIRawRequests_event";')
- op.execute('CREATE INDEX "FOIRawRequests_event" ON "FOIRawRequests" (axisrequestid, assignedto, assignedgroup, status, requeststatuslabel);')
-
- op.execute('ALTER TABLE public."FOIRequestTeams" ADD COLUMN requeststatuslabel VARCHAR(50);')
- op.execute('UPDATE public."FOIRequestTeams" AS rt SET requeststatuslabel = st.statuslabel FROM public."FOIRequestStatuses" AS st WHERE rt.requeststatusid = st.requeststatusid;')
- op.execute('ALTER TABLE public."FOIRequestTeams" ALTER COLUMN requeststatuslabel SET NOT NULL;')
-
-
- op.execute("""
-CREATE OR REPLACE VIEW public."v_FOIRequests"
-AS SELECT DISTINCT ON (fr.foiministryrequestid) fr.foiministryrequestid,
- fr.version,
- fr.axisrequestid,
- fr.foirequest_id,
- NULL::text AS rawrequestid,
- fr.assignedto,
- fr.assignedgroup,
- fr.assignedministryperson,
- fr.assignedministrygroup,
- CASE
- WHEN asg.lastname IS NOT NULL AND asg.firstname IS NOT NULL THEN ((asg.lastname::text || ', '::text) || asg.firstname::text)::character varying
- WHEN asg.lastname IS NOT NULL AND asg.firstname IS NULL THEN asg.lastname
- WHEN asg.lastname IS NULL AND asg.firstname IS NOT NULL THEN asg.firstname
- ELSE coalesce(fr.assignedto, fr.assignedgroup)
- END AS assignedtoformatted,
- CASE
- WHEN msg.lastname IS NOT NULL AND msg.firstname IS NOT NULL THEN ((msg.lastname::text || ', '::text) || msg.firstname::text)::character varying
- WHEN msg.lastname IS NOT NULL AND msg.firstname IS NULL THEN msg.lastname
- WHEN msg.lastname IS NULL AND msg.firstname IS NOT NULL THEN msg.firstname
- ELSE coalesce(fr.assignedministryperson, fr.assignedministrygroup)
- END AS ministryassignedtoformatted,
- fr.requeststatusid,
- fs2.name AS status,
- fr.description, to_char(fr.created_at,'YYYYMMDDHH24MMSSMSUS') crtid,
- fr.requeststatuslabel AS requeststatuslabel
- FROM "FOIMinistryRequests" fr
- JOIN "FOIRequestStatuses" fs2 ON fr.requeststatusid = fs2.requeststatusid
- LEFT JOIN "FOIAssignees" asg ON fr.assignedto::text = asg.username::text
- LEFT JOIN "FOIAssignees" msg ON fr.assignedministryperson::text = msg.username::text
- ORDER BY fr.foiministryrequestid, fr.version DESC, fr.axisrequestid;
-""")
- op.execute("""
-CREATE OR REPLACE VIEW public."v_FOIRawRequests"
-AS SELECT tmp.requestid::text AS rawrequestid,
- tmp.axisrequestid,
- tmp.foirequest_id,
- tmp.ministryrequestid,
- tmp.assignedto,
- tmp.assignedgroup,
- tmp.assignedministryperson,
- tmp.assignedministrygroup,
- tmp.assignedtoformatted,
- tmp.ministryassignedtoformatted,
- tmp.status,
- tmp.description,
- tmp.isiaorestricted,
- tmp.crtid
- FROM ( SELECT DISTINCT ON (fr.requestid) fr.requestid,
- fr.version,
- CASE
- WHEN fr.axisrequestid IS NULL THEN ('U-00'::text || fr.requestid)::character varying
- ELSE fr.axisrequestid
- END AS axisrequestid,
- NULL::integer AS foirequest_id,
- NULL::integer AS ministryrequestid,
- fr.assignedto,
- fr.assignedgroup,
- NULL::text AS assignedministryperson,
- NULL::text AS assignedministrygroup,
- CASE
- WHEN asg.lastname IS NOT NULL AND asg.firstname IS NOT NULL THEN ((asg.lastname::text || ', '::text) || asg.firstname::text)::character varying
- WHEN asg.lastname IS NOT NULL AND asg.firstname IS NULL THEN asg.lastname
- WHEN asg.lastname IS NULL AND asg.firstname IS NOT NULL THEN asg.firstname
- ELSE coalesce(fr.assignedto, fr.assignedgroup)
- END AS assignedtoformatted,
- NULL::text AS ministryassignedtoformatted,
- fr.status,
- CASE
- WHEN fr.status::text = 'Unopened'::text THEN (fr.requestrawdata -> 'descriptionTimeframe'::text) ->> 'description'::text
- ELSE fr.requestrawdata ->> 'description'::text
- END AS description,
- fr.isiaorestricted, to_char(fr.created_at,'YYYYMMDDHH24MMSSMSUS') crtid
- FROM "FOIRawRequests" fr
- LEFT JOIN "FOIAssignees" asg ON fr.assignedto::text = asg.username::text
- WHERE NOT (fr.axisrequestid::text IN ( SELECT "v_FOIRequests".axisrequestid
- FROM "v_FOIRequests"
- WHERE "v_FOIRequests".requeststatuslabel = 'closed'))
- ORDER BY fr.requestid, fr.version DESC, fr.axisrequestid) tmp
- WHERE tmp.status::text <> ALL (ARRAY['Archived'::character varying, 'Unopened'::character varying, 'Closed'::character varying]::text[]);
-""")
-
- # ### end Alembic commands ###
-
-
-def downgrade():
- # ### commands auto generated by Alembic - please adjust! ###
- op.execute('ALTER TABLE public."FOIRequestStatuses" drop column statuslabel;')
- op.execute('ALTER TABLE public."FOIMinistryRequests" drop column requeststatuslabel;')
- op.execute('ALTER TABLE public."FOIRawRequests" drop column requeststatuslabel;')
- op.execute('ALTER TABLE public."FOIRequestTeams" drop column requeststatuslabel;')
-
- op.execute('DROP INDEX "FOIMinistryRequests_event";')
- op.execute('CREATE INDEX "FOIMinistryRequests_event" ON "FOIMinistryRequests"(axisrequestid, assignedto, assignedgroup, assignedministryperson, assignedministrygroup, requeststatusid);')
-
- op.execute('DROP INDEX "FOIRawRequests_event";')
- op.execute('CREATE INDEX "FOIRawRequests_event" ON "FOIRawRequests" (axisrequestid, assignedto, assignedgroup, status);')
-
- op.execute('DROP VIEW public."v_FOIRawRequests";')
- op.execute('DROP VIEW public."v_FOIRequests";')
-
- op.execute("""
-CREATE OR REPLACE VIEW public."v_FOIRequests"
-AS SELECT DISTINCT ON (fr.foiministryrequestid) fr.foiministryrequestid,
- fr.version,
- fr.axisrequestid,
- fr.foirequest_id,
- NULL::text AS rawrequestid,
- fr.assignedto,
- fr.assignedgroup,
- fr.assignedministryperson,
- fr.assignedministrygroup,
- CASE
- WHEN asg.lastname IS NOT NULL AND asg.firstname IS NOT NULL THEN ((asg.lastname::text || ', '::text) || asg.firstname::text)::character varying
- WHEN asg.lastname IS NOT NULL AND asg.firstname IS NULL THEN asg.lastname
- WHEN asg.lastname IS NULL AND asg.firstname IS NOT NULL THEN asg.firstname
- ELSE coalesce(fr.assignedto, fr.assignedgroup)
- END AS assignedtoformatted,
- CASE
- WHEN msg.lastname IS NOT NULL AND msg.firstname IS NOT NULL THEN ((msg.lastname::text || ', '::text) || msg.firstname::text)::character varying
- WHEN msg.lastname IS NOT NULL AND msg.firstname IS NULL THEN msg.lastname
- WHEN msg.lastname IS NULL AND msg.firstname IS NOT NULL THEN msg.firstname
- ELSE coalesce(fr.assignedministryperson, fr.assignedministrygroup)
- END AS ministryassignedtoformatted,
- fr.requeststatusid,
- fs2.name AS status,
- fr.description, to_char(fr.created_at,'YYYYMMDDHH24MMSSMSUS') crtid
- FROM "FOIMinistryRequests" fr
- JOIN "FOIRequestStatuses" fs2 ON fr.requeststatusid = fs2.requeststatusid
- LEFT JOIN "FOIAssignees" asg ON fr.assignedto::text = asg.username::text
- LEFT JOIN "FOIAssignees" msg ON fr.assignedministryperson::text = msg.username::text
- ORDER BY fr.foiministryrequestid, fr.version DESC, fr.axisrequestid;
-""")
- op.execute("""
-CREATE OR REPLACE VIEW public."v_FOIRawRequests"
-AS SELECT tmp.requestid::text AS rawrequestid,
- tmp.axisrequestid,
- tmp.foirequest_id,
- tmp.ministryrequestid,
- tmp.assignedto,
- tmp.assignedgroup,
- tmp.assignedministryperson,
- tmp.assignedministrygroup,
- tmp.assignedtoformatted,
- tmp.ministryassignedtoformatted,
- tmp.status,
- tmp.description,
- tmp.isiaorestricted,
- tmp.crtid
- FROM ( SELECT DISTINCT ON (fr.requestid) fr.requestid,
- fr.version,
- CASE
- WHEN fr.axisrequestid IS NULL THEN ('U-00'::text || fr.requestid)::character varying
- ELSE fr.axisrequestid
- END AS axisrequestid,
- NULL::integer AS foirequest_id,
- NULL::integer AS ministryrequestid,
- fr.assignedto,
- fr.assignedgroup,
- NULL::text AS assignedministryperson,
- NULL::text AS assignedministrygroup,
- CASE
- WHEN asg.lastname IS NOT NULL AND asg.firstname IS NOT NULL THEN ((asg.lastname::text || ', '::text) || asg.firstname::text)::character varying
- WHEN asg.lastname IS NOT NULL AND asg.firstname IS NULL THEN asg.lastname
- WHEN asg.lastname IS NULL AND asg.firstname IS NOT NULL THEN asg.firstname
- ELSE coalesce(fr.assignedto, fr.assignedgroup)
- END AS assignedtoformatted,
- NULL::text AS ministryassignedtoformatted,
- fr.status,
- CASE
- WHEN fr.status::text = 'Unopened'::text THEN (fr.requestrawdata -> 'descriptionTimeframe'::text) ->> 'description'::text
- ELSE fr.requestrawdata ->> 'description'::text
- END AS description,
- fr.isiaorestricted, to_char(fr.created_at,'YYYYMMDDHH24MMSSMSUS') crtid
- FROM "FOIRawRequests" fr
- LEFT JOIN "FOIAssignees" asg ON fr.assignedto::text = asg.username::text
- WHERE NOT (fr.axisrequestid::text IN ( SELECT "v_FOIRequests".axisrequestid
- FROM "v_FOIRequests"
- WHERE "v_FOIRequests".requeststatusid = 3))
- ORDER BY fr.requestid, fr.version DESC, fr.axisrequestid) tmp
- WHERE tmp.status::text <> ALL (ARRAY['Archived'::character varying, 'Unopened'::character varying, 'Closed'::character varying]::text[]);
-""")
- # ### end Alembic commands ###
diff --git a/request-management-api/request_api/models/FOIMinistryRequests.py b/request-management-api/request_api/models/FOIMinistryRequests.py
index 3a7fed2f9..cd6e2a8e9 100644
--- a/request-management-api/request_api/models/FOIMinistryRequests.py
+++ b/request-management-api/request_api/models/FOIMinistryRequests.py
@@ -27,7 +27,6 @@
from request_api.utils.enums import StateName
from .FOIMinistryRequestSubjectCodes import FOIMinistryRequestSubjectCode
from .SubjectCodes import SubjectCode
-from request_api.utils.enums import StateName
class FOIMinistryRequest(db.Model):
# Name of the table in our database
@@ -69,7 +68,7 @@ class FOIMinistryRequest(db.Model):
linkedrequests = db.Column(JSON, unique=False, nullable=True)
identityverified = db.Column(JSON, unique=False, nullable=True)
ministrysignoffapproval = db.Column(JSON, unique=False, nullable=True)
- requeststatuslabel = db.Column(db.String(50), nullable=False)
+
#ForeignKey References
@@ -107,13 +106,13 @@ def getrequest(cls,ministryrequestid):
return request_schema.dump(query)
@classmethod
- def getLastStatusUpdateDate(cls,foiministryrequestid,requeststatuslabel):
+ def getLastStatusUpdateDate(cls,foiministryrequestid,requeststatusid):
statusdate = None
try:
sql = """select created_at from "FOIMinistryRequests"
- where foiministryrequestid = :foiministryrequestid and requeststatuslabel = :requeststatuslabel
+ where foiministryrequestid = :foiministryrequestid and requeststatusid = :requeststatusid
order by version desc limit 1;"""
- rs = db.session.execute(text(sql), {'foiministryrequestid': foiministryrequestid, 'requeststatuslabel': requeststatuslabel})
+ rs = db.session.execute(text(sql), {'foiministryrequestid': foiministryrequestid, 'requeststatusid': requeststatusid})
statusdate = [row[0] for row in rs][0]
except Exception as ex:
logging.error(ex)
@@ -164,11 +163,11 @@ def getrequests(cls, group = None):
if group is None:
_ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(FOIMinistryRequest.isactive == True).all()
elif (group == IAOTeamWithKeycloackGroup.flex.value):
- _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), and_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.requeststatuslabel.in_([StateName.open.name,StateName.callforrecords.name,StateName.closed.name,StateName.recordsreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.value,StateName.onhold.name,StateName.deduplication.name,StateName.harmsassessment.name,StateName.response.name,StateName.peerreview.name,StateName.tagging.name,StateName.readytoscan.name])))).all()
+ _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), and_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.requeststatusid.in_([1,2,3,12,13,7,8,9,10,11,14,16,17,18])))).all()
elif (group in ProcessingTeamWithKeycloackGroup.list()):
- _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), and_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.requeststatuslabel.in_([StateName.open.name,StateName.callforrecords.name,StateName.closed.name,StateName.recordsreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.value,StateName.onhold.name,StateName.response.name,StateName.peerreview.name,StateName.tagging.name,StateName.readytoscan.name])))).all()
+ _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), and_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.requeststatusid.in_([1,2,3,7,8,9,10,11,14,16,17,18])))).all()
else:
- _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), or_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.assignedministrygroup == group,or_(FOIMinistryRequest.requeststatuslabel.in_([StateName.callforrecords.name,StateName.recordsreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.name,StateName.onhold.name,StateName.deduplication.name,StateName.harmsassessment.name,StateName.response.name,StateName.peerreview.name,StateName.tagging.name,StateName.readytoscan.name]))))).all()
+ _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), or_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.assignedministrygroup == group,or_(FOIMinistryRequest.requeststatusid.in_([2,7,9,8,10,11,12,13,14,16,17,18]))))).all()
_requests = []
ministryrequest_schema = FOIMinistryRequestSchema()
@@ -227,11 +226,10 @@ def getrequestById(cls,ministryrequestid):
def getrequeststatusById(cls,ministryrequestid):
summary = []
try:
- sql = 'select foirequest_id, version, requeststatusid, requeststatuslabel, created_at from "FOIMinistryRequests" fr where foiministryrequestid = :ministryrequestid and requeststatuslabel != :requeststatuslabel order by version desc;'
-
- rs = db.session.execute(text(sql), {'ministryrequestid': ministryrequestid, 'requeststatuslabel': StateName.closed.name})
+ sql = 'select foirequest_id, version, requeststatusid, created_at from "FOIMinistryRequests" fr where foiministryrequestid = :ministryrequestid and requeststatusid != 3 order by version desc;'
+ rs = db.session.execute(text(sql), {'ministryrequestid': ministryrequestid})
for row in rs:
- summary.append({"requeststatusid": row["requeststatusid"], "requeststatuslabel": row["requeststatuslabel"], "created_at": row["created_at"], "foirequest_id": row["foirequest_id"]})
+ summary.append({"requeststatusid": row["requeststatusid"], "created_at": row["created_at"], "foirequest_id": row["foirequest_id"]})
except Exception as ex:
logging.error(ex)
raise ex
@@ -408,13 +406,13 @@ def getrequestssubquery(cls, groups, filterfields, keyword, additionalfilter, us
else_ = FOIMinistryRequest.assignedministrygroup).label('ministryAssignedToFormatted')
duedate = case([
- (FOIMinistryRequest.requeststatuslabel == StateName.onhold.name, # On Hold
+ (FOIMinistryRequest.requeststatusid == 11, # On Hold
literal(None)),
],
else_ = cast(FOIMinistryRequest.duedate, String)).label('duedate')
cfrduedate = case([
- (FOIMinistryRequest.requeststatuslabel == StateName.onhold.name, # On Hold
+ (FOIMinistryRequest.requeststatusid == 11, # On Hold
literal(None)),
],
else_ = cast(FOIMinistryRequest.cfrduedate, String)).label('cfrduedate')
@@ -555,7 +553,7 @@ def getrequestssubquery(cls, groups, filterfields, keyword, additionalfilter, us
SubjectCode,
SubjectCode.subjectcodeid == FOIMinistryRequestSubjectCode.subjectcodeid,
isouter=True
- ).filter(FOIMinistryRequest.requeststatuslabel != StateName.closed.name)
+ ).filter(FOIMinistryRequest.requeststatusid != 3)
if(additionalfilter == 'watchingRequests'):
#watchby
@@ -684,7 +682,7 @@ def getgroupfilters(cls, groups):
FOIMinistryRequest.assignedgroup == group,
and_(
FOIMinistryRequest.assignedgroup == IAOTeamWithKeycloackGroup.flex.value,
- FOIMinistryRequest.requeststatuslabel.in_([StateName.open.name])
+ FOIMinistryRequest.requeststatusid.in_([1])
)
)
)
@@ -694,7 +692,7 @@ def getgroupfilters(cls, groups):
FOIMinistryRequest.assignedgroup == group,
and_(
FOIMinistryRequest.assignedministrygroup == group,
- FOIMinistryRequest.requeststatuslabel.in_([StateName.callforrecords.name,StateName.recordsreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.name,StateName.onhold.name,StateName.deduplication.name,StateName.harmsassessment.name,StateName.response.name,StateName.peerreview.name,StateName.tagging.name,StateName.readytoscan.name])
+ FOIMinistryRequest.requeststatusid.in_([2,7,9,8,10,11,12,13,14,16,17,18])
)
)
)
@@ -709,7 +707,7 @@ def getgroupfilters(cls, groups):
@classmethod
def getrequestoriginalduedate(cls,ministryrequestid):
- return db.session.query(FOIMinistryRequest.duedate).filter(FOIMinistryRequest.foiministryrequestid == ministryrequestid, FOIMinistryRequest.requeststatuslabel == StateName.open.name).order_by(FOIMinistryRequest.version).first()[0]
+ return db.session.query(FOIMinistryRequest.duedate).filter(FOIMinistryRequest.foiministryrequestid == ministryrequestid, FOIMinistryRequest.requeststatusid == 1).order_by(FOIMinistryRequest.version).first()[0]
@classmethod
def getduedate(cls,ministryrequestid):
@@ -721,10 +719,10 @@ def getupcomingcfrduerecords(cls):
upcomingduerecords = []
try:
sql = """select distinct on (filenumber) filenumber, to_char(cfrduedate, 'YYYY-MM-DD') as cfrduedate, foiministryrequestid, version, foirequest_id, created_at, createdby from "FOIMinistryRequests" fpa
- where isactive = true and cfrduedate is not null and requeststatuslabel = :requeststatuslabel
+ where isactive = true and cfrduedate is not null and requeststatusid = 2
and cfrduedate between NOW() - INTERVAL '7 DAY' AND NOW() + INTERVAL '7 DAY'
order by filenumber , version desc;"""
- rs = db.session.execute(text(sql), {'requeststatuslabel': StateName.callforrecords.name})
+ rs = db.session.execute(text(sql))
for row in rs:
upcomingduerecords.append({"filenumber": row["filenumber"], "cfrduedate": row["cfrduedate"],"foiministryrequestid": row["foiministryrequestid"], "version": row["version"], "foirequest_id": row["foirequest_id"], "created_at": row["created_at"], "createdby": row["createdby"]})
except Exception as ex:
@@ -739,10 +737,10 @@ def getupcominglegislativeduerecords(cls):
upcomingduerecords = []
try:
sql = """select distinct on (filenumber) filenumber, to_char(duedate, 'YYYY-MM-DD') as duedate, foiministryrequestid, version, foirequest_id, created_at, createdby from "FOIMinistryRequests" fpa
- where isactive = true and duedate is not null and requeststatuslabel not in (:requeststatuslabel)
+ where isactive = true and duedate is not null and requeststatusid not in (5,6,4,11,3,15)
and duedate between NOW() - INTERVAL '7 DAY' AND NOW() + INTERVAL '7 DAY'
order by filenumber , version desc;"""
- rs = db.session.execute(text(sql), {'requeststatuslabel': [StateName.closed.name,StateName.redirect.name,StateName.unopened.name,StateName.intakeinprogress.name,StateName.onhold.name,StateName.archived.name]})
+ rs = db.session.execute(text(sql))
for row in rs:
upcomingduerecords.append({"filenumber": row["filenumber"], "duedate": row["duedate"],"foiministryrequestid": row["foiministryrequestid"], "version": row["version"], "foirequest_id": row["foirequest_id"], "created_at": row["created_at"], "createdby": row["createdby"]})
except Exception as ex:
@@ -760,15 +758,14 @@ def getupcomingdivisionduerecords(cls):
frd.divisionid, frd.stageid, pad2."name" divisionname, pads."name" stagename,
to_char(divisionduedate, 'YYYY-MM-DD') as duedate, frd.created_at, frd.createdby
from "FOIMinistryRequestDivisions" frd
- inner join (select distinct on (fpa.foiministryrequestid) foiministryrequestid, version as foiministryrequestversion, axisrequestid, filenumber, foirequest_id, requeststatusid, requeststatuslabel
+ inner join (select distinct on (fpa.foiministryrequestid) foiministryrequestid, version as foiministryrequestversion, axisrequestid, filenumber, foirequest_id, requeststatusid
from "FOIMinistryRequests" fpa
- order by fpa.foiministryrequestid , fpa.version desc) fma on frd.foiministryrequest_id = fma.foiministryrequestid and frd.foiministryrequestversion_id = fma.foiministryrequestversion and fma.requeststatuslabel not in (:requeststatuslabel)
+ order by fpa.foiministryrequestid , fpa.version desc) fma on frd.foiministryrequest_id = fma.foiministryrequestid and frd.foiministryrequestversion_id = fma.foiministryrequestversion and fma.requeststatusid not in (5,6,4,11,3,15)
inner join "ProgramAreaDivisions" pad2 on frd.divisionid = pad2.divisionid
inner join "ProgramAreaDivisionStages" pads on frd.stageid = pads.stageid and frd.stageid in (5, 7, 9)
and frd.divisionduedate between NOW() - INTERVAL '7 DAY' AND NOW() + INTERVAL '7 DAY'
order by frd.foiministryrequest_id , frd.foiministryrequestversion_id desc;"""
- rs = db.session.execute(text(sql), {'requeststatuslabel': [StateName.closed.name,StateName.redirect.name,StateName.unopened.name,StateName.intakeinprogress.name,StateName.onhold.name,StateName.archived.name]})
-
+ rs = db.session.execute(text(sql))
for row in rs:
upcomingduerecords.append({"axisrequestid": row["axisrequestid"], "filenumber": row["filenumber"],
"foiministryrequestid": row["foiministryrequestid"], "version": row["foiministryrequestversion"],
@@ -852,9 +849,9 @@ def getclosedaxisids(cls):
try:
sql = """ select distinct on (foiministryrequestid) foiministryrequestid, version, axisrequestid
from "FOIMinistryRequests" fr
- where requeststatuslabel = :requeststatuslabel
+ where requeststatusid = 3
order by foiministryrequestid , version desc, axisrequestid"""
- rs = db.session.execute(text(sql), {'requeststatuslabel': StateName.closed.name})
+ rs = db.session.execute(text(sql))
for row in rs:
axisids.append(row["axisrequestid"])
except Exception as ex:
@@ -929,13 +926,13 @@ def getbasequery(cls, iaoassignee, ministryassignee, userid=None, requestby='IAO
else_ = FOIMinistryRequest.assignedministrygroup).label('ministryAssignedToFormatted')
duedate = case([
- (FOIMinistryRequest.requeststatuslabel == StateName.onhold.name, # On Hold
+ (FOIMinistryRequest.requeststatusid == 11, # On Hold
literal(None)),
],
else_ = cast(FOIMinistryRequest.duedate, String)).label('duedate')
cfrduedate = case([
- (FOIMinistryRequest.requeststatuslabel == StateName.onhold.name, # On Hold
+ (FOIMinistryRequest.requeststatusid == 11, # On Hold
literal(None)),
],
else_ = cast(FOIMinistryRequest.cfrduedate, String)).label('cfrduedate')
@@ -1119,7 +1116,7 @@ def advancedsearch(cls, params, userid, isministryrestrictedfilemanager = False)
groupfilter.append(FOIMinistryRequest.assignedministrygroup == group)
#ministry advanced search show cfr onwards
- statefilter = FOIMinistryRequest.requeststatuslabel.in_([StateName.callforrecords.name,StateName.closed.name,StateName.recordsreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.name,StateName.onhold.name,StateName.deduplication.name,StateName.harmsassessment.name,StateName.response.name,StateName.peerreview.name,StateName.tagging.name,StateName.readytoscan.name])
+ statefilter = FOIMinistryRequest.requeststatusid.in_([2,3,7,9,8,10,11,12,13,14,16,17,18])
ministry_queue = FOIMinistryRequest.advancedsearchsubquery(params, iaoassignee, ministryassignee, userid, 'Ministry', False, isministryrestrictedfilemanager).filter(and_(or_(*groupfilter), statefilter))
@@ -1156,10 +1153,10 @@ def getfilterforadvancedsearch(cls, params, iaoassignee, ministryassignee):
# return all except closed
if(includeclosed == False):
- filtercondition.append(FOIMinistryRequest.requeststatuslabel != StateName.closed.name)
+ filtercondition.append(FOIMinistryRequest.requeststatusid != 3)
elif(len(params['requeststatus']) > 1 and includeclosed == False):
# return all except closed
- filtercondition.append(FOIMinistryRequest.requeststatuslabel != StateName.closed.name)
+ filtercondition.append(FOIMinistryRequest.requeststatusid != 3)
#request type: personal, general
if(len(params['requesttype']) > 0):
@@ -1188,9 +1185,9 @@ def getfilterforadvancedsearch(cls, params, iaoassignee, ministryassignee):
def getfilterforrequeststate(cls, params, includeclosed):
#request state: unopened, call for records, etc.
requeststatecondition = []
- for statelabel in params['requeststate']:
- requeststatecondition.append(FOIMinistryRequest.requeststatuslabel == statelabel)
- if(statelabel == StateName.closed.name):
+ for stateid in params['requeststate']:
+ requeststatecondition.append(FOIMinistryRequest.requeststatusid == stateid)
+ if(stateid == 3):
includeclosed = True
return {'condition': or_(*requeststatecondition), 'includeclosed': includeclosed}
@@ -1199,8 +1196,8 @@ def getfilterforrequeststatus(cls, params, iaoassignee, ministryassignee):
#request status: overdue || on time
if(params['requeststatus'][0] == 'overdue'):
#exclude "on hold" for overdue
- statelabel = StateName.onhold.name
- return and_(FOIMinistryRequest.findfield('duedate', iaoassignee, ministryassignee) < datetime.now().date(), FOIMinistryRequest.requeststatuslabel != statelabel)
+ stateid = 11
+ return and_(FOIMinistryRequest.findfield('duedate', iaoassignee, ministryassignee) < datetime.now().date(), FOIMinistryRequest.requeststatusid != stateid)
else:
return FOIMinistryRequest.findfield('duedate', iaoassignee, ministryassignee) >= datetime.now().date()
@@ -1305,9 +1302,9 @@ def getofflinepaymentflag(cls,ministryrequestid):
class FOIMinistryRequestSchema(ma.Schema):
class Meta:
fields = ('foiministryrequestid','version','filenumber','description','recordsearchfromdate','recordsearchtodate',
- 'startdate','duedate','assignedgroup','assignedto','programarea.programareaid',
+ 'startdate','duedate','assignedgroup','assignedto','programarea.programareaid','requeststatus.requeststatusid',
'foirequest.foirequestid','foirequest.requesttype','foirequest.receiveddate','foirequest.deliverymodeid',
- 'foirequest.receivedmodeid','requeststatus.requeststatusid','requeststatuslabel','requeststatus.name','programarea.bcgovcode',
+ 'foirequest.receivedmodeid','requeststatus.requeststatusid','requeststatus.name','programarea.bcgovcode',
'programarea.name','foirequest_id','foirequestversion_id','created_at','updated_at','createdby','assignedministryperson',
'assignedministrygroup','cfrduedate','closedate','closereasonid','closereason.name',
'assignee.firstname','assignee.lastname','ministryassignee.firstname','ministryassignee.lastname', 'axisrequestid', 'axissyncdate', 'requestpagecount', 'linkedrequests', 'ministrysignoffapproval', 'identityverified','originalldd')
diff --git a/request-management-api/request_api/models/FOIRawRequestNotificationUsers.py b/request-management-api/request_api/models/FOIRawRequestNotificationUsers.py
index 9fabc6c6d..619bdfd9a 100644
--- a/request-management-api/request_api/models/FOIRawRequestNotificationUsers.py
+++ b/request-management-api/request_api/models/FOIRawRequestNotificationUsers.py
@@ -17,8 +17,7 @@
from request_api.utils.enums import ProcessingTeamWithKeycloackGroup, IAOTeamWithKeycloackGroup
from request_api.models.views.FOINotifications import FOINotifications
from request_api.models.views.FOIRawRequests import FOIRawRequests
-f = open('common/notificationusertypes.json', encoding="utf8")
-notificationusertypes_cache = json.load(f)
+
class FOIRawRequestNotificationUser(db.Model):
# Name of the table in our database
@@ -32,8 +31,8 @@ class FOIRawRequestNotificationUser(db.Model):
createdby = db.Column(db.String(120), unique=False, nullable=True)
updated_at = db.Column(db.DateTime, nullable=True)
updatedby = db.Column(db.String(120), unique=False, nullable=True)
+
notificationusertypeid = db.Column(db.Integer,nullable=False)
- notificationusertypelabel = db.Column(db.String(120),nullable=False)
@classmethod
@@ -54,8 +53,8 @@ def dismissnotificationbyuser(cls, userid):
return DefaultMethodResult(True,'Notifications deleted for user',userid)
@classmethod
- def dismissnotificationbyuserandtype(cls, userid, notificationusertypelabel):
- db.session.query(FOIRawRequestNotificationUser).filter(FOIRawRequestNotificationUser.userid == userid, FOIRawRequestNotificationUser.notificationusertypelabel == notificationusertypelabel).update({FOIRawRequestNotificationUser.isdeleted: True, FOIRawRequestNotificationUser.updatedby: userid,
+ def dismissnotificationbyuserandtype(cls, userid, notificationusertypeid):
+ db.session.query(FOIRawRequestNotificationUser).filter(FOIRawRequestNotificationUser.userid == userid, FOIRawRequestNotificationUser.notificationusertypeid == notificationusertypeid).update({FOIRawRequestNotificationUser.isdeleted: True, FOIRawRequestNotificationUser.updatedby: userid,
FOIRawRequestNotificationUser.updated_at: datetime2.now()})
db.session.commit()
return DefaultMethodResult(True,'Notifications deleted for user',userid)
@@ -93,15 +92,12 @@ def getnotificationsbyuser(cls, userid):
return notifications
@classmethod
- def getnotificationsbyuserandtype(cls, userid, typeid):
- for key in notificationusertypes_cache:
- if (notificationusertypes_cache[key].notificationusertypeid == typeid) or (notificationusertypes_cache[key].notificationusertypelabel == typeid):
- notificationusertypelabel = notificationusertypes_cache[key].notificationusertypelabel
+ def getnotificationsbyuserandtype(cls, userid, notificationusertypeid):
notifications = []
try:
sql = """select notificationid, count(1) as relcount from "FOIRawRequestNotificationUsers" frnu
- where notificationid in (select notificationid from "FOIRawRequestNotificationUsers" frnu where userid = :userid and notificationusertypelabel = :notificationusertypelabel) group by notificationid """
- rs = db.session.execute(text(sql), {'userid': userid, 'notificationusertypelabel': notificationusertypelabel})
+ where notificationid in (select notificationid from "FOIRawRequestNotificationUsers" frnu where userid = :userid and notificationusertypeid = :notificationusertypeid) group by notificationid """
+ rs = db.session.execute(text(sql), {'userid': userid, 'notificationusertypeid': notificationusertypeid})
for row in rs:
notifications.append({"notificationid": row["notificationid"], "count" : row["relcount"]})
except Exception as ex:
@@ -172,7 +168,7 @@ def getbasequery(cls, groups, additionalfilter=None, userid=None, isiaorestricte
return basequery.join(subquery_watchby, subquery_watchby.c.requestid == cast(FOIRawRequests.rawrequestid, Integer))
elif(additionalfilter == 'myRequests'):
#myrequest
- return basequery.filter(or_(FOIRawRequests.assignedto == userid, and_(FOINotifications.userid == userid, FOINotifications.notificationtypelabel == 10)))
+ return basequery.filter(or_(FOIRawRequests.assignedto == userid, and_(FOINotifications.userid == userid, FOINotifications.notificationtypeid == 10)))
else:
if(isiaorestrictedfilemanager == True):
return basequery.filter(FOIRawRequests.assignedgroup.in_(groups))
@@ -267,4 +263,4 @@ def validatefield(cls, x):
class FOIRawRequestNotificationUserSchema(ma.Schema):
class Meta:
- fields = ('notificationid', 'userid', 'notificationusertypeid' , 'notificationusertypelabel','created_at','createdby','updated_at','updatedby')
\ No newline at end of file
+ fields = ('notificationid', 'userid','notificationusertypeid','created_at','createdby','updated_at','updatedby')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/FOIRawRequestNotifications.py b/request-management-api/request_api/models/FOIRawRequestNotifications.py
index 4104b90ec..e0351e90d 100644
--- a/request-management-api/request_api/models/FOIRawRequestNotifications.py
+++ b/request-management-api/request_api/models/FOIRawRequestNotifications.py
@@ -27,7 +27,7 @@ class FOIRawRequestNotification(db.Model):
updated_at = db.Column(db.DateTime, nullable=True)
updatedby = db.Column(db.String(120), unique=False, nullable=True)
- notificationtypelabel = db.Column(db.Integer, nullable=False)
+ notificationtypeid = db.Column(db.Integer, nullable=False)
notificationusers = db.relationship('FOIRawRequestNotificationUser', backref='FOIRawRequestNotifications', lazy='dynamic')
@@ -69,11 +69,11 @@ def updatenotification(cls, foinotification, userid):
return DefaultMethodResult(True,'No notification found',foinotification['notificationid'])
@classmethod
- def getnotificationidsbynumberandtype(cls, idnumber, notificationtypelabel):
+ def getnotificationidsbynumberandtype(cls, idnumber, notificationtypeid):
notificationids = []
try:
- sql = """select notificationid from "FOIRawRequestNotifications" where idnumber = :idnumber and notificationtypelabel= :notificationtypelabel """
- rs = db.session.execute(text(sql), {'idnumber': idnumber, 'notificationtypelabel': notificationtypelabel})
+ sql = """select notificationid from "FOIRawRequestNotifications" where idnumber = :idnumber and notificationtypeid= :notificationtypeid """
+ rs = db.session.execute(text(sql), {'idnumber': idnumber, 'notificationtypeid': notificationtypeid})
for row in rs:
notificationids.append(row["notificationid"])
except Exception as ex:
@@ -99,11 +99,11 @@ def getnotificationidsbynumber(cls, idnumber):
return notificationids
@classmethod
- def getnotificationidsbytype(cls, notificationtypelabel):
+ def getnotificationidsbytype(cls, notificationtypeid):
notificationids = []
try:
- sql = """select notificationid from "FOIRawRequestNotifications" where notificationtypelabel= :notificationtypelabel """
- rs = db.session.execute(text(sql), {'notificationtypelabel': notificationtypelabel})
+ sql = """select notificationid from "FOIRawRequestNotifications" where notificationtypeid= :notificationtypeid """
+ rs = db.session.execute(text(sql), {'notificationtypeid': notificationtypeid})
for row in rs:
notificationids.append(row["notificationid"])
except Exception as ex:
@@ -115,4 +115,4 @@ def getnotificationidsbytype(cls, notificationtypelabel):
class FOIRawRequestNotificationSchema(ma.Schema):
class Meta:
- fields = ('notificationid', 'requestid', 'idnumber','notification', 'notificationtypeid', 'notificationtypelabel','created_at','createdby','updated_at','updatedby','notificationusers')
\ No newline at end of file
+ fields = ('notificationid', 'requestid', 'idnumber','notification', 'notificationtypeid','created_at','createdby','updated_at','updatedby','notificationusers')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/FOIRawRequests.py b/request-management-api/request_api/models/FOIRawRequests.py
index b7588d84c..9a0169647 100644
--- a/request-management-api/request_api/models/FOIRawRequests.py
+++ b/request-management-api/request_api/models/FOIRawRequests.py
@@ -18,7 +18,6 @@
import logging
from dateutil import parser
import json
-from request_api.utils.enums import StateName
class FOIRawRequest(db.Model):
# Name of the table in our database
@@ -28,7 +27,6 @@ class FOIRawRequest(db.Model):
version = db.Column(db.Integer, primary_key=True,nullable=False)
requestrawdata = db.Column(JSON, unique=False, nullable=True)
status = db.Column(db.String(25), unique=False, nullable=True)
- requeststatuslabel = db.Column(db.String(50), unique=False, nullable=False)
notes = db.Column(db.String(120), unique=False, nullable=True)
wfinstanceid = db.Column(UUID(as_uuid=True), unique=False, nullable=True)
assignedgroup = db.Column(db.String(250), unique=False, nullable=True)
@@ -57,7 +55,7 @@ class FOIRawRequest(db.Model):
@classmethod
def saverawrequest(cls, _requestrawdata, sourceofsubmission, ispiiredacted, userid, notes, requirespayment, axisrequestid, axissyncdate, linkedrequests, assigneegroup=None, assignee=None, assigneefirstname=None, assigneemiddlename=None, assigneelastname=None)->DefaultMethodResult:
version = 1
- newrawrequest = FOIRawRequest(requestrawdata=_requestrawdata, status = StateName.unopened.value if sourceofsubmission != "intake" else StateName.intakeinprogress.value, requeststatuslabel = StateName.unopened.name if sourceofsubmission != "intake" else StateName.intakeinprogress.name, createdby=userid, version=version, sourceofsubmission=sourceofsubmission, assignedgroup=assigneegroup, assignedto=assignee, ispiiredacted=ispiiredacted, notes=notes, requirespayment=requirespayment, axisrequestid=axisrequestid, axissyncdate=axissyncdate, linkedrequests=linkedrequests)
+ newrawrequest = FOIRawRequest(requestrawdata=_requestrawdata, status = 'Unopened' if sourceofsubmission != "intake" else 'Intake in Progress', createdby=userid, version=version, sourceofsubmission=sourceofsubmission, assignedgroup=assigneegroup, assignedto=assignee, ispiiredacted=ispiiredacted, notes=notes, requirespayment=requirespayment, axisrequestid=axisrequestid, axissyncdate=axissyncdate, linkedrequests=linkedrequests)
if assignee is not None:
FOIAssignee.saveassignee(assignee, assigneefirstname, assigneemiddlename, assigneelastname)
@@ -68,13 +66,13 @@ def saverawrequest(cls, _requestrawdata, sourceofsubmission, ispiiredacted, user
@classmethod
def saverawrequest_foipayment(cls,_requestrawdata,notes, requirespayment, ispiiredacted)->DefaultMethodResult:
version = 1
- newrawrequest = FOIRawRequest(requestrawdata=_requestrawdata, status=StateName.unopened.value, requeststatuslabel = StateName.unopened.name ,createdby=None,version=version,sourceofsubmission="onlineform",assignedgroup=None,assignedto=None,ispiiredacted=ispiiredacted,notes=notes, requirespayment= requirespayment)
+ newrawrequest = FOIRawRequest(requestrawdata=_requestrawdata, status='Unopened',createdby=None,version=version,sourceofsubmission="onlineform",assignedgroup=None,assignedto=None,ispiiredacted=ispiiredacted,notes=notes, requirespayment= requirespayment)
db.session.add(newrawrequest)
db.session.commit()
return DefaultMethodResult(True,'Request added',newrawrequest.requestid)
@classmethod
- def saverawrequestversion(cls,_requestrawdata,requestid,assigneegroup,assignee,status,ispiiredacted,userid,statuslabel,assigneefirstname=None,assigneemiddlename=None,assigneelastname=None)->DefaultMethodResult:
+ def saverawrequestversion(cls,_requestrawdata,requestid,assigneegroup,assignee,status,ispiiredacted,userid,assigneefirstname=None,assigneemiddlename=None,assigneelastname=None)->DefaultMethodResult:
request = db.session.query(FOIRawRequest).filter_by(requestid=requestid).order_by(FOIRawRequest.version.desc()).first()
if request is not None:
_assginee = assignee if assignee not in (None,'') else None
@@ -96,7 +94,6 @@ def saverawrequestversion(cls,_requestrawdata,requestid,assigneegroup,assignee,s
updatedby=None,
updated_at=datetime.now(),
status=status,
- requeststatuslabel=statuslabel,
assignedgroup=assigneegroup,
assignedto=_assginee,
wfinstanceid=request.wfinstanceid,
@@ -300,7 +297,7 @@ def getDescriptionSummaryById(cls, requestid):
requests = []
try:
sql = """select * ,
- CASE WHEN description = (select requestrawdata -> 'descriptionTimeframe' ->> 'description' from "FOIRawRequests" where requestid = :requestid and status = :requeststatus and version = 1)
+ CASE WHEN description = (select requestrawdata -> 'descriptionTimeframe' ->> 'description' from "FOIRawRequests" where requestid = :requestid and status = 'Unopened' and version = 1)
then 'Online Form'
else savedby END as createdby
from (select CASE WHEN lower(status) <> 'unopened'
@@ -315,7 +312,7 @@ def getDescriptionSummaryById(cls, requestid):
to_char(created_at, 'YYYY-MM-DD HH24:MI:SS') as createdat, status, ispiiredacted,
createdby as savedby from "FOIRawRequests" fr
where requestid = :requestid order by version ) as sq;"""
- rs = db.session.execute(text(sql), {'requestid': requestid, 'requeststatus': StateName.unopened.value})
+ rs = db.session.execute(text(sql), {'requestid': requestid})
for row in rs:
requests.append(dict(row))
except Exception as ex:
@@ -371,10 +368,10 @@ def getappfeeowingrequests(cls): # with the reminder date
sql = '''
SELECT * FROM (SELECT DISTINCT ON (requestid) requestid, updated_at, status FROM public."FOIRawRequests"
ORDER BY requestid ASC, version DESC) r
- WHERE r.status = :requeststaus
+ WHERE r.status = 'App Fee Owing'
order by r.updated_at asc
'''
- rs = db.session.execute(text(sql), {'requeststaus': StateName.appfeeowing.value})
+ rs = db.session.execute(text(sql))
appfeeowingrequests = rs
except Exception as ex:
logging.error(ex)
@@ -444,47 +441,47 @@ def getbasequery(cls, additionalfilter=None, userid=None, isiaorestrictedfileman
]
requesttype = case([
- (FOIRawRequest.status == StateName.unopened.value,
+ (FOIRawRequest.status == 'Unopened',
FOIRawRequest.requestrawdata['requestType']['requestType'].astext),
],
else_ = FOIRawRequest.requestrawdata['requestType'].astext).label('requestType')
firstname = case([
- (FOIRawRequest.status == StateName.unopened.value,
+ (FOIRawRequest.status == 'Unopened',
FOIRawRequest.requestrawdata['contactInfo']['firstName'].astext),
],
else_ = FOIRawRequest.requestrawdata['firstName'].astext).label('firstName')
lastname = case([
- (FOIRawRequest.status == StateName.unopened.value,
+ (FOIRawRequest.status == 'Unopened',
FOIRawRequest.requestrawdata['contactInfo']['lastName'].astext),
],
else_ = FOIRawRequest.requestrawdata['lastName'].astext).label('lastName')
description = case([
- (FOIRawRequest.status == StateName.unopened.value,
+ (FOIRawRequest.status == 'Unopened',
FOIRawRequest.requestrawdata['descriptionTimeframe']['description'].astext),
],
else_ = FOIRawRequest.requestrawdata['description'].astext).label('description')
recordsearchfromdate = case([
- (FOIRawRequest.status == StateName.unopened.value,
+ (FOIRawRequest.status == 'Unopened',
FOIRawRequest.requestrawdata['descriptionTimeframe']['fromDate'].astext),
],
else_ = FOIRawRequest.requestrawdata['fromDate'].astext).label('recordsearchfromdate')
recordsearchtodate = case([
- (FOIRawRequest.status == StateName.unopened.value,
+ (FOIRawRequest.status == 'Unopened',
FOIRawRequest.requestrawdata['descriptionTimeframe']['toDate'].astext),
],
else_ = FOIRawRequest.requestrawdata['toDate'].astext).label('recordsearchtodate')
duedate = case([
- (FOIRawRequest.status == StateName.unopened.value,
+ (FOIRawRequest.status == 'Unopened',
literal(None)),
],
else_ = FOIRawRequest.requestrawdata['dueDate'].astext).label('duedate')
receiveddate = case([
- (and_(FOIRawRequest.status == StateName.unopened.value, FOIRawRequest.requestrawdata['receivedDate'].is_(None)),
+ (and_(FOIRawRequest.status == 'Unopened', FOIRawRequest.requestrawdata['receivedDate'].is_(None)),
func.to_char(FOIRawRequest.created_at, 'YYYY-mm-DD')),
],
else_ = FOIRawRequest.requestrawdata['receivedDate'].astext).label('receivedDate')
receiveddateuf = case([
- (and_(FOIRawRequest.status == StateName.unopened.value, FOIRawRequest.requestrawdata['receivedDateUF'].is_(None)),
+ (and_(FOIRawRequest.status == 'Unopened', FOIRawRequest.requestrawdata['receivedDateUF'].is_(None)),
func.to_char(FOIRawRequest.created_at, 'YYYY-mm-DD HH:MM:SS')),
],
else_ = FOIRawRequest.requestrawdata['receivedDateUF'].astext).label('receivedDateUF')
@@ -615,7 +612,7 @@ def getbasequery(cls, additionalfilter=None, userid=None, isiaorestrictedfileman
@classmethod
def getrequestssubquery(cls, filterfields, keyword, additionalfilter, userid, isiaorestrictedfilemanager):
basequery = FOIRawRequest.getbasequery(additionalfilter, userid, isiaorestrictedfilemanager)
- basequery = basequery.filter(FOIRawRequest.status != StateName.unopened.value).filter(FOIRawRequest.status != StateName.closed.value)
+ basequery = basequery.filter(FOIRawRequest.status != 'Unopened').filter(FOIRawRequest.status != 'Closed')
#filter/search
if(len(filterfields) > 0 and keyword is not None):
filtercondition = FOIRawRequest.getfilterforrequestssubquery(filterfields, keyword)
@@ -778,7 +775,7 @@ def getfilterforadvancedsearch(cls, params):
filtercondition.append(requeststatecondition['condition'])
includeclosed = requeststatecondition['includeclosed']
else:
- filtercondition.append(FOIRawRequest.status != StateName.unopened.value) #not return Unopened by default
+ filtercondition.append(FOIRawRequest.status != 'Unopened') #not return Unopened by default
#request status: overdue, on time - no due date for unopen & intake in progress, so return all except closed
if(len(params['requeststatus']) > 0 and includeclosed == False):
@@ -786,7 +783,7 @@ def getfilterforadvancedsearch(cls, params):
#no rawrequest returned for this case
filtercondition.append(FOIRawRequest.status == 'ReturnNothing')
else:
- filtercondition.append(FOIRawRequest.status != StateName.closed.value)
+ filtercondition.append(FOIRawRequest.status != 'Closed')
#request type: personal, general
if(len(params['requesttype']) > 0):
@@ -848,14 +845,14 @@ def getfilterforrequeststate(cls, params, includeclosed):
requeststatecondition = []
for state in params['requeststate']:
if(state == '3'):
- requeststatecondition.append(FOIRawRequest.status == StateName.closed.value)
+ requeststatecondition.append(FOIRawRequest.status == 'Closed')
includeclosed = True
elif(state == '4'):
- requeststatecondition.append(FOIRawRequest.status == StateName.redirect.value)
+ requeststatecondition.append(FOIRawRequest.status == 'Redirect')
elif(state == '5'):
- requeststatecondition.append(FOIRawRequest.status == StateName.unopened.value)
+ requeststatecondition.append(FOIRawRequest.status == 'Unopened')
elif(state == '6'):
- requeststatecondition.append(FOIRawRequest.status == StateName.intakeinprogress.value)
+ requeststatecondition.append(FOIRawRequest.status == 'Intake in Progress')
if(len(requeststatecondition) == 0):
requeststatecondition.append(FOIRawRequest.status == 'Not Applicable') #searched state does not apply to rawrequests
@@ -1012,8 +1009,8 @@ def getlatestsection5pendings(cls):
(SELECT DISTINCT ON (requestid) requestid, created_at, version, status, axisrequestid
FROM public."FOIRawRequests"
ORDER BY requestid ASC, version DESC) foireqs
- WHERE foireqs.status = :requeststatus;"""
- rs = db.session.execute(text(sql), {'requeststatus': StateName.section5pending.value})
+ WHERE foireqs.status = 'Section 5 Pending';"""
+ rs = db.session.execute(text(sql))
for row in rs:
section5pendings.append({"requestid": row["requestid"], "version": row["version"], "statusname": row["status"], "created_at": row["created_at"], "axisrequestid": ["axisrequestid"]})
except Exception as ex:
@@ -1025,4 +1022,4 @@ def getlatestsection5pendings(cls):
class FOIRawRequestSchema(ma.Schema):
class Meta:
- fields = ('requestid', 'requestrawdata', 'status', 'requeststatuslabel', 'notes','created_at','wfinstanceid','version','updated_at','assignedgroup','assignedto','updatedby','createdby','sourceofsubmission','ispiiredacted','assignee.firstname','assignee.lastname', 'axisrequestid', 'axissyncdate', 'linkedrequests', 'closedate','isiaorestricted')
\ No newline at end of file
+ fields = ('requestid', 'requestrawdata', 'status','notes','created_at','wfinstanceid','version','updated_at','assignedgroup','assignedto','updatedby','createdby','sourceofsubmission','ispiiredacted','assignee.firstname','assignee.lastname', 'axisrequestid', 'axissyncdate', 'linkedrequests', 'closedate','isiaorestricted')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/FOIRequestNotificationUsers.py b/request-management-api/request_api/models/FOIRequestNotificationUsers.py
index 45838d950..e35dbda75 100644
--- a/request-management-api/request_api/models/FOIRequestNotificationUsers.py
+++ b/request-management-api/request_api/models/FOIRequestNotificationUsers.py
@@ -49,7 +49,7 @@ class FOIRequestNotificationUser(db.Model):
createdby = db.Column(db.String(120), unique=False, nullable=True)
updated_at = db.Column(db.DateTime, nullable=True)
updatedby = db.Column(db.String(120), unique=False, nullable=True)
- notificationusertypelabel = db.Column(db.String(100),nullable=False)
+
notificationusertypeid = db.Column(db.Integer,nullable=False)
@@ -71,8 +71,8 @@ def dismissnotificationbyuser(cls, userid):
return DefaultMethodResult(True,'Notifications deleted for user',userid)
@classmethod
- def dismissnotificationbyuserandtype(cls, userid, notificationusertypelabel):
- db.session.query(FOIRequestNotificationUser).filter(FOIRequestNotificationUser.userid == userid, FOIRequestNotificationUser.notificationusertypelabel == notificationusertypelabel).update({FOIRequestNotificationUser.isdeleted: True, FOIRequestNotificationUser.updatedby: userid,
+ def dismissnotificationbyuserandtype(cls, userid, notificationusertypeid):
+ db.session.query(FOIRequestNotificationUser).filter(FOIRequestNotificationUser.userid == userid, FOIRequestNotificationUser.notificationusertypeid == notificationusertypeid).update({FOIRequestNotificationUser.isdeleted: True, FOIRequestNotificationUser.updatedby: userid,
FOIRequestNotificationUser.updated_at: datetime2.now()})
db.session.commit()
return DefaultMethodResult(True,'Notifications deleted for user',userid)
@@ -118,12 +118,12 @@ def getnotificationsbyuser(cls, userid):
return notifications
@classmethod
- def getnotificationsbyuserandtype(cls, userid, notificationusertypelabel):
+ def getnotificationsbyuserandtype(cls, userid, notificationusertypeid):
notifications = []
try:
sql = """select notificationid, count(1) as relcount from "FOIRequestNotificationUsers" frnu
- where notificationid in (select notificationid from "FOIRequestNotificationUsers" frnu where userid = :userid and notificationusertypelabel = :notificationusertypelabel) group by notificationid """
- rs = db.session.execute(text(sql), {'userid': userid, 'notificationusertypelabel':notificationusertypelabel})
+ where notificationid in (select notificationid from "FOIRequestNotificationUsers" frnu where userid = :userid and notificationusertypeid = :notificationusertypeid) group by notificationid """
+ rs = db.session.execute(text(sql), {'userid': userid, 'notificationusertypeid':notificationusertypeid})
for row in rs:
notifications.append({"notificationid": row["notificationid"], "count" : row["relcount"]})
except Exception as ex:
@@ -212,7 +212,7 @@ def geteventsubquery(cls, groups, filterfields, keyword, additionalfilter, useri
).join(
FOINotifications,
and_(FOINotifications.axisnumber == FOIRequests.axisrequestid),
- ).filter(FOIRequests.requeststatuslabel != StateName.closed.name)
+ ).filter(FOIRequests.requeststatusid != 3)
if(additionalfilter == 'watchingRequests'):
#watchby
@@ -223,9 +223,9 @@ def geteventsubquery(cls, groups, filterfields, keyword, additionalfilter, useri
elif(additionalfilter == 'myRequests'):
#myrequest
if(requestby == 'IAO'):
- dbquery = basequery.filter(or_(and_(FOIRequests.assignedto == userid, ministryfilter),and_(FOINotifications.userid == userid, FOINotifications.notificationtypelabel == 10)))
+ dbquery = basequery.filter(or_(and_(FOIRequests.assignedto == userid, ministryfilter),and_(FOINotifications.userid == userid, FOINotifications.notificationtypeid == 10)))
else:
- dbquery = basequery.filter(or_(and_(FOIRequests.assignedministryperson == userid, ministryfilter),and_(FOINotifications.userid == userid, FOINotifications.notificationtypelabel == 10)))
+ dbquery = basequery.filter(or_(and_(FOIRequests.assignedministryperson == userid, ministryfilter),and_(FOINotifications.userid == userid, FOINotifications.notificationtypeid == 10)))
else:
if(isiaorestrictedfilemanager == True or isministryrestrictedfilemanager == True):
dbquery = basequery
@@ -262,7 +262,7 @@ def getgroupfilters(cls, groups):
FOIRequests.assignedgroup == group,
and_(
FOIRequests.assignedgroup == IAOTeamWithKeycloackGroup.flex.value,
- FOIRequests.requeststatuslabel.in_([StateName.open.name])
+ FOIRequests.requeststatusid.in_([1])
)
)
)
@@ -272,7 +272,7 @@ def getgroupfilters(cls, groups):
FOIRequests.assignedgroup == group,
and_(
FOIRequests.assignedministrygroup == group,
- FOIRequests.requeststatuslabel.in_([StateName.callforrecords.name,StateName.recordsreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.name,StateName.onhold.name,StateName.deduplication.name,StateName.harmsassessment.name,StateName.response.name,StateName.tagging.name,StateName.readytoscan.name])
+ FOIRequests.requeststatusid.in_([2,7,9,8,10,11,12,13,14,17,18])
)
)
)
@@ -333,4 +333,4 @@ def findfield(cls, x):
class FOIRequestNotificationUserSchema(ma.Schema):
class Meta:
- fields = ('notificationid', 'userid','notificationusertypeid', 'notificationusertypelabel','created_at','createdby','updated_at','updatedby')
\ No newline at end of file
+ fields = ('notificationid', 'userid','notificationusertypeid','created_at','createdby','updated_at','updatedby')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/FOIRequestNotifications.py b/request-management-api/request_api/models/FOIRequestNotifications.py
index 6f8a039fc..c46341de6 100644
--- a/request-management-api/request_api/models/FOIRequestNotifications.py
+++ b/request-management-api/request_api/models/FOIRequestNotifications.py
@@ -11,10 +11,8 @@
from sqlalchemy.sql.expression import distinct
from sqlalchemy import text
import maya
-import json
-f = open('common/notificationtypes.json', encoding="utf8")
-notificationtypes_cache = json.load(f)
+import json
class FOIRequestNotification(db.Model):
# Name of the table in our database
__tablename__ = 'FOIRequestNotifications'
@@ -31,8 +29,8 @@ class FOIRequestNotification(db.Model):
createdby = db.Column(db.String(120), unique=False, nullable=True)
updated_at = db.Column(db.DateTime, nullable=True)
updatedby = db.Column(db.String(120), unique=False, nullable=True)
+
notificationtypeid = db.Column(db.Integer, nullable=False)
- notificationtypelabel = db.Column(db.String(50), nullable=False)
notificationusers = db.relationship('FOIRequestNotificationUser', backref='FOIRequestNotifications', lazy='dynamic')
@@ -68,9 +66,9 @@ def getconsolidatednotifications(cls, userid, days):
notifications = []
try:
sql = """select idnumber, axisnumber, notificationid, notification , notificationtype, userid, notificationusertype, created_at, createdby, requesttype, requestid, foirequestid from (
- select frn.idnumber, frn.axisnumber, frn.requestid, frns.notificationuserid as notificationid, frn.notification -> 'message' as notification , nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'ministryrequest' requesttype, frn.foirequestid from "FOIRequestNotifications" frn inner join "FOIRequestNotificationUsers" frns on frn.notificationid = frns.notificationid and frns.isdeleted = false inner join "NotificationTypes" nty on frn.notificationtypelabel = nty.notificationtypelabel inner join "NotificationUserTypes" ntu on frns.notificationusertypelabel = ntu.notificationusertypelabel where frns.userid=:userid and frn.created_at >= current_date - interval :days day
+ select frn.idnumber, frn.axisnumber, frn.requestid, frns.notificationuserid as notificationid, frn.notification -> 'message' as notification , nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'ministryrequest' requesttype, frn.foirequestid from "FOIRequestNotifications" frn inner join "FOIRequestNotificationUsers" frns on frn.notificationid = frns.notificationid inner join "NotificationTypes" nty on frn.notificationtypeid = nty.notificationtypeid inner join "NotificationUserTypes" ntu on frns.notificationusertypeid = ntu.notificationusertypeid where frns.userid=:userid and frns.isdeleted = false and frn.created_at >= current_date - interval :days day
union all
- select frn.idnumber, frn.axisnumber, frn.requestid, frns.notificationuserid as notificationid, frn.notification -> 'message' as notification, nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'rawrequest' requesttype, 0 foirequestid from "FOIRawRequestNotifications" frn inner join "FOIRawRequestNotificationUsers" frns on frn.notificationid = frns.notificationid and frns.isdeleted = false inner join "NotificationTypes" nty on frn.notificationtypelabel = nty.notificationtypelabel inner join "NotificationUserTypes" ntu on frns.notificationusertypelabel = ntu.notificationusertypelabel where frns.userid=:userid and frn.created_at >= current_date - interval :days day
+ select frn.idnumber, frn.axisnumber, frn.requestid, frns.notificationuserid as notificationid, frn.notification -> 'message' as notification, nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'rawrequest' requesttype, 0 foirequestid from "FOIRawRequestNotifications" frn inner join "FOIRawRequestNotificationUsers" frns on frn.notificationid = frns.notificationid inner join "NotificationTypes" nty on frn.notificationtypeid = nty.notificationtypeid inner join "NotificationUserTypes" ntu on frns.notificationusertypeid = ntu.notificationusertypeid where frns.userid=:userid and frns.isdeleted = false and frn.created_at >= current_date - interval :days day
) as notf order by created_at desc"""
rs = db.session.execute(text(sql), {'userid': userid, 'days': days})
for row in rs:
@@ -89,22 +87,11 @@ def getcommentnotifications(cls, commentid):
notifications = []
try:
sql = """select idnumber, axisnumber, notificationid, notificationuserid, notification , notificationtype, userid, notificationusertype, created_at, createdby, requesttype, requestid, foirequestid from (
-<<<<<<< HEAD
- select frn.idnumber, frn.axisnumber, frn.requestid, frn.notificationid, frns.notificationuserid, frn.notification -> 'message' as notification , nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'ministryrequest' requesttype, frn.foirequestid from "FOIRequestNotifications" frn inner join "FOIRequestNotificationUsers" frns on frn.notificationid = frns.notificationid and frns.isdeleted = false inner join "NotificationTypes" nty on frn.notificationtypelabel = nty.notificationtypelabel inner join "NotificationUserTypes" ntu on frns.notificationusertypelabel = ntu.notificationusertypelabel where frn.notificationtypelabel in :notificationtypelabel and (frn.notification ->> 'commentid')::int = :commentid
- union all
- select frn.idnumber, frn.axisnumber, frn.requestid, frn.notificationid, frns.notificationuserid, frn.notification -> 'message' as notification, nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'rawrequest' requesttype, 0 foirequestid from "FOIRawRequestNotifications" frn inner join "FOIRawRequestNotificationUsers" frns on frn.notificationid = frns.notificationid and frns.isdeleted = false inner join "NotificationTypes" nty on frn.notificationtypelabel = nty.notificationtypelabel inner join "NotificationUserTypes" ntu on frns.notificationusertypelabel = ntu.notificationusertypelabel where frn.notificationtypelabel in :notificationtypelabel and (frn.notification ->> 'commentid')::int = :commentid
-=======
- select frn.idnumber, frn.axisnumber, frn.requestid, frn.notificationid, frns.notificationuserid, frn.notification -> 'message' as notification , nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'ministryrequest' requesttype, frn.foirequestid from "FOIRequestNotifications" frn inner join "FOIRequestNotificationUsers" frns on frn.notificationid = frns.notificationid and frns.isdeleted = false inner join "NotificationTypes" nty on frn.notificationtypelabel = nty.notificationtypelabel inner join "NotificationUserTypes" ntu on frns.notificationusertypelabel = ntu.notificationusertypelabel where frn.notificationtypelabel in (:notificationtypelabel) and (frn.notification ->> 'commentid')::int = :commentid
+ select frn.idnumber, frn.axisnumber, frn.requestid, frn.notificationid, frns.notificationuserid, frn.notification -> 'message' as notification , nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'ministryrequest' requesttype, frn.foirequestid from "FOIRequestNotifications" frn inner join "FOIRequestNotificationUsers" frns on frn.notificationid = frns.notificationid inner join "NotificationTypes" nty on frn.notificationtypeid = nty.notificationtypeid inner join "NotificationUserTypes" ntu on frns.notificationusertypeid = ntu.notificationusertypeid where frn.notificationtypeid in (3,9,10) and (frn.notification ->> 'commentid')::int = :commentid
union all
- select frn.idnumber, frn.axisnumber, frn.requestid, frn.notificationid, frns.notificationuserid, frn.notification -> 'message' as notification, nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'rawrequest' requesttype, 0 foirequestid from "FOIRawRequestNotifications" frn inner join "FOIRawRequestNotificationUsers" frns on frn.notificationid = frns.notificationid and frns.isdeleted = false inner join "NotificationTypes" nty on frn.notificationtypelabel = nty.notificationtypelabel inner join "NotificationUserTypes" ntu on frns.notificationusertypelabel = ntu.notificationusertypelabel where frn.notificationtypelabel in (:notificationtypelabel) and (frn.notification ->> 'commentid')::int = :commentid
->>>>>>> e880b5850 (Refacoring status labels for notifications)
+ select frn.idnumber, frn.axisnumber, frn.requestid, frn.notificationid, frns.notificationuserid, frn.notification -> 'message' as notification, nty.name as notificationtype, frn.created_at , frns.createdby, frns.userid, ntu.name as notificationusertype, 'rawrequest' requesttype, 0 foirequestid from "FOIRawRequestNotifications" frn inner join "FOIRawRequestNotificationUsers" frns on frn.notificationid = frns.notificationid inner join "NotificationTypes" nty on frn.notificationtypeid = nty.notificationtypeid inner join "NotificationUserTypes" ntu on frns.notificationusertypeid = ntu.notificationusertypeid where frn.notificationtypeid in (3,9,10) and (frn.notification ->> 'commentid')::int = :commentid
) as notf order by created_at desc"""
- notificationtypelabel = [notificationtypes_cache['newusercomments']['notificationtypelabel'],
- notificationtypes_cache['replyusercomments']['notificationtypelabel'],
- notificationtypes_cache['taggedusercomments']['notificationtypelabel'],
- ] # 3,9,10
- notificationtypelabel = ','.join(str(e) for e in notificationtypelabel)
- rs = db.session.execute(text(sql), {'commentid': commentid, 'notificationtypelabel': notificationtypelabel})
+ rs = db.session.execute(text(sql), {'commentid': commentid})
for row in rs:
dt = maya.parse(row["created_at"]).datetime(to_timezone='America/Vancouver', naive=False)
_createddate = dt
@@ -120,10 +107,10 @@ def getcommentnotifications(cls, commentid):
def getextensionnotifications(cls, extensionid):
notifications = []
try:
- sql = sql = """select idnumber, axisnumber, notificationid, notification , notificationtypelabel from "FOIRequestNotifications" where notification->>'extensionid' = :extensionid """
+ sql = sql = """select idnumber, axisnumber, notificationid, notification , notificationtypeid from "FOIRequestNotifications" where notification->>'extensionid' = :extensionid """
rs = db.session.execute(text(sql), {'extensionid': str(extensionid)})
for row in rs:
- notifications.append({"idnumber": row["idnumber"], "axisnumber": row["axisnumber"], "notificationid": row["notificationid"], "notification": row["notification"], "notificationtypelabel": row["notificationtypelabel"]})
+ notifications.append({"idnumber": row["idnumber"], "axisnumber": row["axisnumber"], "notificationid": row["notificationid"], "notification": row["notification"], "notificationtypeid": row["notificationtypeid"]})
except Exception as ex:
logging.error(ex)
raise ex
@@ -143,11 +130,11 @@ def dismissnotification(cls, notificationids, userid='system'):
raise
@classmethod
- def getnotificationidsbynumberandtype(cls, idnumber, notificationtypelabels):
+ def getnotificationidsbynumberandtype(cls, idnumber, notificationtypeids):
notificationids = []
try:
- sql = """select notificationid from "FOIRequestNotifications" where idnumber = :idnumber and notificationtypelabel = ANY(:notificationtypelabels) """
- rs = db.session.execute(text(sql), {'idnumber': idnumber, 'notificationtypelabels': notificationtypelabels})
+ sql = """select notificationid from "FOIRequestNotifications" where idnumber = :idnumber and notificationtypeid = ANY(:notificationtypeids) """
+ rs = db.session.execute(text(sql), {'idnumber': idnumber, 'notificationtypeids': notificationtypeids})
for row in rs:
notificationids.append(row["notificationid"])
except Exception as ex:
@@ -173,9 +160,9 @@ def getnotificationidsbynumber(cls, idnumber):
return notificationids
@classmethod
- def getnotificationidsbytype(cls, notificationtypelabel):
- sql = """select notificationid from "FOIRequestNotifications" where notificationtypelabel= :notificationtypelabel """
- rs = db.session.execute(text(sql), {'notificationtypelabel': notificationtypelabel})
+ def getnotificationidsbytype(cls, notificationtypeid):
+ sql = """select notificationid from "FOIRequestNotifications" where notificationtypeid= :notificationtypeid """
+ rs = db.session.execute(text(sql), {'notificationtypeid': notificationtypeid})
notificationids = []
for row in rs:
notificationids.append(row["notificationid"])
@@ -183,7 +170,7 @@ def getnotificationidsbytype(cls, notificationtypelabel):
@classmethod
def getextensionnotificationidsbyministry(cls, ministryid):
- sql = """select notificationid from "FOIRequestNotifications" where requestid = :requestid and notificationtypelabel = 4 """
+ sql = """select notificationid from "FOIRequestNotifications" where requestid = :requestid and notificationtypeid = 4 """
rs = db.session.execute(text(sql), {'requestid': ministryid})
notificationids = []
for row in rs:
@@ -192,4 +179,4 @@ def getextensionnotificationidsbyministry(cls, ministryid):
class FOIRequestNotificationSchema(ma.Schema):
class Meta:
- fields = ('notificationid', 'ministryrequestid', 'notification', 'notificationtypeid', 'notificationtypelabel','created_at','createdby','updated_at','updatedby')
\ No newline at end of file
+ fields = ('notificationid', 'ministryrequestid', 'notification', 'notificationtypeid','created_at','createdby','updated_at','updatedby')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/FOIRequestStatus.py b/request-management-api/request_api/models/FOIRequestStatus.py
index 439c9f6ed..fa751e971 100644
--- a/request-management-api/request_api/models/FOIRequestStatus.py
+++ b/request-management-api/request_api/models/FOIRequestStatus.py
@@ -9,7 +9,6 @@ class FOIRequestStatus(db.Model):
name = db.Column(db.String(100), unique=False, nullable=False)
description = db.Column(db.String(255), unique=False, nullable=True)
isactive = db.Column(db.Boolean, unique=False, nullable=False)
- statuslabel = db.Column(db.String(50), unique=True, nullable=False)
@classmethod
def getrequeststatuses(cls):
@@ -18,17 +17,17 @@ def getrequeststatuses(cls):
return requeststatus_schema.dump(query)
@classmethod
- def getrequeststatus(cls,status):
+ def getrequeststatusid(cls,status):
requeststatus_schema = RequestStatusSchema()
query = db.session.query(FOIRequestStatus).filter_by(name=status).first()
return requeststatus_schema.dump(query)
@classmethod
- def getrequeststatusbylabel(cls,statuslabel):
+ def getrequeststatusname(cls,statusid):
requeststatus_schema = RequestStatusSchema()
- query = db.session.query(FOIRequestStatus).filter_by(statuslabel=statuslabel, isactive=True).first()
+ query = db.session.query(FOIRequestStatus).filter_by(requeststatusid=statusid, isactive=True).first()
return requeststatus_schema.dump(query)
class RequestStatusSchema(ma.Schema):
class Meta:
- fields = ('requeststatusid', 'name', 'description','isactive','statuslabel')
\ No newline at end of file
+ fields = ('requeststatusid', 'name', 'description','isactive')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/FOIRequestTeams.py b/request-management-api/request_api/models/FOIRequestTeams.py
index e6ddbe50f..02d02714b 100644
--- a/request-management-api/request_api/models/FOIRequestTeams.py
+++ b/request-management-api/request_api/models/FOIRequestTeams.py
@@ -4,15 +4,12 @@
from sqlalchemy.sql.schema import ForeignKey
from sqlalchemy import text
import logging
-from request_api.utils.enums import StateName
-
class FOIRequestTeam(db.Model):
__tablename__ = 'FOIRequestTeams'
# Defining the columns
requestteamid = db.Column(db.Integer, primary_key=True,autoincrement=True)
requesttype = db.Column(db.String(100), unique=False, nullable=True)
requeststatusid = db.Column(db.Integer,ForeignKey('FOIRequestStatuses.requeststatusid'))
- requeststatuslabel = db.Column(db.String(50), unique=False, nullable=False)
teamid = db.Column(db.Integer,ForeignKey('OperatingTeams.teamid'))
programareaid = db.Column(db.Integer,ForeignKey('ProgramAreas.programareaid'))
isactive = db.Column(db.Boolean, unique=False, nullable=False)
@@ -26,15 +23,14 @@ def getrequestteams(cls):
@classmethod
def getteamsbystatusandprogramarea(cls, requesttype, status, bcgovcode):
teams = []
- try:
- # and replace(lower(fs2."name"),' ','') = :status
+ try:
sql = """
with mappedteams as (
select ot."name" as name, ot."type" as type, ft.requestteamid as orderby from "FOIRequestTeams" ft inner join "FOIRequestStatuses" fs2 on ft.requeststatusid = fs2.requeststatusid
inner join "OperatingTeams" ot on ft.teamid = ot.teamid
left join "ProgramAreas" pa on ft.programareaid = pa.programareaid
- where ft.isactive = true and lower(ft.requesttype) = :requesttype
- and ft.requeststatuslabel = :status
+ where ft.isactive = true and lower(ft.requesttype) = :requesttype
+ and replace(lower(fs2."name"),' ','') = :status
and (lower(pa.bcgovcode) = :bcgovcode or ft.programareaid is null)
)
-- remove the with statement and below query go back to mapped teams only in assignee drop down
@@ -61,8 +57,8 @@ def getprocessingteamsbytype(cls, requesttype):
inner join "ProgramAreas" pa on ft.programareaid = pa.programareaid
where lower(ft.requesttype) = :requesttype and ft.programareaid is not null
and ot."type" = 'iao'
- and ft.requeststatuslabel = :requeststatuslabel"""
- rs = db.session.execute(text(sql), {'requesttype': requesttype, 'requeststatuslabel': StateName.feeestimate.name})
+ and ft.requeststatusid = 8"""
+ rs = db.session.execute(text(sql), {'requesttype': requesttype})
for row in rs:
teams.append({"team":row["team"], "ministry":row["ministry"], "bcgovcode":row["bcgovcode"], "iaocode":row["iaocode"]})
except Exception as ex:
@@ -95,4 +91,4 @@ def getdefaultprocessingteamforpersonal(cls, bcgovcode):
class FOIRequestTeamSchema(ma.Schema):
class Meta:
- fields = ('requestteamid', 'requesttype', 'requeststatusid','teamid','programareaid','isactive', 'requeststatuslabel')
\ No newline at end of file
+ fields = ('requestteamid', 'requesttype', 'requeststatusid','teamid','programareaid','isactive')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/NotificationTypes.py b/request-management-api/request_api/models/NotificationTypes.py
index 71be7a7d3..a3743612a 100644
--- a/request-management-api/request_api/models/NotificationTypes.py
+++ b/request-management-api/request_api/models/NotificationTypes.py
@@ -11,23 +11,14 @@ class NotificationType(db.Model):
name = db.Column(db.String(100), unique=False, nullable=False)
description = db.Column(db.String(255), unique=False, nullable=False)
isactive = db.Column(db.Boolean, unique=False, nullable=False)
- notificationtypelabel = db.Column(db.String(100), unique=True, nullable=False)
@classmethod
def getnotificationtypes(cls):
type_schema = NotificationTypeSchema(many=True)
query = db.session.query(NotificationType).filter_by(isactive=True).all()
return type_schema.dump(query)
-
- # create a class method that returns the notification type id
- @classmethod
- def getnotificationtypeid(cls, notificationtype):
- type_schema = NotificationTypeSchema(many=False)
- query = db.session.query(NotificationType).filter_by(name=notificationtype, isactive=True).first()
- return type_schema.dump(query) if query is not None else None
class NotificationTypeSchema(ma.Schema):
class Meta:
- fields = ('notificationtypeid', 'name', 'description','isactive', 'notificationtypelabel')
-
+ fields = ('notificationtypeid', 'name', 'description','isactive')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/NotificationUserTypes.py b/request-management-api/request_api/models/NotificationUserTypes.py
index 2b4e46e16..054b4c213 100644
--- a/request-management-api/request_api/models/NotificationUserTypes.py
+++ b/request-management-api/request_api/models/NotificationUserTypes.py
@@ -3,10 +3,6 @@
from sqlalchemy.orm import relationship,backref
from datetime import datetime
from sqlalchemy import text
-import json
-f = open('common/notificationusertypes.json', encoding="utf8")
-notificationusertypes_cache = json.load(f)
-
class NotificationUserType(db.Model):
__tablename__ = 'NotificationUserTypes'
@@ -15,25 +11,14 @@ class NotificationUserType(db.Model):
name = db.Column(db.String(100), unique=False, nullable=False)
description = db.Column(db.String(255), unique=False, nullable=False)
isactive = db.Column(db.Boolean, unique=False, nullable=False)
- notificationusertypelabel = db.Column(db.String(100), unique=True, nullable=False)
@classmethod
def getnotificationusertypes(cls):
usertype_schema = NotificationUserTypeSchema(many=True)
query = db.session.query(NotificationUserType).filter_by(isactive=True).all()
return usertype_schema.dump(query)
-
- # create a class method that returns the notification type id
- @classmethod
- def getnotificationusertypesid(cls, notificationusertype):
- for usertype in notificationusertypes_cache:
- if (notificationusertypes_cache[usertype]['name'] == notificationusertype) or (notificationusertypes_cache[usertype]['notificationusertypelabel'] == notificationusertype):
- notificationusertypelabel = notificationusertypes_cache[usertype]['notificationusertypelabel']
- type_schema = NotificationUserTypeSchema(many=False)
- query = db.session.query(NotificationUserType).filter_by(notificationusertypelabel=notificationusertypelabel, isactive=True).first()
- return type_schema.dump(query) if query is not None else None
class NotificationUserTypeSchema(ma.Schema):
class Meta:
- fields = ('notificationusertypeid', 'notificationusertypelabel', 'name', 'description','isactive')
\ No newline at end of file
+ fields = ('notificationusertypeid', 'name', 'description','isactive')
\ No newline at end of file
diff --git a/request-management-api/request_api/models/views/FOINotifications.py b/request-management-api/request_api/models/views/FOINotifications.py
index dc14ffe7b..ab6b9e214 100644
--- a/request-management-api/request_api/models/views/FOINotifications.py
+++ b/request-management-api/request_api/models/views/FOINotifications.py
@@ -17,5 +17,4 @@ class FOINotifications(db.Model):
userformatted = db.Column(db.Text)
creatorformatted = db.Column(db.Text)
notificationtype = db.Column(db.String(500))
- notificationtypelabel = db.Column(db.String(500))
diff --git a/request-management-api/request_api/models/views/FOIRequests.py b/request-management-api/request_api/models/views/FOIRequests.py
index baa3395f3..b4a85ddc8 100644
--- a/request-management-api/request_api/models/views/FOIRequests.py
+++ b/request-management-api/request_api/models/views/FOIRequests.py
@@ -20,5 +20,4 @@ class FOIRequests(db.Model):
ministryassignedtoformatted = db.Column(db.String(500))
description = db.Column(db.Text)
crtid = db.Column(db.Text)
- requeststatuslabel = db.Column(db.String(50))
diff --git a/request-management-api/request_api/resources/foirequest.py b/request-management-api/request_api/resources/foirequest.py
index 58cf30376..290cd2ccc 100644
--- a/request-management-api/request_api/resources/foirequest.py
+++ b/request-management-api/request_api/resources/foirequest.py
@@ -28,7 +28,6 @@
from request_api.services.eventservice import eventservice
from request_api.schemas.foirequestwrapper import FOIRequestWrapperSchema, EditableFOIRequestWrapperSchema, FOIRequestMinistrySchema, FOIRequestStatusSchema
from request_api.schemas.foiassignee import FOIRequestAssigneeSchema
-from request_api.utils.enums import StateName
from marshmallow import Schema, fields, validate, ValidationError
from request_api.utils.enums import MinistryTeamWithKeycloackGroup
import json
@@ -100,7 +99,7 @@ def post():
assignedtofirstname = request_json["assignedToFirstName"] if request_json.get("assignedToFirstName") != None else None
assignedtomiddlename = request_json["assignedToMiddleName"] if request_json.get("assignedToMiddleName") != None else None
assignedtolastname = request_json["assignedToLastName"] if request_json.get("assignedToLastName") != None else None
- rawresult = rawrequestservice().saverawrequestversion(request_json,request_json['id'],assignedgroup,assignedto,"Archived",AuthHelper.getuserid(), assignedtofirstname,assignedtomiddlename,assignedtolastname,StateName.archived.name)
+ rawresult = rawrequestservice().saverawrequestversion(request_json,request_json['id'],assignedgroup,assignedto,"Archived",AuthHelper.getuserid(), assignedtofirstname,assignedtomiddlename,assignedtolastname)
diff --git a/request-management-api/request_api/resources/request.py b/request-management-api/request_api/resources/request.py
index 58768694a..cfc9fc012 100644
--- a/request-management-api/request_api/resources/request.py
+++ b/request-management-api/request_api/resources/request.py
@@ -25,7 +25,6 @@
from request_api.services.rawrequestservice import rawrequestservice
from request_api.services.documentservice import documentservice
from request_api.services.eventservice import eventservice
-from request_api.utils.enums import StateName
import json
import asyncio
from jose import jwt as josejwt
@@ -93,13 +92,12 @@ def post(requestid=None, actiontype=None):
assigneefirstname = requestdata['assigneefirstname']
assigneemiddlename = requestdata['assigneemiddlename']
assigneelastname = requestdata['assigneelastname']
- statuslabel = requestdata['requeststatuslabel']
if int(requestid) and str(requestid) != "-1" :
status = rawrequestservice().getstatus(updaterequest)
- if statuslabel not in [StateName.intakeinprogress.name, StateName.closed.name, StateName.redirect.name, StateName.peerreview.name, StateName.section5pending.name, StateName.appfeeowing.name]:
+ if status not in ['Intake in Progress', 'Closed', 'Redirect', 'Peer Review', 'Section 5 Pending', 'App Fee Owing']:
raise ValueError('Invalid request state.')
- result = rawrequestservice().saverawrequestversion(updaterequest,requestid,assigneegroup,assignee,status,AuthHelper.getuserid(),assigneefirstname,assigneemiddlename,assigneelastname, statuslabel, actiontype)
+ result = rawrequestservice().saverawrequestversion(updaterequest,requestid,assigneegroup,assignee,status,AuthHelper.getuserid(),assigneefirstname,assigneemiddlename,assigneelastname, actiontype)
assignee = ''
if(actiontype == 'assignee'):
assignee = getassignee(assigneefirstname,assigneelastname,assigneegroup)
@@ -130,8 +128,7 @@ def getparams(updaterequest):
'assignee': updaterequest["assignedTo"] if 'assignedTo' in updaterequest else None,
'assigneefirstname': updaterequest["assignedToFirstName"] if updaterequest.get("assignedToFirstName") != None else None,
'assigneemiddlename': updaterequest["assignedToMiddleName"] if updaterequest.get("assignedToMiddleName") != None else None,
- 'assigneelastname': updaterequest["assignedToLastName"] if updaterequest.get("assignedToLastName") != None else None,
- 'requeststatuslabel': updaterequest["requeststatuslabel"] if updaterequest.get("requeststatuslabel") != None else None
+ 'assigneelastname': updaterequest["assignedToLastName"] if updaterequest.get("assignedToLastName") != None else None
}
@cors_preflight('GET,OPTIONS')
diff --git a/request-management-api/request_api/schemas/foirequestwrapper.py b/request-management-api/request_api/schemas/foirequestwrapper.py
index ce3ef32f6..efdb027ac 100644
--- a/request-management-api/request_api/schemas/foirequestwrapper.py
+++ b/request-management-api/request_api/schemas/foirequestwrapper.py
@@ -105,7 +105,6 @@ class Meta: # pylint: disable=too-few-public-methods
postal = fields.Str(data_key="postal",allow_none=True, validate=[validate.Length(max=10, error=MAX_EXCEPTION_MESSAGE)])
country = fields.Str(data_key="country",allow_none=True)
requeststatusid = fields.Int(data_key="requeststatusid",allow_none=True)
- requeststatuslabel = fields.Str(data_key="requeststatuslabel",allow_none=False)
closedate = fields.Date(data_key="closedate", required=False,allow_none=True)
closereasonid = fields.Int(data_key="closereasonid",allow_none=True)
correctionalServiceNumber = fields.Str(data_key="correctionalServiceNumber",allow_none=True, validate=[validate.Length(max=50, error=MAX_EXCEPTION_MESSAGE)])
@@ -169,7 +168,6 @@ class Meta: # pylint: disable=too-few-public-methods
assignedgroup = fields.Str(data_key="assignedGroup",allow_none=True, validate=[validate.Length(max=250, error=MAX_EXCEPTION_MESSAGE)])
assignedto = fields.Str(data_key="assignedTo",allow_none=True, validate=[validate.Length(max=120, error=MAX_EXCEPTION_MESSAGE)])
requeststatusid = fields.Int(data_key="requeststatusid",allow_none=True)
- requeststatuslabel = fields.Str(data_key="requeststatuslabel",allow_none=False)
divisions = fields.Nested(FOIMinistryRequestDivisionSchema, many=True,allow_none=True)
documents = fields.Nested(FOIMinistryRequestDocumentSchema, many=True,allow_none=True)
assignedToFirstName = fields.Str(data_key="assignedToFirstName",allow_none=True, validate=[validate.Length(max=50, error=MAX_EXCEPTION_MESSAGE)])
diff --git a/request-management-api/request_api/services/events/state.py b/request-management-api/request_api/services/events/state.py
index 72cdaa439..f317f6e7c 100644
--- a/request-management-api/request_api/services/events/state.py
+++ b/request-management-api/request_api/services/events/state.py
@@ -9,7 +9,6 @@
from request_api.models.FOIRequestStatus import FOIRequestStatus
import json
from request_api.models.default_method_result import DefaultMethodResult
-from request_api.utils.enums import StateName
class stateevent:
""" FOI Event management service
@@ -35,12 +34,12 @@ def __haschanged(self, requestid, requesttype):
if len(states) == 2:
newstate = states[0]
oldstate = states[1]
- if newstate != oldstate and newstate != StateName.intakeinprogress.value:
+ if newstate != oldstate and newstate != 'Intake in Progress':
return newstate
return None
def __createcommentwrapper(self, requestid, state, requesttype, userid, username):
- if state == StateName.archived.value:
+ if state == 'Archived':
_openedministries = FOIMinistryRequest.getministriesopenedbyuid(requestid)
for ministry in _openedministries:
response=self.__createcomment(ministry["ministryrequestid"], state, 'ministryrequest', userid, username)
@@ -59,17 +58,16 @@ def __createcomment(self, requestid, state, requesttype, userid, username):
def __createnotification(self, requestid, state, requesttype, userid):
_notificationtype = "State"
- if state == StateName.callforrecords.value and requesttype == "ministryrequest":
+ if state == 'Call For Records' and requesttype == "ministryrequest":
foirequest = notificationservice().getrequest(requestid, requesttype)
_notificationtype = "Group Members" if foirequest['assignedministryperson'] is None else "State"
notification = self.__preparenotification(state)
- if state == StateName.response.value and requesttype == "ministryrequest":
+ if state == "Response" and requesttype == "ministryrequest":
signgoffapproval = FOIMinistryRequest().getrequest(requestid)['ministrysignoffapproval']
- if signgoffapproval:
- notification = notification + f". Approved by {signgoffapproval['approvername']}, {signgoffapproval['approvertitle']} on {signgoffapproval['approveddate']}"
- if state == StateName.closed.value or state == StateName.archived.value:
+ notification = notification + f". Approved by {signgoffapproval['approvername']}, {signgoffapproval['approvertitle']} on {signgoffapproval['approveddate']}"
+ if state == 'Closed' or state == 'Archived' :
notificationservice().dismissnotificationsbyrequestid(requestid, requesttype)
- if state == StateName.archived.value:
+ if state == 'Archived':
_openedministries = FOIMinistryRequest.getministriesopenedbyuid(requestid)
for ministry in _openedministries:
response = notificationservice().createnotification({"message" : notification}, ministry["ministryrequestid"], 'ministryrequest', "State", userid)
@@ -90,7 +88,7 @@ def __preparenotification(self, state):
return self.__notificationmessage(state)
def __preparegroupmembernotification(self, state, requestid):
- if state == StateName.callforrecords.value:
+ if state == 'Call For Records':
return self.__notificationcfrmessage(requestid)
return self.__groupmembernotificationmessage(state)
@@ -103,14 +101,13 @@ def __preparecomment(self, requestid, state,requesttype, username):
return comment
def __formatstate(self, state):
- return StateName.open.value if state == StateName.archived.value else state
+ return "Open" if state == "Archived" else state
def __commentmessage(self, state, username, requesttype, requestid):
comment = username+' changed the state of the request to '+self.__formatstate(state)
- if state == StateName.response.value and requesttype == "ministryrequest":
+ if state == "Response" and requesttype == "ministryrequest":
signgoffapproval = FOIMinistryRequest().getrequest(requestid)['ministrysignoffapproval']
- if signgoffapproval:
- comment = comment + f". Approved by {signgoffapproval['approvername']}, {signgoffapproval['approvertitle']} on {signgoffapproval['approveddate']}"
+ comment = comment + f". Approved by {signgoffapproval['approvername']}, {signgoffapproval['approvertitle']} on {signgoffapproval['approveddate']}"
return comment
def __notificationmessage(self, state):
@@ -122,7 +119,7 @@ def __notificationcfrmessage(self, requestid):
def __createcfrentry(self, state, ministryrequestid, userid):
cfrfee = cfrfeeservice().getcfrfee(ministryrequestid)
- if (state == StateName.feeestimate.value and cfrfee['cfrfeestatusid'] in (None, '')):
+ if (state == "Fee Estimate" and cfrfee['cfrfeestatusid'] in (None, '')):
return cfrfeeservice().sanctioncfrfee(ministryrequestid, {"status": "review"}, userid)
else:
return DefaultMethodResult(True,'No action needed',ministryrequestid)
diff --git a/request-management-api/request_api/services/foirequest/requestservicebuilder.py b/request-management-api/request_api/services/foirequest/requestservicebuilder.py
index d3f5a4d8b..4f6db7aa5 100644
--- a/request-management-api/request_api/services/foirequest/requestservicebuilder.py
+++ b/request-management-api/request_api/services/foirequest/requestservicebuilder.py
@@ -8,9 +8,8 @@
from request_api.models.FOIRequestApplicants import FOIRequestApplicant
from request_api.models.FOIRequestApplicantMappings import FOIRequestApplicantMapping
from request_api.models.FOIRequestTeams import FOIRequestTeam
-from request_api.models.FOIRequestStatus import FOIRequestStatus
from datetime import datetime as datetime2
-from request_api.utils.enums import MinistryTeamWithKeycloackGroup, StateName
+from request_api.utils.enums import MinistryTeamWithKeycloackGroup
from request_api.services.foirequest.requestserviceconfigurator import requestserviceconfigurator
from request_api.services.foirequest.requestserviceministrybuilder import requestserviceministrybuilder
@@ -23,8 +22,7 @@ class requestservicebuilder(requestserviceconfigurator):
def createministry(self, requestschema, ministry, activeversion, userid, filenumber=None, ministryid=None):
foiministryrequest = FOIMinistryRequest()
foiministryrequest.__dict__.update(ministry)
- foiministryrequest.requeststatusid = self.__getrequeststatusid(requestschema.get("requeststatuslabel"))
- foiministryrequest.requeststatuslabel = requestschema.get("requeststatuslabel")
+ foiministryrequest.requeststatusid = requestschema.get("requeststatusid")
foiministryrequest.isactive = True
foiministryrequest.axisrequestid = requestschema.get("axisRequestId")
foiministryrequest.axissyncdate = requestschema.get("axisSyncDate")
@@ -45,9 +43,9 @@ def createministry(self, requestschema, ministry, activeversion, userid, filenum
startdate = requestschema.get("requestProcessStart")
foiministryrequest.startdate = startdate
foiministryrequest.createdby = userid
- requeststatuslabel = self.getpropertyvaluefromschema(requestschema, 'requeststatuslabel')
- if requeststatuslabel is not None:
- status = self.getstatusname(requeststatuslabel)
+ requeststatusid = self.getpropertyvaluefromschema(requestschema, 'requeststatusid')
+ if requeststatusid is not None:
+ status = self.getstatusname(requeststatusid)
if self.isNotBlankorNone(requestschema,"fromDate","main") == True:
foiministryrequest.recordsearchfromdate = requestschema.get("fromDate")
if self.isNotBlankorNone(requestschema,"toDate","main") == True:
@@ -91,7 +89,7 @@ def __updateassignedtoandgroup(self, foiministryrequest, requestschema, ministry
foiministryrequest.assignedto = None
def __isgrouprequired(self,status):
- if status == StateName.callforrecords.value or status == StateName.recordsreview.value or status == StateName.consult.value or status == StateName.feeestimate.value or status == StateName.ministrysignoff.value or status == StateName.response.value:
+ if status == "Call For Records" or status == "Review" or status == "Consult" or status == "Fee Assessed" or status == "Ministry Sign Off" or status == "Response":
return True
else:
return False
@@ -99,17 +97,6 @@ def __isgrouprequired(self,status):
def __getgroupname(self, requesttype, bcgovcode):
return 'Flex Team' if requesttype == "general" else FOIRequestTeam.getdefaultprocessingteamforpersonal(bcgovcode)
- def __getrequeststatusid(self, requeststatuslabel):
- state = FOIRequestStatus.getrequeststatusbylabel(
- requeststatuslabel
- )
- stateid = (
- state.get("requeststatusid")
- if isinstance(state, dict) and state.get("requeststatusid") not in (None, "")
- else ""
- )
- return stateid
-
def createcontactinformation(self,dataformat, name, value, contacttypes, userid):
contactinformation = FOIRequestContactInformation()
contactinformation.contactinformation = value
diff --git a/request-management-api/request_api/services/foirequest/requestserviceconfigurator.py b/request-management-api/request_api/services/foirequest/requestserviceconfigurator.py
index 2c31f1674..a2a87909f 100644
--- a/request-management-api/request_api/services/foirequest/requestserviceconfigurator.py
+++ b/request-management-api/request_api/services/foirequest/requestserviceconfigurator.py
@@ -15,10 +15,10 @@ class requestserviceconfigurator:
"""This class consolidates helper fiunctions and constants
"""
- def getstatusname(self,requeststatuslabel):
+ def getstatusname(self,requeststatusid):
allstatus = FOIRequestStatus().getrequeststatuses()
for status in allstatus:
- if status["statuslabel"] == requeststatuslabel:
+ if status["requeststatusid"] == requeststatusid:
return status["name"]
return None;
diff --git a/request-management-api/request_api/services/foirequest/requestservicecreate.py b/request-management-api/request_api/services/foirequest/requestservicecreate.py
index ac6f24275..6d4b2142f 100644
--- a/request-management-api/request_api/services/foirequest/requestservicecreate.py
+++ b/request-management-api/request_api/services/foirequest/requestservicecreate.py
@@ -12,7 +12,6 @@
from request_api.models.FOIRequestContactInformation import FOIRequestContactInformation
from request_api.models.FOIRequestPersonalAttributes import FOIRequestPersonalAttribute
from request_api.models.FOIRequestApplicantMappings import FOIRequestApplicantMapping
-from request_api.utils.enums import StateName
import json
class requestservicecreate:
@@ -170,10 +169,10 @@ def __prepareapplicants(self, foirequestschema, userid):
return requestapplicantarr
def __disablewatchers(self, ministryid, requestschema, userid):
- requeststatuslabel = requestschema.get("requeststatuslabel") if 'requeststatuslabel' in requestschema else None
- if requeststatuslabel is not None:
- status = requestserviceconfigurator().getstatusname(requeststatuslabel)
- if status == StateName.open.value:
+ requeststatusid = requestschema.get("requeststatusid") if 'requeststatusid' in requestschema else None
+ if requeststatusid is not None:
+ status = requestserviceconfigurator().getstatusname(requeststatusid)
+ if status == "Open":
watchers = watcherservice().getministryrequestwatchers(int(ministryid), True)
for watcher in watchers:
watcherschema = {"ministryrequestid":ministryid,"watchedbygroup":watcher["watchedbygroup"],"watchedby":watcher["watchedby"],"isactive":False}
diff --git a/request-management-api/request_api/services/foirequest/requestservicegetter.py b/request-management-api/request_api/services/foirequest/requestservicegetter.py
index f8a7492c4..e5ae2c249 100644
--- a/request-management-api/request_api/services/foirequest/requestservicegetter.py
+++ b/request-management-api/request_api/services/foirequest/requestservicegetter.py
@@ -15,7 +15,6 @@
from request_api.services.programareaservice import programareaservice
from request_api.utils.commons.datetimehandler import datetimehandler
from request_api.services.external.keycloakadminservice import KeycloakAdminService
-from request_api.utils.enums import StateName
class requestservicegetter:
""" This class consolidates retrival of FOI request for actors: iao and ministry.
@@ -30,7 +29,7 @@ def getrequest(self,foirequestid,foiministryrequestid):
iaorestrictrequestdetails = FOIRestrictedMinistryRequest.getrestricteddetails(ministryrequestid=foiministryrequestid,type='iao')
baserequestinfo = self.__preparebaseinfo(request,foiministryrequestid,requestministry,requestministrydivisions)
- baserequestinfo['lastStatusUpdateDate'] = FOIMinistryRequest.getLastStatusUpdateDate(foiministryrequestid, requestministry['requeststatuslabel']).strftime(self.__genericdateformat()),
+ baserequestinfo['lastStatusUpdateDate'] = FOIMinistryRequest.getLastStatusUpdateDate(foiministryrequestid, requestministry['requeststatus.requeststatusid']).strftime(self.__genericdateformat()),
for contactinfo in requestcontactinformation:
if contactinfo['contacttype.name'] == 'Email':
baserequestinfo.update({'email':contactinfo['contactinformation']})
@@ -153,8 +152,8 @@ def __preparebaseinfo(self,request,foiministryrequestid,requestministry,requestm
'description': requestministry['description'],
'fromDate': parse(requestministry['recordsearchfromdate']).strftime(self.__genericdateformat()) if requestministry['recordsearchfromdate'] is not None else '',
'toDate': parse(requestministry['recordsearchtodate']).strftime(self.__genericdateformat()) if requestministry['recordsearchtodate'] is not None else '',
- 'currentState':requestministry['requeststatus.name'],
- 'requeststatuslabel':requestministry['requeststatuslabel'],
+ 'currentState':requestministry['requeststatus.name'],
+ 'requeststatusid':requestministry['requeststatus.requeststatusid'],
'requestProcessStart': parse(requestministry['startdate']).strftime(self.__genericdateformat()) if requestministry['startdate'] is not None else '',
'dueDate':parse(requestministry['duedate']).strftime(self.__genericdateformat()),
'originalDueDate': parse(requestministry['originalldd']).strftime(self.__genericdateformat()) if requestministry['originalldd'] is not None else parse(requestministry['duedate']).strftime(self.__genericdateformat()),
@@ -214,7 +213,7 @@ def getonholdtransition(self, foiministryrequestid):
onholddate = None
transitions = FOIMinistryRequest.getrequeststatusById(foiministryrequestid)
for entry in transitions:
- if entry['requeststatuslabel'] == StateName.onhold.name:
+ if entry['requeststatusid'] == 11:
onholddate = datetimehandler().convert_to_pst(entry['created_at'],'%Y-%m-%d')
else:
if onholddate is not None:
diff --git a/request-management-api/request_api/services/foirequest/requestserviceministrybuilder.py b/request-management-api/request_api/services/foirequest/requestserviceministrybuilder.py
index 56db80d2d..f35af8e74 100644
--- a/request-management-api/request_api/services/foirequest/requestserviceministrybuilder.py
+++ b/request-management-api/request_api/services/foirequest/requestserviceministrybuilder.py
@@ -11,7 +11,6 @@
from request_api.models.FOIRequestExtensionDocumentMappings import FOIRequestExtensionDocumentMapping
from request_api.models.FOIAssignees import FOIAssignee
from request_api.models.FOIMinistryRequestSubjectCodes import FOIMinistryRequestSubjectCode
-from request_api.models.FOIRequestStatus import FOIRequestStatus
from request_api.services.foirequest.requestserviceconfigurator import requestserviceconfigurator
from datetime import datetime as datetime2
@@ -77,8 +76,7 @@ def createfoiministryrequestfromobject(self, ministryschema, requestschema, user
foiministryrequest.assignedto = None if usertype == "iao" and 'assignedto' in requestschema and requestschema['assignedto'] in (None, '') else ministryschema["assignedto"]
foiministryrequest.ministrysignoffapproval = requestdict["ministrysignoffapproval"]
- foiministryrequest.requeststatusid = self.__getrequeststatusid(requestdict['requeststatuslabel'])
- foiministryrequest.requeststatuslabel = requestdict['requeststatuslabel']
+ foiministryrequest.requeststatusid = requestdict['requeststatusid']
foiministryrequest.programareaid = requestdict['programareaid']
foiministryrequest.createdby = userid
@@ -90,16 +88,6 @@ def createfoiministryrequestfromobject(self, ministryschema, requestschema, user
foiministryrequest.closereasonid = requestdict['closereasonid']
return foiministryrequest
- def __getrequeststatusid(self, requeststatuslabel):
- state = FOIRequestStatus.getrequeststatusbylabel(
- requeststatuslabel
- )
- stateid = (
- state.get("requeststatusid")
- if isinstance(state, dict) and state.get("requeststatusid") not in (None, "")
- else ""
- )
- return stateid
def __createministrydivisions(self, requestschema, foiministryrequestid, foiministryrequestversion, userid):
if 'divisions' in requestschema:
return self.createfoirequestdivision(requestschema,foiministryrequestid ,foiministryrequestversion + 1, userid)
@@ -123,7 +111,7 @@ def createfoiministryrequestfromobject1(self, ministryschema, requestschema):
'duedate': requestschema['duedate'] if 'duedate' in requestschema else ministryschema["duedate"], #and isextension':= True
'assignedministrygroup': requestschema['assignedministrygroup'] if 'assignedministrygroup' in requestschema else ministryschema["assignedministrygroup"],
'assignedgroup': requestschema['assignedgroup'] if 'assignedgroup' in requestschema else ministryschema["assignedgroup"],
- 'requeststatuslabel': requestschema['requeststatuslabel'] if 'requeststatuslabel' in requestschema else ministryschema["requeststatuslabel"],
+ 'requeststatusid': requestschema['requeststatusid'] if 'requeststatusid' in requestschema else ministryschema["requeststatus.requeststatusid"],
'programareaid': ministryschema["programarea.programareaid"] if 'programarea.programareaid' in ministryschema else None,
'closedate': requestschema['closedate'] if 'closedate' in requestschema else None,
'closereasonid': requestschema['closereasonid'] if 'closereasonid' in requestschema else None,
diff --git a/request-management-api/request_api/services/foirequest/requestserviceupdate.py b/request-management-api/request_api/services/foirequest/requestserviceupdate.py
index a85ca38e9..c800ae387 100644
--- a/request-management-api/request_api/services/foirequest/requestserviceupdate.py
+++ b/request-management-api/request_api/services/foirequest/requestserviceupdate.py
@@ -19,7 +19,7 @@ def updaterequest(self,foirequestschema,foirequestid,userid):
for ministry in foirequestschema.get("selectedMinistries"):
for status in allstatus:
if ministry["status"] == status["name"]:
- updatedministries.append({"filenumber" : ministry["filenumber"], "requeststatuslabel": status["statuslabel"]})
+ updatedministries.append({"filenumber" : ministry["filenumber"], "requeststatusid": status["requeststatusid"]})
return FOIRequest.updateStatus(foirequestid, updatedministries, userid)
def updateministryrequestduedate(self, ministryrequestid, duedate, userid):
diff --git a/request-management-api/request_api/services/notifications/notificationconfig.py b/request-management-api/request_api/services/notifications/notificationconfig.py
index 743716781..522ba1749 100644
--- a/request-management-api/request_api/services/notifications/notificationconfig.py
+++ b/request-management-api/request_api/services/notifications/notificationconfig.py
@@ -3,50 +3,58 @@
from re import VERBOSE
import json
import os
-from request_api.models.NotificationTypes import NotificationType
-from request_api.models.NotificationUserTypes import NotificationUserType
class notificationconfig:
""" Notfication config
"""
-
- def getnotificationtypelabel(self, notificationtype):
- id = NotificationType().getnotificationtypeid(notificationtype)
- if id is not None:
- return id['notificationtypelabel']
- return 0
def getnotificationtypeid(self, notificationtype):
- id = NotificationType().getnotificationtypeid(notificationtype)
- if id is not None:
- return id['notificationtypeid']
- return 0
-
- def getnotificationusertypelabel(self, notificationusertype):
- print(notificationusertype)
- id = NotificationUserType().getnotificationusertypesid(notificationusertype)
- print(id)
- if id is not None:
- return id['notificationusertypelabel']
- return 0
+ if notificationtype == "State":
+ return 1
+ elif notificationtype == "Extension":
+ return 4
+ elif "IAO Assignment" in notificationtype:
+ return 5
+ elif "Ministry Assignment" in notificationtype:
+ return 6
+ elif notificationtype == "CFR Due Reminder":
+ return 7
+ elif notificationtype == "Legislative Due Reminder":
+ return 8
+ elif notificationtype == "New User Comments":
+ return 3
+ elif notificationtype == "Reply User Comments":
+ return 9
+ elif notificationtype == "Tagged User Comments":
+ return 10
+ elif notificationtype == "CFR Fee Form":
+ return 11
+ elif notificationtype == "Group Members":
+ return 12
+ elif notificationtype == "Division Due Reminder":
+ return 13
+ elif notificationtype == "Watcher":
+ return 14
+ elif notificationtype == "User Assignment Removal":
+ return 15
+ elif notificationtype == "Email Failure":
+ return 16
+ elif notificationtype == "Payment":
+ return 17
+ elif notificationtype == "Section 5 Pending Reminder":
+ return 20
+ return 0
def getnotificationusertypeid(self, notificationusertype):
- print(notificationusertype)
- id = NotificationUserType().getnotificationusertypesid(notificationusertype)
- print(id)
- if id is not None:
- return id['notificationusertypeid']
+ if notificationusertype.lower() == "watcher":
+ return 1
+ elif notificationusertype.lower() == "assignee" or "comment" or "group members" in notificationusertype.lower():
+ return 2
return 0
def getnotificationdays(self):
if 'FOI_NOTIFICATION_DAYS' in os.environ and os.getenv('FOI_NOTIFICATION_DAYS') != '':
return os.getenv('FOI_NOTIFICATION_DAYS')
else:
- return str(14)
-
- def getmutenotifications(self):
- if 'MUTE_NOTIFICATION' in os.environ and os.getenv('MUTE_NOTIFICATION') != '':
- return json.loads(os.getenv('MUTE_NOTIFICATION'))
- else:
- return {}
\ No newline at end of file
+ return str(14)
\ No newline at end of file
diff --git a/request-management-api/request_api/services/notifications/notificationuser.py b/request-management-api/request_api/services/notifications/notificationuser.py
index ddfb0cbf3..2b5a104cf 100644
--- a/request-management-api/request_api/services/notifications/notificationuser.py
+++ b/request-management-api/request_api/services/notifications/notificationuser.py
@@ -9,7 +9,7 @@
from request_api.services.external.keycloakadminservice import KeycloakAdminService
class notificationuser:
- """ notification user service
+ """ Notfication user service
"""
@@ -55,26 +55,26 @@ def __istaggeduser(self, notificationuser, foicomment, notificationtype):
def __getwatchers(self, notificationtype, foirequest, requesttype, requestjson=None):
notificationusers = []
if notificationtype == "Watcher":
- notificationusers.append({"userid": requestjson['watchedby'], "usertype":notificationconfig().getnotificationusertypelabel("Watcher")})
+ notificationusers.append({"userid": requestjson['watchedby'], "usertype":notificationconfig().getnotificationusertypeid("Watcher")})
else:
if requesttype == "ministryrequest":
watchers = watcherservice().getallministryrequestwatchers(foirequest["foiministryrequestid"], self.__isministryonly(notificationtype))
else:
watchers = watcherservice().getrawrequestwatchers(foirequest['requestid'])
for watcher in watchers:
- notificationusers.append({"userid":watcher["watchedby"], "usertype":notificationconfig().getnotificationusertypelabel("Watcher")})
+ notificationusers.append({"userid":watcher["watchedby"], "usertype":notificationconfig().getnotificationusertypeid("Watcher")})
return notificationusers
def __getassignees(self, foirequest, requesttype, notificationtype, requestjson=None):
notificationusers = []
- notificationtypelabel = notificationconfig().getnotificationusertypelabel("Assignee")
+ notificationtypeid = notificationconfig().getnotificationusertypeid("Assignee")
if notificationtype == 'User Assignment Removal':
- notificationusers.append({"userid": requestjson['userid'], "usertype":notificationtypelabel})
+ notificationusers.append({"userid": requestjson['userid'], "usertype":notificationtypeid})
else:
if requesttype == "ministryrequest" and foirequest["assignedministryperson"] is not None and (notificationtype == 'Ministry Assignment' or 'Assignment' not in notificationtype):
- notificationusers.append({"userid":foirequest["assignedministryperson"], "usertype":notificationtypelabel})
+ notificationusers.append({"userid":foirequest["assignedministryperson"], "usertype":notificationtypeid})
if self.__isministryonly(notificationtype) == False and foirequest["assignedto"] is not None and foirequest["assignedto"] != '' and (notificationtype == 'IAO Assignment' or 'Assignment' not in notificationtype):
- notificationusers.append({"userid":foirequest["assignedto"], "usertype":notificationtypelabel})
+ notificationusers.append({"userid":foirequest["assignedto"], "usertype":notificationtypeid})
return notificationusers
def __isministryonly(self, notificationtype):
@@ -102,7 +102,7 @@ def __getcommentusertype(self, userid, requestusers):
for requestuser in requestusers:
if requestuser["userid"] == userid:
return requestuser["usertype"]
- return notificationconfig().getnotificationusertypelabel("comment user")
+ return notificationconfig().getnotificationusertypeid("comment user")
def __getrelatedusers(self, comment, requesttype):
if requesttype == "ministryrequest":
@@ -118,16 +118,16 @@ def __gettaggedusers(self, comment):
def __preparetaggeduser(self, data):
taggedusers = []
for entry in data:
- taggedusers.append({"userid":entry["username"], "usertype":notificationconfig().getnotificationusertypelabel("comment tagged user")})
+ taggedusers.append({"userid":entry["username"], "usertype":notificationconfig().getnotificationusertypeid("comment tagged user")})
return taggedusers
def __getgroupmembers(self,groupid):
notificationusers = []
- notificationtypelabel = notificationconfig().getnotificationtypelabel("Group Members")
+ notificationtypeid = notificationconfig().getnotificationusertypeid("Group Members")
usergroupfromkeycloak= KeycloakAdminService().getmembersbygroupname(groupid)
if usergroupfromkeycloak is not None and len(usergroupfromkeycloak) > 0:
for user in usergroupfromkeycloak[0].get("members"):
- notificationusers.append({"userid":user["username"], "usertype":notificationtypelabel})
+ notificationusers.append({"userid":user["username"], "usertype":notificationtypeid})
return notificationusers
return []
\ No newline at end of file
diff --git a/request-management-api/request_api/services/notificationservice.py b/request-management-api/request_api/services/notificationservice.py
index 4b31c3e5d..ad9ac7469 100644
--- a/request-management-api/request_api/services/notificationservice.py
+++ b/request-management-api/request_api/services/notificationservice.py
@@ -8,7 +8,6 @@
from request_api.services.notifications.notificationuser import notificationuser
from request_api.models.FOIRawRequests import FOIRawRequest
from request_api.models.FOIMinistryRequests import FOIMinistryRequest
-from request_api.models.FOIRequests import FOIRequest
from request_api.models.FOIRequestNotifications import FOIRequestNotification
from request_api.models.FOIRequestNotificationUsers import FOIRequestNotificationUser
from request_api.models.FOIRawRequestNotifications import FOIRawRequestNotification
@@ -93,7 +92,7 @@ def dismissnotificationbyid(self, requesttype, notificationids):
return self.__deletenotificationids(requesttype, notificationids)
def dismissremindernotification(self, requesttype, notificationtype):
- notificationid = notificationconfig().getnotificationtypelabel(notificationtype)
+ notificationid = notificationconfig().getnotificationtypeid(notificationtype)
if requesttype == "ministryrequest":
_ids = FOIRequestNotification.getnotificationidsbytype(notificationid)
else:
@@ -101,13 +100,13 @@ def dismissremindernotification(self, requesttype, notificationtype):
self.__deletenotificationids(requesttype, _ids)
def dismissnotifications_by_requestid_type_userid(self, requestid, requesttype, notificationtype, userid):
- notificationtypelabels = self.__getcleanupnotificationids(notificationtype)
+ notificationtypeids = self.__getcleanupnotificationids(notificationtype)
foirequest = self.getrequest(requestid, requesttype)
if requesttype == "ministryrequest":
idnumber = foirequest["filenumber"]
- _ids = FOIRequestNotification.getnotificationidsbynumberandtype(idnumber, notificationtypelabels)
+ _ids = FOIRequestNotification.getnotificationidsbynumberandtype(idnumber, notificationtypeids)
else:
- _ids = FOIRawRequestNotification.getnotificationidsbynumberandtype('U-00' + str(foirequest['requestid']), notificationtypelabels[0])
+ _ids = FOIRawRequestNotification.getnotificationidsbynumberandtype('U-00' + str(foirequest['requestid']), notificationtypeids[0])
self.__deletenotificationbyuserandid(requesttype, _ids, userid)
def __createnotification(self, message, requestid, requesttype, notificationtype, userid, foirequest, requestjson=None):
@@ -134,22 +133,22 @@ def dismissnotificationsbyrequestid(self,requestid, requesttype):
FOIRawRequestNotification.dismissnotification(_ids)
def __cleanupnotifications(self, requesttype, notificationtype, foirequest):
- notificationtypelabels = self.__getcleanupnotificationids(notificationtype)
+ notificationtypeids = self.__getcleanupnotificationids(notificationtype)
if requesttype == "ministryrequest":
idnumber = foirequest["filenumber"]
- _ids = FOIRequestNotification.getnotificationidsbynumberandtype(idnumber, notificationtypelabels)
+ _ids = FOIRequestNotification.getnotificationidsbynumberandtype(idnumber, notificationtypeids)
else:
- _ids = FOIRawRequestNotification.getnotificationidsbynumberandtype('U-00' + str(foirequest['requestid']), notificationtypelabels[0])
+ _ids = FOIRawRequestNotification.getnotificationidsbynumberandtype('U-00' + str(foirequest['requestid']), notificationtypeids[0])
self.__deletenotificationids(requesttype, _ids)
def __getcleanupnotificationids(self, notificationtype):
- notificationtypelabels = []
- notificationid = notificationconfig().getnotificationtypelabel(notificationtype)
- notificationtypelabels.append(notificationid)
+ notificationtypeids = []
+ notificationid = notificationconfig().getnotificationtypeid(notificationtype)
+ notificationtypeids.append(notificationid)
if notificationtype == "State" or notificationtype.endswith("Assignment"):
- notificationtypelabels.append(notificationconfig().getnotificationtypelabel("Group Members"))
- return notificationtypelabels
+ notificationtypeids.append(notificationconfig().getnotificationtypeid("Group Members"))
+ return notificationtypeids
def __deletenotificationids(self, requesttype, notificationids):
@@ -191,7 +190,7 @@ def __dismissnotificationbyuser(self, userid):
return DefaultMethodResult(False,'Unable to delete the notifications',userid)
def __dismissnotificationbytype(self, userid, type):
- typeid = notificationconfig().getnotificationusertypelabel(type)
+ typeid = notificationconfig().getnotificationusertypeid(type)
requestnotificationids = self.__getdismissparentidsbyuserandtype("ministryrequest", userid, typeid)
requestnotification = FOIRequestNotificationUser.dismissnotificationbyuserandtype(userid, typeid)
rawnotificationids = self.__getdismissparentidsbyuserandtype("rawrequest", userid, typeid)
@@ -254,72 +253,40 @@ def __getnotificationtypefromid(self, idnumber):
return 'rawrequest' if idnumber.lower().startswith('u-00') else 'ministryrequest'
def __preparenotification(self, message, requesttype, notificationtype, userid, foirequest, requestjson=None):
- ministryusers = []
if requesttype == "ministryrequest":
notification = FOIRequestNotification()
notification.requestid = foirequest["foiministryrequestid"]
notification.idnumber = foirequest["filenumber"]
notification.foirequestid = foirequest["foirequest_id"]
-
- #mute notifications for ministry users
- mutenotification = self.__mutenotification(requesttype, notificationtype, foirequest)
- usergroupfromkeycloak = KeycloakAdminService().getmembersbygroupname(foirequest["assignedministrygroup"])
- if usergroupfromkeycloak is not None and len(usergroupfromkeycloak) > 0:
- for user in usergroupfromkeycloak[0].get("members"):
- ministryusers.append(user["username"])
else:
notification = FOIRawRequestNotification()
notification.requestid = foirequest["requestid"]
notification.idnumber ='U-00' + str(foirequest['requestid'])
- mutenotification = False
- notification.notificationtypelabel = notificationconfig().getnotificationtypelabel(notificationtype)
notification.notificationtypeid = notificationconfig().getnotificationtypeid(notificationtype)
notification.axisnumber = foirequest["axisrequestid"]
notification.version = foirequest["version"]
notification.createdby = userid
notification.notification = message
notification.isdeleted = False
-
notificationusers = notificationuser().getnotificationusers(notificationtype, requesttype, userid, foirequest, requestjson)
users = []
for _notificationuser in notificationusers:
- users.append(self.__preparenotificationuser(requesttype, _notificationuser, userid, mutenotification, ministryusers))
+ users.append(self.__preparenotificationuser(requesttype, _notificationuser, userid))
notification.notificationusers = users
return notification if users else None
- def __preparenotificationuser(self, requesttype, notificationuser, userid, mute=False, ministryusers=[]):
+ def __preparenotificationuser(self, requesttype, notificationuser, userid):
if requesttype == "ministryrequest":
user = FOIRequestNotificationUser()
- if notificationuser["userid"] in ministryusers:
- user.isdeleted = mute
- else:
- user.isdeleted = False
else:
user = FOIRawRequestNotificationUser()
- user.isdeleted = False
- user.notificationusertypelabel = notificationuser["usertype"]
- user.notificationusertypeid = notificationconfig().getnotificationusertypeid( notificationuser["usertype"])
+ user.notificationusertypeid = notificationuser["usertype"]
user.userid = notificationuser["userid"]
user.createdby = userid
+ user.isdeleted = False
return user
-
- def __mutenotification(self, requesttype, notificationtype, request):
- #get mute conditions from env
- mutenotifications = notificationconfig().getmutenotifications()
- if "programarea.bcgovcode" in request:
- bcgovcode = request["programarea.bcgovcode"].upper()
- if requesttype == "ministryrequest"and bcgovcode in mutenotifications:
- foirequest = FOIRequest.getrequest(request["foirequest_id"])
- if foirequest["requesttype"].upper() in (_requesttype.upper() for _requesttype in mutenotifications[bcgovcode]["request_types"]):
- if request["requeststatus.name"].upper() in (_state.upper() for _state in mutenotifications[bcgovcode]["state_exceptions"]):
- return False
- if notificationtype.upper() in (_notificationtype.upper() for _notificationtype in mutenotifications[bcgovcode]["type_exceptions"]):
- return False
- return True
-
- return False
-
+
def getrequest(self, requestid, requesttype):
if requesttype == "ministryrequest":
return FOIMinistryRequest.getrequestbyministryrequestid(requestid)
diff --git a/request-management-api/request_api/services/rawrequest/rawrequestservicegetter.py b/request-management-api/request_api/services/rawrequest/rawrequestservicegetter.py
index b8b1cf870..bb56f9317 100644
--- a/request-management-api/request_api/services/rawrequest/rawrequestservicegetter.py
+++ b/request-management-api/request_api/services/rawrequest/rawrequestservicegetter.py
@@ -7,7 +7,6 @@
from dateutil.parser import parse
import maya
from request_api.models.FOIAssignees import FOIAssignee
-from request_api.utils.enums import StateName
class rawrequestservicegetter:
""" This class consolidates retrival of FOI raw request for actors: iao.
@@ -53,7 +52,7 @@ def getallrawrequests(self):
def getrawrequestforid(self, requestid):
request = FOIRawRequest.get_request(requestid)
request = self.__attachministriesinfo(request)
- if request != {} and (request['version'] == 1 or request['status'] == StateName.unopened.value) and request['sourceofsubmission'] != "intake":
+ if request != {} and (request['version'] == 1 or request['status'] == 'Unopened') and request['sourceofsubmission'] != "intake":
requestrawdata = request['requestrawdata']
requesttype = requestrawdata['requestType']['requestType']
baserequestinfo = self.__preparebaserequestinfo(requestid, request, requesttype, requestrawdata)
@@ -61,15 +60,16 @@ def getrawrequestforid(self, requestid):
baserequestinfo['additionalPersonalInfo'] = self.__prepareadditionalpersonalinfo(requestrawdata)
return baserequestinfo
elif request != {} and request['version'] != 1 and request['sourceofsubmission'] != "intake":
- request['requestrawdata']['currentState'] = request['status']
- request['requestrawdata']['requeststatuslabel'] = request['requeststatuslabel']
+ request['requestrawdata']['currentState'] = request['status']
+ requeststatus = FOIRequestStatus().getrequeststatusid(request['status'])
+ request['requestrawdata']['requeststatusid'] = requeststatus['requeststatusid']
request['requestrawdata']['lastStatusUpdateDate'] = FOIRawRequest.getLastStatusUpdateDate(requestid, request['status']).strftime(self.__generaldateformat())
- if request['requeststatuslabel'] == StateName.closed.name:
+ if request['status'] == 'Closed':
request['requestrawdata']['stateTransition']= FOIRawRequest.getstatesummary(requestid)
request['requestrawdata']['wfinstanceid'] = request['wfinstanceid']
request['requestrawdata']['closedate']= self.__getclosedate(request['closedate'])
request['requestrawdata']['isiaorestricted']= request['isiaorestricted'] if request['isiaorestricted'] is not None else False
- return request['requestrawdata']
+ return request['requestrawdata']
elif request != {} and request['sourceofsubmission'] == "intake":
requestrawdata = request['requestrawdata']
requesttype = requestrawdata['requestType']
@@ -81,8 +81,8 @@ def getrawrequestforid(self, requestid):
request['requestrawdata']['wfinstanceid'] = request['wfinstanceid']
request['requestrawdata']['currentState'] = request['status']
- requeststatus = FOIRequestStatus().getrequeststatus(request['status'])
- request['requestrawdata']['requeststatuslabel'] = requeststatus['statuslabel']
+ requeststatus = FOIRequestStatus().getrequeststatusid(request['status'])
+ request['requestrawdata']['requeststatusid'] = requeststatus['requeststatusid']
request['requestrawdata']['lastStatusUpdateDate'] = FOIRawRequest.getLastStatusUpdateDate(requestid, request['status']).strftime(self.__generaldateformat())
request['requestrawdata']['stateTransition']= FOIRawRequest.getstatesummary(requestid)
request['requestrawdata']['closedate']= self.__getclosedate(request['closedate'])
diff --git a/request-management-api/request_api/services/rawrequestservice.py b/request-management-api/request_api/services/rawrequestservice.py
index 1c0564733..6abaf1ff1 100644
--- a/request-management-api/request_api/services/rawrequestservice.py
+++ b/request-management-api/request_api/services/rawrequestservice.py
@@ -15,8 +15,7 @@
from request_api.exceptions import BusinessException, Error
from request_api.models.default_method_result import DefaultMethodResult
from request_api.models.FOIRawRequestWatchers import FOIRawRequestWatcher
-from request_api.services.foirequest.requestserviceconfigurator import requestserviceconfigurator
-from request_api.utils.enums import StateName
+from request_api.services.foirequest.requestserviceconfigurator import requestserviceconfigurator
import logging
class rawrequestservice:
@@ -92,13 +91,13 @@ def doesrequirepayment(requestdatajson):
return requestdatajson['requiresPayment']
raise BusinessException(Error.DATA_NOT_FOUND)
- def saverawrequestversion(self, _requestdatajson, _requestid, _assigneegroup, _assignee, status, userid, assigneefirstname, assigneemiddlename, assigneelastname, statuslabel, actiontype=None):
+ def saverawrequestversion(self, _requestdatajson, _requestid, _assigneegroup, _assignee, status, userid, assigneefirstname, assigneemiddlename, assigneelastname, actiontype=None):
ispiiredacted = _requestdatajson["ispiiredacted"] if 'ispiiredacted' in _requestdatajson else False
#Get documents
if actiontype == "assignee":
result = FOIRawRequest.saverawrequestassigneeversion(_requestid, _assigneegroup, _assignee, userid, assigneefirstname, assigneemiddlename, assigneelastname)
else:
- result = FOIRawRequest.saverawrequestversion(_requestdatajson, _requestid, _assigneegroup, _assignee, status,ispiiredacted, userid, statuslabel, assigneefirstname, assigneemiddlename, assigneelastname)
+ result = FOIRawRequest.saverawrequestversion(_requestdatajson, _requestid, _assigneegroup, _assignee, status,ispiiredacted, userid, assigneefirstname, assigneemiddlename, assigneelastname)
documentservice().createrawrequestdocumentversion(_requestid)
return result
@@ -126,10 +125,10 @@ def getrawrequestfields(self, requestid, fields):
return rawrequestservicegetter().getrawrequestfieldsforid(requestid, fields)
def getstatus(self, foirequest):
- statuslabel = foirequest["requeststatuslabel"] if "requeststatuslabel" in foirequest else None
- if statuslabel is not None:
+ statusid = foirequest["requeststatusid"] if "requeststatusid" in foirequest else None
+ if statusid is not None:
try:
- return requestserviceconfigurator().getstatusname(statuslabel)
+ return requestserviceconfigurator().getstatusname(statusid)
# if statusid== 4:
# return 'Redirect'
# if statusid == 3:
@@ -138,7 +137,7 @@ def getstatus(self, foirequest):
# return 'Peer Review'
except KeyError:
print("Key Error on requeststatusid, ignore will be intake in Progress")
- return StateName.intakeinprogress.value
+ return 'Intake in Progress'
def getaxisequestids(self):
return rawrequestservicegetter().getaxisequestids()
diff --git a/request-management-api/request_api/services/requestservice.py b/request-management-api/request_api/services/requestservice.py
index 445ec9914..d98d24cb3 100644
--- a/request-management-api/request_api/services/requestservice.py
+++ b/request-management-api/request_api/services/requestservice.py
@@ -62,8 +62,8 @@ def saverequest(
)
def saverequestversion(self, foirequestschema, foirequestid, ministryid, userid):
- nextstate = FOIRequestStatus.getrequeststatusbylabel(
- foirequestschema["requeststatuslabel"]
+ nextstate = FOIRequestStatus.getrequeststatusname(
+ foirequestschema["requeststatusid"]
)
nextstatename = (
nextstate.get("name")
@@ -112,8 +112,8 @@ def postpaymentstatetransition(
foirequest = self.updateduedate(
requestid, ministryrequestid, paymentdate, _foirequest, nextstatename
)
- status = FOIRequestStatus().getrequeststatus(nextstatename)
- foirequest["requeststatuslabel"] = status["statuslabel"]
+ status = FOIRequestStatus().getrequeststatusid(nextstatename)
+ foirequest["requeststatusid"] = status["requeststatusid"]
return requestservicecreate().saverequestversion(
foirequest, requestid, ministryrequestid, "Online Payment"
)
@@ -204,7 +204,7 @@ def copysubjectcode(self, subjectcode, ministries, userid):
def postopeneventtoworkflow(self, id, requestschema, ministries):
pid = workflowservice().syncwfinstance("rawrequest", requestschema["id"])
- workflowservice().postunopenedevent(id, pid, requestschema, StateName.open.value, ministries)
+ workflowservice().postunopenedevent(id, pid, requestschema, "Open", ministries)
def postfeeeventtoworkflow(
self, requestid, ministryrequestid, paymentstatus, nextstatename=None
@@ -215,14 +215,14 @@ def postfeeeventtoworkflow(
)
def posteventtoworkflow(self, id, requestschema, data, usertype):
- requeststatuslabel = (
- requestschema.get("requeststatuslabel")
- if "requeststatuslabel" in requestschema
+ requeststatusid = (
+ requestschema.get("requeststatusid")
+ if "requeststatusid" in requestschema
else None
)
status = (
- requestserviceconfigurator().getstatusname(requeststatuslabel)
- if requeststatuslabel is not None
+ requestserviceconfigurator().getstatusname(requeststatusid)
+ if requeststatusid is not None
else None
)
pid = workflowservice().syncwfinstance("ministryrequest", id)
diff --git a/request-management-api/request_api/services/workflowservice.py b/request-management-api/request_api/services/workflowservice.py
index 1cbcbb1db..f4b6f81a0 100644
--- a/request-management-api/request_api/services/workflowservice.py
+++ b/request-management-api/request_api/services/workflowservice.py
@@ -70,7 +70,7 @@ def postopenedevent(self, id, wfinstanceid, requestsschema, data, newstatus, use
_variables = bpmservice().getinstancevariables(wfinstanceid)
if ministry["status"] == OpenedEvent.callforrecords.value and (("status" not in _variables) or (_variables not in (None, []) and "status" in _variables and _variables["status"]["value"] != OpenedEvent.callforrecords.value)):
messagename = MessageType.iaoopencomplete.value
- elif _variables not in (None, []) and ("status" in _variables and _variables["status"]["value"] == StateName.closed.value):
+ elif _variables not in (None, []) and ("status" in _variables and _variables["status"]["value"] == "Closed"):
return bpmservice().reopenevent(wfinstanceid, metadata, MessageType.iaoreopen.value)
else:
return bpmservice().openedcomplete(wfinstanceid, filenumber, metadata, messagename)
diff --git a/request-management-api/request_api/utils/enums.py b/request-management-api/request_api/utils/enums.py
index becdb9d9e..f21d807ab 100644
--- a/request-management-api/request_api/utils/enums.py
+++ b/request-management-api/request_api/utils/enums.py
@@ -149,20 +149,15 @@ class StateName(Enum):
redirect = "Redirect"
unopened = "Unopened"
intakeinprogress = "Intake in Progress"
+ recordsreview = "Records Review"
+ feeestimate = "Fee Estimate"
consult = "Consult"
ministrysignoff = "Ministry Sign Off"
onhold = "On Hold"
deduplication = "Deduplication"
harmsassessment = "Harms Assessment"
response = "Response"
- feeestimate = "Fee Estimate"
- recordsreview = "Records Review"
- archived = "Archived"
- peerreview = "Peer Review"
- tagging = "Tagging"
- readytoscan = "Ready to Scan"
- appfeeowing = "App Fee Owing"
- section5pending = "Section 5 Pending"
+
class CacheUrls(Enum):
keycloakusers= "/api/foiassignees"
programareas= "/api/foiflow/programareas"
diff --git a/sample.env b/sample.env
index b0f5583d4..e4f921332 100644
--- a/sample.env
+++ b/sample.env
@@ -159,4 +159,3 @@ DISABLE_REDACT_WEBLINK=false
DISABLE_GATHERINGRECORDS_TAB=false
KC_SRC_ACC_TOKEN_EXPIRY=60
-MUTE_NOTIFICATION={"MCF": {"request_types": ["Personal"], "state_exceptions": ["Call For Records", "Ministry Sign Off"], "type_exceptions":["Reply User Comments", "Tagged User Comments"]}}
\ No newline at end of file