Activist map place states

src/app/beta/orgs/[orgId]/canvassassignments/[canvassAssId]/sessions/route.ts

@@ -56,7 +56,20 @@ export async function GET(request: NextRequest, { params }: RouteMeta) {
             },
             assignee: person,
             assignment: {
+              campaign: {
+                id: model.campId,
+              },
               id: model._id.toString(),
+              metrics: model.metrics.map((m) => ({
+                definesDone: m.definesDone,
+                description: m.description,
+                id: m._id,
+                kind: m.kind,
+                question: m.question,
+              })),
+              organization: {
+                id: model.orgId,
+              },
               title: model.title,
             },
           });

src/app/beta/orgs/[orgId]/canvassassignments/[canvassAssId]/stats/route.ts

@@ -68,7 +68,20 @@ export async function GET(request: NextRequest, { params }: RouteMeta) {
             },
             assignee: person,
             assignment: {
+              campaign: {
+                id: assignmentModel.campId,
+              },
               id: assignmentModel._id.toString(),
+              metrics: assignmentModel.metrics.map((m) => ({
+                definesDone: m.definesDone,
+                description: m.description,
+                id: m._id,
+                kind: m.kind,
+                question: m.question,
+              })),
+              organization: {
+                id: assignmentModel.orgId,
+              },
               title: assignmentModel.title,
             },
           });

src/app/beta/users/me/canvassassignments/route.ts

@@ -4,9 +4,10 @@ import { NextRequest, NextResponse } from 'next/server';
 
 import BackendApiClient from 'core/api/client/BackendApiClient';
 import { CanvassAssignmentModel } from 'features/canvassAssignments/models';
-import { ZetkinCanvassSession } from 'features/canvassAssignments/types';
-import { ZetkinMembership, ZetkinPerson } from 'utils/types/zetkin';
+import { AssignmentWithAreas } from 'features/canvassAssignments/types';
+import { ZetkinMembership } from 'utils/types/zetkin';
 import { AreaModel } from 'features/areas/models';
+import { ZetkinArea } from 'features/areas/types';
 
 export async function GET(request: NextRequest) {
   const headers: IncomingHttpHeaders = {};
@@ -18,21 +19,67 @@ export async function GET(request: NextRequest) {
     `/api/users/me/memberships`
   );
 
-  const sessions: ZetkinCanvassSession[] = [];
+  const assignmentsWithAreas: AssignmentWithAreas[] = [];
 
+  //för varje organisation personen är medlem i
   for await (const membership of memberships) {
     const { id: personId } = membership.profile;
 
-    const person = await apiClient.get<ZetkinPerson>(
-      `/api/orgs/${membership.organization.id}/people/${personId}`
-    );
-
+    //plocka ut alla assignments som personen har en tilldelning i
     const assignmentModels = await CanvassAssignmentModel.find({
       orgId: membership.organization.id,
       'sessions.personId': { $eq: personId },
     });
 
+    //för varje uppdrag personen har en tilldelning i
     for await (const assignment of assignmentModels) {
+      const areas: ZetkinArea[] = [];
+
+      //för varje session i det uppdraget
+      for await (const session of assignment.sessions) {
+        //om vi är på en session som "tillhör" personen
+        if (session.personId == personId) {
+          //lägg till arean i listan över areas
+          const area = await AreaModel.findOne({
+            _id: session.areaId,
+          });
+
+          if (area) {
+            areas.push({
+              description: area.description,
+              id: area._id.toString(),
+              organization: {
+                id: area.orgId,
+              },
+              points: area.points,
+              tags: [], // TODO: is this necessary here?
+              title: area.title,
+            });
+          }
+        }
+      }
+
+      assignmentsWithAreas.push({
+        areas: areas,
+        campaign: {
+          id: assignment.campId,
+        },
+        id: assignment._id.toString(),
+        metrics: assignment.metrics.map((m) => ({
+          definesDone: m.definesDone,
+          description: m.description,
+          id: m._id.toString(),
+          kind: m.kind,
+          question: m.question,
+        })),
+        organization: {
+          id: assignment.orgId,
+        },
+        title: assignment.title,
+      });
+    }
+
+    /* for await (const assignment of assignmentModels) {
       for await (const sessionData of assignment.sessions) {
         if (sessionData.personId == personId) {
           const orgId = assignment.orgId;
@@ -42,7 +89,7 @@ export async function GET(request: NextRequest) {
           });
 
           if (area) {
-            sessions.push({
+            assignmentsWithAreas.push({
               area: {
                 description: area.description,
                 id: area._id.toString(),
@@ -55,17 +102,30 @@ export async function GET(request: NextRequest) {
               },
               assignee: person,
               assignment: {
+                campaign: {
+                  id: assignment.campId,
+                },
                 id: assignment._id.toString(),
+                metrics: assignment.metrics.map((m) => ({
+                  definesDone: m.definesDone,
+                  description: m.description,
+                  id: m._id.toString(),
+                  kind: m.kind,
+                  question: m.question,
+                })),
+                organization: {
+                  id: assignment.orgId,
+                },
                 title: assignment.title,
               },
             });
           }
         }
       }
-    }
+    } */
   }
 
   return NextResponse.json({
-    data: sessions,
+    data: assignmentsWithAreas,
   });
 }

src/app/my/canvassassignments/[canvassAssId]/page.tsx

@@ -0,0 +1,14 @@
+import 'leaflet/dist/leaflet.css';
+import MyCanvassAssignmentPage from 'features/canvassAssignments/components/MyCanvassAssignmentPage';
+
+interface PageProps {
+  params: {
+    canvassAssId: string;
+  };
+}
+
+export default function Page({ params }: PageProps) {
+  const { canvassAssId } = params;
+
+  return <MyCanvassAssignmentPage canvassAssId={canvassAssId} />;
+}