From f95bd9ecee99b3c047246515d64c17e641cc2b0c Mon Sep 17 00:00:00 2001
From: kououken <kououken@gmail.com>
Date: Thu, 14 Feb 2019 14:19:15 -0800
Subject: [PATCH] Implemented rule_violations in json for GET report.

---
 back/backend/policy.py |  20 ++++++++++----------
 back/backend/views.py  |  26 +++++++++++++++++++++++++-
 back/db.sqlite3        | Bin 105472 -> 105472 bytes
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/back/backend/policy.py b/back/backend/policy.py
index 381405e..7af3281 100644
--- a/back/backend/policy.py
+++ b/back/backend/policy.py
@@ -45,7 +45,7 @@ general_section = Section(
 
 general_section.add_rule(
     title="Destination city check",
-    rule=lambda report, section: section.field.destination == "Timbuktu",
+    rule=lambda report, fields: fields['destination'] == "Timbuktu",
     rule_break_text="What did the cowboy say about Tim, his wild horse?"
 )
 
@@ -68,7 +68,7 @@ flight_section = Section(
 
 flight_section.add_rule(
     title="Airline fare pre-approval check",
-    rule=lambda report, section: section.fields.fare < 500, 
+    rule=lambda report, fields: fields['fare'] < 500, 
     rule_break_text="Fares cannot be more than $500"
 )
 
@@ -88,14 +88,14 @@ lodging_section = Section(
     }
 )
 
-def nightly_rate_check(report, section):
-    checkin_date = date(section.fields.checkin_date)
-    checkout_date = date(section.fields.checkout_date)
+def nightly_rate_check(report, fields):
+    checkin_date = date(fields['checkin_date'])
+    checkout_date = date(fields['checkout_date'])
     duration = checkout_date - checkin_date
-    return section.fields.cost <= duration * section.fields.rate
+    return fields['cost'] <= duration * fields['rate']
 
 lodging_section.add_rule(
-    title="",
+    title="Average nightly rate",
     rule=nightly_rate_check,
     rule_break_text="The average nightly rate cannot be more than the USGSA rate."
 )
@@ -108,14 +108,14 @@ transport_section = Section(
     title="Local Transportation",
     html_description="<p>How much did you spend on local transportation, in total?</p>",
     fields={
-        "duration": {"label": "How many days was your trip?", "field_type": "decimal"},
+        "duration": {"label": "How many days was your trip?", "field_type": "integer"},
         "cost": {"label": "Total cost", "field_type": "decimal"}
     }
 )
 
 transport_section.add_rule(
     title="Total cost check",
-    rule=lambda report, section: section.fields.cost <= section.fields.duration * 10,
+    rule=lambda report, fields: fields['cost'] <= fields['duration'] * 10,
     rule_break_text="Local transportation costs must be less than $10 per day, on average."
 )
 
@@ -136,7 +136,7 @@ per_diem_section = Section(
 
 per_diem_section.add_rule(
     title="Per Diem Cost Check",
-    rule=lambda report, section: section.fields.cost <= section.fields.duration * section.fields.rate,
+    rule=lambda report, fields: fields['cost'] <= fields['duration'] * fields['rate'],
     rule_break_text="The average cost per day for per diem expenses cannot be more than the rate specified by the USGSA."
 )
 
diff --git a/back/backend/views.py b/back/backend/views.py
index 04fc6dd..4445435 100644
--- a/back/backend/views.py
+++ b/back/backend/views.py
@@ -28,15 +28,31 @@ def get_sections(r_id):
     # create a dict of arrays for section
     section_set = {"sections": []}
     queryset = Section.objects.filter(report_id=r_id)
-    for i in queryset:
+    for index in range(len(queryset)):
+        i = queryset[index]
         data = {
             "id": i.id,
             "completed": i.completed,
             "title": i.title,
             "html_description": i.html_description,
+            "rule_violations": [],
         }
         # append the fields for corresponding section
         data.update(get_fields(i.id))
+        # process rules from the policy file if the section is completed
+        if i.completed:
+            rules = pol.sections[index].rules
+            for rule in rules:
+                try:
+                    named_fields = generate_named_fields_for_section(data['fields'])
+                    if not rule['rule'](data, named_fields):
+                        info = {
+                            "label": rule['title'],
+                            "rule_break_text": rule['rule_break_text'],
+                        }
+                        data['rule_violations'].append(info)
+                except Exception as e:
+                    print('Rule "{}" encountered an error. {}'.format(rule['title'], e))
         # append section to the array
         section_set["sections"].append(data.copy())
 
@@ -67,6 +83,14 @@ def get_fields(s_id):
     return field_set
 
 
+def generate_named_fields_for_section(fields):
+    result = {}
+    for field in fields:
+        key = field['field_name']
+        value = field['value']
+        result[key] = value
+    return result
+
 # API Endpoints
 @api_view(['POST'])
 def report(request):
diff --git a/back/db.sqlite3 b/back/db.sqlite3
index df940de7c8c054f4ee96162876249a47ea35ec8b..7617b83a92b94fe463a87a79d04c015cf53b7ac3 100644
GIT binary patch
delta 3248
zcmbW34Qx}_6@cHp*ACAi4hkeGO$ap*LIUy2`+t5eKXHijA14MwVnayW#3XUzI5<v8
z+(Af0L1R-3daSRjI;hreV*)xAGlHh7)7Vr^s;0G5M}@Rjtdj<sI;2WfrESu*b00yB
zVl-)fx}WX)bIv{I+;iSNc0KRd^}N&N&UuDmhL>9YnQ9HqzcXN4j)K|P@<dgU>=Jpe
ztb1jF6E%;jXhw}BWQ)bihz^NfUiAtdPSsV9CS?C0iH&Q5xSSz>A)k^@$VcP|eg|K~
zJFt!=?8cjn(iz@{PvUu_X{K^DegRM8Bp$_sxDWT>Aa2KgybhOV<1^nub9RCd8?@L>
znb&18V6oF;hsAbEw#{Oz#TJXr7Mm>kEjC)*X|chgk8)YP#T{19c8lBW+1E00I|<@(
zW7)AIRrr1UEBr2A#8>cTd;!0S&*AUmv-o9v3crYtfg#W1LwGzZus2Y@jW|${qMM?N
zB0$ke(LvEp(MHiq(L&Ko(L~{=Xr$Ol(Lmv&sHfPG{a`^yEA8YC#Ec1(f03`rm*fj_
zCtG^_BVvcXgU#75PL{BJq?aiq)ePB1I!F_#Cte~Gj#QIBk<ZD8<Q}<6{z+{A--FK@
z1E<$yGp9epbL1{FBRmIse<(zOuL}dfSNMM5Y5oB4RNX#ulL^#CfGu@lU<20++{*O;
zRrg*X@7@F4><$4d-MfKnYj*)x*9L(rYrBC3wOzoxE!GLx+(+Z2B<wZtr6%bgdCck>
zCtopnFhKh!Kz-i*QFZdlS!7!dgNWQ?!2EmJf>-a7N|;fAOXxgY?8F>nM^_ni6@86+
z@t0&b(@h^^_3Iw<!UVd62NdJOAM~4j3DnbCFFF{Ob!?2Xs5v$fOGU?BtrG{6TPL@-
zO;4p=QP<RDGVMB;Ou2@ahDTvIm58QClM`F(CbyTWk|n|T{W+d1g)MAmS$3oIQE{|?
zCFo%*7BqyqV<}hTe5q`HcLaTpEgewu=@!gH97PIB=Qpd?---p@>`x*cIgNpH2eGa6
z${RMD%T7LLAo6#?^sgZDKmO*Et$gbZ(gNBliv^%s%mew7I^gCKj`o+hsZ&cui;_jz
zqGC~Xk`v(EMobz>W47QzhS*?L#yEA+Lw{_~zJIZe&Bs?s3%*4b@xQZc*=}sauLah{
zv{6N#mB&U#wV{llspH9*JUOk!6Up?*prntl$lkiP&CZe+@g@8>d?{PB<|S-gdau3I
z^RNVIf+CB;inYXtj01lx%WnGRr^Wf0;TSZ-aQKEH*j!oe<5L);w(Ku%HqBQ$@hzs1
z*-OZ8$jc-|Y>>d`n7vqLUP6CI@1lORn)v`$i4E##A+yd=&a%s#5Sx;9p=26Dy)!wL
z9*PZ)CZgl@-`bSFZSu`e<U!~Yc|mvcqMO&A9V=us1nZFb_EEH<tX)n;)3Jx+?URMf
z9#rmNvH5liiEEkPs*eirCkq+B1130}PGknBP}N$j4o!m;I6x2O?3*ZL##p*P^B*a+
zbzS`&jUq(wQFV2RB{PuuyF=)yvLWRg+QvZ}6@$#c6skeQJaZJSGH)M6-YRg_mf=FC
zgj$2|d!Z?sijgG;;Cs?R_-oeBLGc33Tg-3IAr3nn=AXl8lX-g%xlCaaU3w*rY(KH>
zN4C}ZjLwiBkv4n>UI7K@RpeoAFb1Qa@m08cgAT^G>Zw8GKo5)*tapt7?;3>@R9#ki
zf!76|=Xm4%$+EejXgb=zw3qdLM~?Kd*xgNqtSZVS1lEbNCTNlXACBJ#)6-q~jIYQ&
zZ-0Eg=#?c-_2?c+QuzN)^y&?K&Au1b5002`&7x<_u31!G6#%V8Tl#WI5mZhQWLXy!
z!8|>S^y*Y6)mf8UC$DpgDCizp5zUHO)UkcIgNojkL$u&kR8H0<4JJz+$w4@rp;UAN
zs!u9y9hK@0l6h_xZILG1sm6`DGz##N=M+`Y6itz>Dl-~ORBw>!!j06nvf5}Hb!o}r
z$Bh%blE(46;_)Z~FNRXnG4uQ^s`S;m)?1-@E}0x(ic7ea3VAw5a0RcRaS#<*^9a18
zDG*#My1pFI4Yxd53a@Y;NtGl`;1wC9$TB@6t8z%WHiVGN3FnnSnZVc3IK!Rs6^|@5
zudsI>ukejUpPycMmj1T;{#S+SY8;yh^z6w5di+YHIV=S-O^MEse<s`$J{$=7q^?lw
zY&a9lL_%$&;ZP(IX!d7}+m}m>^B+4DKi`=Mijii&5Q&F{&O|F8Y4l|RVt6K;8CD|k
z*2AzQ9*#%io$;_7j)x`qHqQKPmBC)_duFC}g5UNaQN+h8;v#n(wIOz)xxg~YIJD?m
z{Okm(a+WP;4lv}Wa6PENf5mh7Y4mF}f(n`I%mG7S>)pN0)W^Bf5H5rsPWE`f%>u7!
z%2J@V=5TSSi3(YfBiy`KQaDAH6&(`UBheVu=Md2AfATIw0WO}rsKa^D#Rt2{d0ZNw
zbX<5ZFL9ctNg|X2UV+M>ScfjBEjyoJ3-9rYBFBR>B&(!QTXy8IWvGD)C^_<20`Z!a
z!m21~GVCLeoVcGrJ0B#_=tMd;97`?bP|RofB&Qrn=5$3;RaFo~krqfR6XzZXdbCI?
z^&qII#`*Y$RIjXZ;8&UVh`jG`Y$}<Expu{9Nm)ju9dy~oCoR)-Rg<82?Vg^5+lsY_
yz$$Z>iGE(=fOOjrjb0UF(1xJVOX2{u2(&(E`=ITIm;4EA!r^5X-+K);p#K2mq3t*T

delta 1104
zcmYMyUuYCZ90%~7`R*m#T!K;dq}XVWklI{KHoLcX<~(XJG`VQv<<Ir}b1{jRdWp%k
z5iOV;N2N(nTP#ZI22P}uJQT4cKA36mLLX9)Qi{@6ZH<*wp)C|C!BQwbR9ZSSwe;cl
zVP|If&CKsN6N^O?i$&AVl?^G1a`<T!y;t2phOQ=6H)&*p?$OO_Ew5>Z&0sia8g?jP
z`z^<3TTJ&~A!5nT=fi=J5!z-3LpHl@`<vG_(z6PF#(mtyEu5fN>73)um`*%X#ildw
z5@&~Yft}5cyU<8)IK>kun5DH+c4KNADOa(|526g=2_EBjtTO$}@4;5z_Go>4x(2F(
zKk)}1;URv)4_L-cT*v2F!Xg$hk4u=vMa<wF-oX^!#2AhujTHK^A2IAk1UnE$00yd2
zi3+SoIZB|?87Dbi!Lrj2=vyujV!bLIkS2xZL219R{(!Vcnh+ZMrTc_+d!>7%ap^0<
z+L*Lk+9mB2Zs`!#^htYNJ~4>O!ET|iUD_tyCEY2kZe5rms+$)DcqEI$N-sP_l~|)5
zsqW&d1W&k1@4p45Ci$9FI?uiz;!QY8lV<Mb2sx<glfL@g+!1m)_tgkFgh@|bZeWzm
zXr8UL&nTLv6~0N6O0tIMNxm$SZRZ>?7iLw}y9Ss3Yl&#Y|805N5?1x$EaZuGOPoqK
zg`Rq;A+3|vO1B908mUiOUB)*9nklZ~G%LNFg&Ou0E6$m@kouBdtgtWU+O!hvr1wyu
zAJf0tCasG)>3oNCec4Og>|TDmOQXNy6rHE@Y;DCk>dY^-ueZH^OFUgWV3@XLSzFzk
z&_ta6I~&-GpWW9>pco3tC<eXeSgMy9-<_dUDP^B7M<&ZfT`3-Om87U^p*%%?K?xuB
z4RU(+=6i{%77?<dkQM&8Z;`@EAMw$Gnj(KaU&hl?o}K17hR9xc{S;{<{DG6k=t)<T
zl^ITr1^n6Z!G>d*;MnohYYm5n?V-_B@Qva0@sT6Z=EIr9Xw*)`W9jI=$Vg9oPo^`z
z%b&=$_@mjD@y^!nU}tmG>PSb1`FFOXwZ%+0KVI43{B}oo+HZF|AAH;8++A9yO|_P~
zq9->tImZg#!h_RfbD2gFQ}7XDyiyV5Vmb23MseK)j{zRyekmUPJYEpN|2t0$`HTDl
F{{X1X3grL*