Return session unformatted

Author: DiamondJoseph

policy/diamond/policy/session/session.rego

@@ -59,8 +59,5 @@ write_to_beamline_visit if {
 user_sessions contains user_session if {
 	some session in data.diamond.data.sessions
 	access_session(token.claims.fedid, session.proposal_number, session.visit_number)
-	user_session := sprintf(
-		`{"proposal": %d, "visit": %d, "beamline": "%s"}`,
-		[session.proposal_number, session.visit_number, session.beamline],
-	)
+	user_session := sprintf("%s", [session])
 }

policy/diamond/policy/session/session_test.rego

@@ -212,32 +212,32 @@ test_user_session_tags if {
 	session.user_sessions == set() with data.diamond.data as diamond_data
 		with data.diamond.policy.token.claims as {"fedid": "oscar"}
 	session.user_sessions == {
-		`{"proposal": 1, "visit": 2, "beamline": "b07"}`,
-		`{"proposal": 1, "visit": 1, "beamline": "i03"}`,
+		"{\"beamline\": \"b07\", \"proposal_number\": 1, \"visit_number\": 2}",
+		"{\"beamline\": \"i03\", \"proposal_number\": 1, \"visit_number\": 1}",
 	} with data.diamond.data as diamond_data
 		with data.diamond.policy.token.claims as {"fedid": "alice"}
 	session.user_sessions == {
-		`{"proposal": 1, "visit": 2, "beamline": "b07"}`,
-		`{"proposal": 1, "visit": 1, "beamline": "i03"}`,
-		`{"proposal": 2, "visit": 1, "beamline": "b07"}`,
-		`{"proposal": 2, "visit": 2, "beamline": "b07"}`,
+		"{\"beamline\": \"b07\", \"proposal_number\": 1, \"visit_number\": 2}",
+		"{\"beamline\": \"i03\", \"proposal_number\": 1, \"visit_number\": 1}",
+		"{\"beamline\": \"b07\", \"proposal_number\": 2, \"visit_number\": 1}",
+		"{\"beamline\": \"b07\", \"proposal_number\": 2, \"visit_number\": 2}",
 	} with data.diamond.data as diamond_data
 		with data.diamond.policy.token.claims as {"fedid": "bob"}
 	session.user_sessions == {
-		`{"proposal": 1, "visit": 2, "beamline": "b07"}`,
-		`{"proposal": 1, "visit": 1, "beamline": "i03"}`,
-		`{"proposal": 2, "visit": 1, "beamline": "b07"}`,
-		`{"proposal": 2, "visit": 2, "beamline": "b07"}`,
+		"{\"beamline\": \"b07\", \"proposal_number\": 1, \"visit_number\": 2}",
+		"{\"beamline\": \"i03\", \"proposal_number\": 1, \"visit_number\": 1}",
+		"{\"beamline\": \"b07\", \"proposal_number\": 2, \"visit_number\": 1}",
+		"{\"beamline\": \"b07\", \"proposal_number\": 2, \"visit_number\": 2}",
 	} with data.diamond.data as diamond_data
 		with data.diamond.policy.token.claims as {"fedid": "carol"}
 	session.user_sessions == {
-		`{"proposal": 2, "visit": 1, "beamline": "b07"}`,
-		`{"proposal": 2, "visit": 2, "beamline": "b07"}`,
+		"{\"beamline\": \"b07\", \"proposal_number\": 2, \"visit_number\": 1}",
+		"{\"beamline\": \"b07\", \"proposal_number\": 2, \"visit_number\": 2}",
 	} with data.diamond.data as diamond_data
 		with data.diamond.policy.token.claims as {"fedid": "desmond"}
 	session.user_sessions == {
-		`{"proposal": 2, "visit": 1, "beamline": "b07"}`,
-		`{"proposal": 2, "visit": 2, "beamline": "b07"}`,
+		"{\"beamline\": \"b07\", \"proposal_number\": 2, \"visit_number\": 1}",
+		"{\"beamline\": \"b07\", \"proposal_number\": 2, \"visit_number\": 2}",
 	} with data.diamond.data as diamond_data
 		with data.diamond.policy.token.claims as {"fedid": "edna"}
 }