Sort candidates by lastname

DublinInquirer · May 24, 2024 · 4732fdd · 4732fdd
1 parent 22e2f5a
commit 4732fdd
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 48 deletions.
diff --git a/src/pages/areas/[localAuthority]/[area].astro b/src/pages/areas/[localAuthority]/[area].astro
@@ -77,27 +77,38 @@ export async function getStaticPaths() {
         });
         return {
           text: getStringFieldValue(questionRecord, "Text"),
-          answers: answersForQuestion.map((answerRecord) => {
-            const candidateFullName = getLookupFieldValue(
-              answerRecord,
-              "Candidate full name",
-            );
-            const candidatePartyName = getLookupFieldValue(
-              answerRecord,
-              "Candidate party name",
-            );
-            const candidateProfilePictureUrl = getOptionalLookupFieldValue(
-              answerRecord,
-              "Candidate profile picture",
-            );
-            const answer = getOptionalStringFieldValue(answerRecord, "Text");
-            return {
-              candidateFullName,
-              candidatePartyName,
-              candidateProfilePictureUrl,
-              answer,
-            };
-          }),
+          answers: answersForQuestion
+            .map((answerRecord) => {
+              const candidateId = getLookupFieldValue(
+                answerRecord,
+                "Candidate",
+              );
+              const candidateRecord = candidateRecords.find(
+                ({ id }) => id === candidateId,
+              );
+              const answer = getOptionalStringFieldValue(answerRecord, "Text");
+              return {
+                candidateRecord,
+                answer,
+              };
+            })
+            .sort((a, b) => {
+              if (
+                getStringFieldValue(a.candidateRecord!, "Lastname") <
+                getStringFieldValue(b.candidateRecord!, "Lastname")
+              ) {
+                return -1;
+              }
+
+              if (
+                getStringFieldValue(a.candidateRecord!, "Lastname") >
+                getStringFieldValue(b.candidateRecord!, "Lastname")
+              ) {
+                return 1;
+              }
+
+              return 0;
+            }),
         };
       });
 
@@ -146,33 +157,44 @@ const {
         questions.map((question) => (
           <>
             <QuestionText>{question.text}</QuestionText>
-            {question.answers.map((answer) => (
-              <>
-                <div class="flex">
-                  <div class="-ml-1 mr-2">
-                    <CandidateAvatar
-                      candidateFullName={answer.candidateFullName}
-                      profilePictureUrl={answer.candidateProfilePictureUrl}
-                      showName={false}
-                    />
-                  </div>
-                  <div class="self-center">
-                    <h3>
-                      <Link
-                        to={`candidates/${lodash.kebabCase(answer.candidateFullName)}`}
-                      >
-                        {answer.candidateFullName}
-                      </Link>
-                    </h3>
-                    <h3>{answer.candidatePartyName}</h3>
+            {question.answers.map((answer) => {
+              const candidateFullName = answer.candidateRecord
+                ? getStringFieldValue(answer.candidateRecord, "Full name")
+                : "";
+              const candidateProfilePictureUrl = answer.candidateRecord
+                ? getStringFieldValue(answer.candidateRecord, "Profile picture")
+                : undefined;
+              const candidatePartyname = answer.candidateRecord
+                ? getLookupFieldValue(answer.candidateRecord, "Party name")
+                : "";
+              return (
+                <>
+                  <div class="flex">
+                    <div class="-ml-1 mr-2">
+                      <CandidateAvatar
+                        candidateFullName={candidateFullName}
+                        profilePictureUrl={candidateProfilePictureUrl}
+                        showName={false}
+                      />
+                    </div>
+                    <div class="self-center">
+                      <h3>
+                        <Link
+                          to={`candidates/${lodash.kebabCase(candidateFullName)}`}
+                        >
+                          {candidateFullName}
+                        </Link>
+                      </h3>
+                      <h3>{candidatePartyname}</h3>
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="pb-4 markdown"
-                  set:html={marked.parse(answer.answer ?? "")}
-                />
-              </>
-            ))}
+                  <div
+                    class="pb-4 markdown"
+                    set:html={marked.parse(answer.answer ?? "")}
+                  />
+                </>
+              );
+            })}
           </>
         ))
       ) : (

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -40,7 +40,22 @@ const candidatesByArea = electoralAreas.reduce<
     )
     .filter((candidateRecord): candidateRecord is AirtableRecord<FieldSet> =>
       Boolean(candidateRecord),
-    );
+    )
+    .sort((a, b) => {
+      if (
+        getStringFieldValue(a, "Lastname") < getStringFieldValue(b, "Lastname")
+      ) {
+        return -1;
+      }
+
+      if (
+        getStringFieldValue(a, "Lastname") > getStringFieldValue(b, "Lastname")
+      ) {
+        return 1;
+      }
+
+      return 0;
+    });
   const areaName = getStringFieldValue(areaRecord, "Name");
   return {
     ...acc,