From 8828450d71abbd4bebc81024ddcd3a061948d88e Mon Sep 17 00:00:00 2001
From: jo-elimu <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 1 Nov 2023 17:17:37 +0700
Subject: [PATCH] refactor: Upgrade to model-2.0.62 - letter-sound peer reviews

ref #1627
---
 ...rSoundPeerReviewEventCreateController.java | 10 ++---
 .../letter-sound/peer-reviews/pending.jsp     | 40 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
index de15cc3ae..1450125ab 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
@@ -75,7 +75,7 @@ public String handleSubmit(
             );
         }
 
-        // Update the letterSoundCorrespondence's peer review status
+        // Update the peer review status
         int approvedCount = 0;
         int notApprovedCount = 0;
         for (LetterSoundCorrespondencePeerReviewEvent peerReviewEvent : letterSoundPeerReviewEventDao.readAll(letterSoundContributionEvent)) {
@@ -87,13 +87,13 @@ public String handleSubmit(
         }
         logger.info("approvedCount: " + approvedCount);
         logger.info("notApprovedCount: " + notApprovedCount);
-        LetterSoundCorrespondence letterSoundCorrespondence = letterSoundContributionEvent.getLetterSoundCorrespondence();
+        LetterSoundCorrespondence letterSound = letterSoundContributionEvent.getLetterSoundCorrespondence();
         if (approvedCount >= notApprovedCount) {
-            letterSoundCorrespondence.setPeerReviewStatus(PeerReviewStatus.APPROVED);
+            letterSound.setPeerReviewStatus(PeerReviewStatus.APPROVED);
         } else {
-            letterSoundCorrespondence.setPeerReviewStatus(PeerReviewStatus.NOT_APPROVED);
+            letterSound.setPeerReviewStatus(PeerReviewStatus.NOT_APPROVED);
         }
-        letterSoundDao.update(letterSoundCorrespondence);
+        letterSoundDao.update(letterSound);
 
         return "redirect:/content/letter-sound/edit/" + letterSoundContributionEvent.getLetterSoundCorrespondence().getId() + "#contribution-events";
     }
diff --git a/src/main/webapp/WEB-INF/jsp/content/letter-sound/peer-reviews/pending.jsp b/src/main/webapp/WEB-INF/jsp/content/letter-sound/peer-reviews/pending.jsp
index 2a6d85191..3d9372c17 100644
--- a/src/main/webapp/WEB-INF/jsp/content/letter-sound/peer-reviews/pending.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/letter-sound/peer-reviews/pending.jsp
@@ -1,15 +1,15 @@
 <content:title>
-    <fmt:message key="pending.review" /> (${fn:length(letterSoundCorrespondenceContributionEventsPendingPeerReview)})
+    <fmt:message key="pending.review" /> (${fn:length(letterSoundContributionEventsPendingPeerReview)})
 </content:title>
 
-<content:section cssId="letterSoundCorrespondencePeerReviewsPendingPage">
+<content:section cssId="letterSoundPeerReviewsPendingPage">
     <div class="section row">
-        <c:if test="${empty letterSoundCorrespondenceContributionEventsPendingPeerReview}">
+        <c:if test="${empty letterSoundContributionEventsPendingPeerReview}">
             <p>
                 You have no pending peer-reviews 🎉
             </p>
         </c:if>
-        <c:if test="${not empty letterSoundCorrespondenceContributionEventsPendingPeerReview}">
+        <c:if test="${not empty letterSoundContributionEventsPendingPeerReview}">
             <p>
                 Press "Peer-review" to peer-review a letter-sound correspondence:
             </p>
@@ -24,51 +24,51 @@
                     <th><fmt:message key="peer.review" /></th>
                 </thead>
                 <tbody>
-                    <c:forEach var="letterSoundCorrespondenceContributionEvent" items="${letterSoundCorrespondenceContributionEventsPendingPeerReview}">
-                        <c:set var="letterSoundCorrespondence" value="${letterSoundCorrespondenceContributionEvent.letterSoundCorrespondence}" />
+                    <c:forEach var="letterSoundContributionEvent" items="${letterSoundContributionEventsPendingPeerReview}">
+                        <c:set var="letterSound" value="${letterSoundContributionEvent.letterSound}" />
                         <tr>
                             <td style="font-size: 2em;">
-                                " <c:forEach var="letter" items="${letterSoundCorrespondence.letters}"><a href="<spring:url value='/content/letter/edit/${letter.id}' />">${letter.text} </a> </c:forEach> "
+                                " <c:forEach var="letter" items="${letterSound.letters}"><a href="<spring:url value='/content/letter/edit/${letter.id}' />">${letter.text} </a> </c:forEach> "
                             </td>
                             <td style="font-size: 2em;">
                                 ➞
                             </td>
                             <td style="font-size: 2em;">
-                                / <c:forEach var="sound" items="${letterSoundCorrespondence.sounds}"><a href="<spring:url value='/content/sound/edit/${sound.id}' />">${sound.valueIpa}</a> </c:forEach> /
+                                / <c:forEach var="sound" items="${letterSound.sounds}"><a href="<spring:url value='/content/sound/edit/${sound.id}' />">${sound.valueIpa}</a> </c:forEach> /
                             </td>
                             <td>
-                                <a href="<spring:url value='/content/contributor/${letterSoundCorrespondenceContributionEvent.contributor.id}' />">
+                                <a href="<spring:url value='/content/contributor/${letterSoundContributionEvent.contributor.id}' />">
                                     <div class="chip">
                                         <c:choose>
-                                            <c:when test="${not empty letterSoundCorrespondenceContributionEvent.contributor.imageUrl}">
-                                                <img src="${letterSoundCorrespondenceContributionEvent.contributor.imageUrl}" />
+                                            <c:when test="${not empty letterSoundContributionEvent.contributor.imageUrl}">
+                                                <img src="${letterSoundContributionEvent.contributor.imageUrl}" />
                                             </c:when>
-                                            <c:when test="${not empty letterSoundCorrespondenceContributionEvent.contributor.providerIdWeb3}">
-                                                <img src="http://62.75.236.14:3000/identicon/<c:out value="${letterSoundCorrespondenceContributionEvent.contributor.providerIdWeb3}" />" />
+                                            <c:when test="${not empty letterSoundContributionEvent.contributor.providerIdWeb3}">
+                                                <img src="http://62.75.236.14:3000/identicon/<c:out value="${letterSoundContributionEvent.contributor.providerIdWeb3}" />" />
                                             </c:when>
                                             <c:otherwise>
                                                 <img src="<spring:url value='/static/img/placeholder.png' />" />
                                             </c:otherwise>
                                         </c:choose>
                                         <c:choose>
-                                            <c:when test="${not empty letterSoundCorrespondenceContributionEvent.contributor.firstName}">
-                                                <c:out value="${letterSoundCorrespondenceContributionEvent.contributor.firstName}" />&nbsp;<c:out value="${letterSoundCorrespondenceContributionEvent.contributor.lastName}" />
+                                            <c:when test="${not empty letterSoundContributionEvent.contributor.firstName}">
+                                                <c:out value="${letterSoundContributionEvent.contributor.firstName}" />&nbsp;<c:out value="${letterSoundContributionEvent.contributor.lastName}" />
                                             </c:when>
-                                            <c:when test="${not empty letterSoundCorrespondenceContributionEvent.contributor.providerIdWeb3}">
-                                                ${fn:substring(letterSoundCorrespondenceContributionEvent.contributor.providerIdWeb3, 0, 6)}...${fn:substring(letterSoundCorrespondenceContributionEvent.contributor.providerIdWeb3, 38, 42)}
+                                            <c:when test="${not empty letterSoundContributionEvent.contributor.providerIdWeb3}">
+                                                ${fn:substring(letterSoundContributionEvent.contributor.providerIdWeb3, 0, 6)}...${fn:substring(letterSoundContributionEvent.contributor.providerIdWeb3, 38, 42)}
                                             </c:when>
                                         </c:choose>
                                     </div>
                                 </a>
                             </td>
                             <td>
-                                #${letterSoundCorrespondenceContributionEvent.revisionNumber} (<fmt:formatNumber maxFractionDigits="0" value="${letterSoundCorrespondenceContributionEvent.timeSpentMs / 1000 / 60}" /> min)
+                                #${letterSoundContributionEvent.revisionNumber} (<fmt:formatNumber maxFractionDigits="0" value="${letterSoundContributionEvent.timeSpentMs / 1000 / 60}" /> min)
                             </td>
                             <td>
-                                <fmt:formatDate value="${letterSoundCorrespondenceContributionEvent.time.time}" pattern="yyyy-MM-dd HH:mm" />
+                                <fmt:formatDate value="${letterSoundContributionEvent.time.time}" pattern="yyyy-MM-dd HH:mm" />
                             </td>
                             <td>
-                                <a href="<spring:url value='/content/letter-sound/edit/${letterSoundCorrespondenceContributionEvent.letterSoundCorrespondence.id}#peer-review' />" target="_blank"><fmt:message key="peer.review" /></a>
+                                <a href="<spring:url value='/content/letter-sound/edit/${letterSoundContributionEvent.letterSound.id}#peer-review' />" target="_blank"><fmt:message key="peer.review" /></a>
                             </td>
                         </tr>
                     </c:forEach>