From c9c1464ee02bbb9ebd7ff311d618b445ce3cd666 Mon Sep 17 00:00:00 2001
From: Matt Coley <mcoley@hubspot.com>
Date: Fri, 10 Aug 2018 15:12:50 -0400
Subject: [PATCH 1/2] Include raw object in groups.

---
 .../jinjava/lib/filter/GroupByFilter.java     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java
index 5c13ebdee..cb75378cf 100644
--- a/src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java
+++ b/src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java
@@ -1,7 +1,9 @@
 package com.hubspot.jinjava.lib.filter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import com.google.common.collect.LinkedListMultimap;
@@ -50,18 +52,24 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
 
     ForLoop loop = ObjectIterator.getLoop(var);
     Multimap<String, Object> groupBuckets = LinkedListMultimap.create();
+    Map<String, Object> groupMapRaw = new HashMap<>();
 
     while (loop.hasNext()) {
       Object val = loop.next();
 
-      String grouper = Objects.toString(interpreter.resolveProperty(val, attr));
+      Object resolvedProperty = interpreter.resolveProperty(val, attr);
+      String grouper = Objects.toString(resolvedProperty);
       groupBuckets.put(grouper, val);
+
+      if (!groupMapRaw.containsKey(grouper)) {
+        groupMapRaw.put(grouper, resolvedProperty);
+      }
     }
 
     List<Group> groups = new ArrayList<>();
     for (String grouper : groupBuckets.keySet()) {
       List<Object> list = Lists.newArrayList(groupBuckets.get(grouper));
-      groups.add(new Group(grouper, list));
+      groups.add(new Group(grouper, groupMapRaw.get(grouper), list));
     }
 
     return groups;
@@ -69,10 +77,12 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
 
   public static class Group {
     private final String grouper;
+    private final Object grouperObject
     private final List<Object> list;
 
-    public Group(String grouper, List<Object> list) {
+    public Group(String grouper, Object grouperObject, List<Object> list) {
       this.grouper = grouper;
+      this.grouperObject = grouperObject;
       this.list = list;
     }
 
@@ -80,6 +90,10 @@ public String getGrouper() {
       return grouper;
     }
 
+    public Object getGrouperObject() {
+      return grouperObject;
+    }
+
     public List<Object> getList() {
       return list;
     }

From 701193465e86b5c83f347678ac38baa193d53f68 Mon Sep 17 00:00:00 2001
From: Matt Coley <mcoley@hubspot.com>
Date: Fri, 10 Aug 2018 15:13:06 -0400
Subject: [PATCH 2/2] Include raw object in groups.

---
 src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java
index cb75378cf..8418c0815 100644
--- a/src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java
+++ b/src/main/java/com/hubspot/jinjava/lib/filter/GroupByFilter.java
@@ -77,7 +77,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
 
   public static class Group {
     private final String grouper;
-    private final Object grouperObject
+    private final Object grouperObject;
     private final List<Object> list;
 
     public Group(String grouper, Object grouperObject, List<Object> list) {