From fc47ba4a53c34cb766e80d933256545ff6eb899f Mon Sep 17 00:00:00 2001
From: Aryant Tripathi <aryanttripathi@gmail.com>
Date: Thu, 10 Oct 2024 22:21:42 +0530
Subject: [PATCH] #1912 Remove most recent contributions feature

                - Deleted MostRecentContributionsController.java
                - Deleted most-recent.jsp
                - Updated main.jsp to reflect the removal of most recent contributions section
---
 .../MostRecentContributionsController.java    | 105 --------
 src/main/webapp/WEB-INF/jsp/content/main.jsp  |   2 -
 .../WEB-INF/jsp/contributions/most-recent.jsp | 234 ------------------
 3 files changed, 341 deletions(-)
 delete mode 100644 src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
 delete mode 100644 src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp

diff --git a/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java b/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
deleted file mode 100644
index 6bff7821f..000000000
--- a/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package ai.elimu.web.contributions;
-
-import ai.elimu.dao.AudioContributionEventDao;
-import ai.elimu.dao.ContributorDao;
-import ai.elimu.dao.NumberContributionEventDao;
-import ai.elimu.dao.StoryBookContributionEventDao;
-import ai.elimu.dao.WordContributionEventDao;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import java.util.List;
-import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.WordContributionEvent;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-@Controller
-@RequestMapping("/contributions/most-recent")
-public class MostRecentContributionsController {
-    
-    private final Logger logger = LogManager.getLogger();
-    
-    @Autowired
-    private StoryBookContributionEventDao storyBookContributionEventDao;
-    
-    @Autowired
-    private AudioContributionEventDao audioContributionEventDao;
-    
-    @Autowired
-    private WordContributionEventDao wordContributionEventDao;
-    
-    @Autowired
-    private NumberContributionEventDao numberContributionEventDao;
-    
-    @Autowired
-    private ContributorDao contributorDao;
-
-    @RequestMapping(method = RequestMethod.GET)
-    public String handleRequest(Model model) {
-        logger.info("handleRequest");
-        
-        List<StoryBookContributionEvent> storyBookContributionEvents = storyBookContributionEventDao.readMostRecent(9);
-        logger.info("storyBookContributionEvents.size(): " + storyBookContributionEvents.size());
-        model.addAttribute("storyBookContributionEvents", storyBookContributionEvents);
-        
-        List<AudioContributionEvent> audioContributionEvents = audioContributionEventDao.readMostRecent(10);
-        logger.info("audioContributionEvents.size(): " + audioContributionEvents.size());
-        model.addAttribute("audioContributionEvents", audioContributionEvents);
-        
-        List<WordContributionEvent> wordContributionEvents = wordContributionEventDao.readMostRecent(10);
-        logger.info("wordContributionEvents.size(): " + wordContributionEvents.size());
-        model.addAttribute("wordContributionEvents", wordContributionEvents);
-        
-        List<NumberContributionEvent> numberContributionEvents = numberContributionEventDao.readMostRecent(10);
-        logger.info("numberContributionEvents.size(): " + numberContributionEvents.size());
-        model.addAttribute("numberContributionEvents", numberContributionEvents);
-        
-        
-        List<Contributor> contributorsWithStoryBookContributions = contributorDao.readAllWithStoryBookContributions();
-        logger.info("contributorsWithStoryBookContributions.size(): " + contributorsWithStoryBookContributions.size());
-        model.addAttribute("contributorsWithStoryBookContributions", contributorsWithStoryBookContributions);
-        Map<Long, Long> storyBookContributionsCountMap = new HashMap<>();
-        for (Contributor contributor : contributorsWithStoryBookContributions) {
-            storyBookContributionsCountMap.put(contributor.getId(), storyBookContributionEventDao.readCount(contributor));
-        }
-        model.addAttribute("storyBookContributionsCountMap", storyBookContributionsCountMap);
-        
-        List<Contributor> contributorsWithAudioContributions = contributorDao.readAllWithAudioContributions();
-        logger.info("contributorsWithAudioContributions.size(): " + contributorsWithAudioContributions.size());
-        model.addAttribute("contributorsWithAudioContributions", contributorsWithAudioContributions);
-        Map<Long, Long> audioContributionsCountMap = new HashMap<>();
-        for (Contributor contributor : contributorsWithAudioContributions) {
-            audioContributionsCountMap.put(contributor.getId(), audioContributionEventDao.readCount(contributor));
-        }
-        model.addAttribute("audioContributionsCountMap", audioContributionsCountMap);
-        
-        List<Contributor> contributorsWithWordContributions = contributorDao.readAllWithWordContributions();
-        logger.info("contributorsWithWordContributions.size(): " + contributorsWithWordContributions.size());
-        model.addAttribute("contributorsWithWordContributions", contributorsWithWordContributions);
-        Map<Long, Long> wordContributionsCountMap = new HashMap<>();
-        for (Contributor contributor : contributorsWithWordContributions) {
-            wordContributionsCountMap.put(contributor.getId(), wordContributionEventDao.readCount(contributor));
-        }
-        model.addAttribute("wordContributionsCountMap", wordContributionsCountMap);
-        
-        List<Contributor> contributorsWithNumberContributions = contributorDao.readAllWithNumberContributions();
-        logger.info("contributorsWithNumberContributions.size(): " + contributorsWithNumberContributions.size());
-        model.addAttribute("contributorsWithNumberContributions", contributorsWithNumberContributions);
-        Map<Long, Long> numberContributionsCountMap = new HashMap<>();
-        for (Contributor contributor : contributorsWithNumberContributions) {
-            numberContributionsCountMap.put(contributor.getId(), numberContributionEventDao.readCount(contributor));
-        }
-        model.addAttribute("numberContributionsCountMap", numberContributionsCountMap);
-        
-
-        return "contributions/most-recent";
-    }
-}
diff --git a/src/main/webapp/WEB-INF/jsp/content/main.jsp b/src/main/webapp/WEB-INF/jsp/content/main.jsp
index 65d2e7894..67d16cc83 100644
--- a/src/main/webapp/WEB-INF/jsp/content/main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/main.jsp
@@ -273,7 +273,5 @@
         </ol>
         
         <div class="divider" style="margin: 1em 0;"></div>
-        
-        <a href="<spring:url value='/contributions/most-recent' />">Most recent contributions</a>
     </div>
 </content:aside>
diff --git a/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp b/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp
deleted file mode 100644
index 3eea9e098..000000000
--- a/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp
+++ /dev/null
@@ -1,234 +0,0 @@
-<content:title>
-    <fmt:message key="contributions" />
-</content:title>
-
-<content:section cssId="contributionsPage">
-    <h2><content:gettitle /></h2>
-
-    <div class="card-panel">
-        <h5>Most Recent Storybook Contributions</h5>
-        <div class="row">
-            <c:forEach var="storyBookContributionEvent" items="${storyBookContributionEvents}">
-                <c:set var="storyBook" value="${storyBookContributionEvent.storyBook}" />
-                <div class="col s12 m6 l4">
-                    <div class="storyBook card">
-                        <c:set var="coverImageUrl" value="/static/img/placeholder.png" />
-                        <c:if test="${not empty storyBook.coverImage}">
-                            <c:set var="coverImageUrl" value="/image/${storyBook.coverImage.id}_r${storyBook.coverImage.revisionNumber}.${fn:toLowerCase(storyBook.coverImage.imageFormat)}" />
-                        </c:if>
-                        <a href="<spring:url value='/content/storybook/edit/${storyBook.id}' />">
-                            <div class="card-image" style="background-image: url(<spring:url value='${coverImageUrl}' />);">
-                                <span class="card-title"><c:out value="${storyBook.title}" /></span>
-                            </div>
-                        </a>
-                        <div class="card-content">
-                            <p class="grey-text" style="margin-bottom: 0.5em;"><c:out value="${storyBook.description}" /></p>
-                            <p><fmt:message key="reading.level.${storyBook.readingLevel}" /></p>
-                            <p><fmt:message key="revision" />: #${storyBookContributionEvent.revisionNumber}</p>
-                        </div>
-                    </div>
-                </div>
-            </c:forEach>
-        </div>
-        
-        <div class="divider" style="margin: 1.5em 0 2em 0;"></div>
-        
-        <h5>Most Recent Word Contributions</h5>
-        <table class="bordered striped highlight">
-            <thead>
-                <th><fmt:message key="text" /></th>
-                <th><fmt:message key="sounds" /></th>
-                <th><fmt:message key="word.type" /></th>
-                <th><fmt:message key="revision" /></th>
-            </thead>
-            <tbody>
-                <c:forEach var="wordContributionEvent" items="${wordContributionEvents}">
-                    <c:set var="word" value="${wordContributionEvent.word}" />
-                    <tr>
-                        <td>
-                            <a class="editLink" href="<spring:url value='/content/word/edit/${word.id}' />">"${word.text}"</a>
-                        </td>
-                        <td>
-                            /<c:forEach var="lsc" items="${word.letterSounds}">&nbsp;<a href="<spring:url value='/content/letter-sound/edit/${lsc.id}' />"><c:forEach var="sound" items="${lsc.sounds}">${sound.valueIpa}</c:forEach></a>&nbsp;</c:forEach>/
-                        </td>
-                        <td>
-                            ${word.wordType}<br />
-                            <c:out value=" ${emojisByWordId[word.id]}" />
-                        </td>
-                        <td>
-                            <p>#${wordContributionEvent.revisionNumber}</p>
-                        </td>
-                    </tr>
-                </c:forEach>
-            </tbody>
-        </table>
-        
-        <div class="divider" style="margin: 1.5em 0 2em 0;"></div>
-        
-        <h5>Most Recent Number Contributions</h5>
-        <table class="bordered striped highlight">
-            <thead>
-                <th><fmt:message key="value" /></th>
-                <th><fmt:message key="symbol" /></th>
-                <th><fmt:message key="number.words" /></th>
-                <th><fmt:message key="revision" /></th>
-            </thead>
-            <tbody>
-                <c:forEach var="numberContributionEvent" items="${numberContributionEvents}">
-                    <c:set var="number" value="${numberContributionEvent.number}" />
-                    <tr>
-                        <td>
-                            <a class="editLink" href="<spring:url value='/content/number/edit/${number.id}' />">${number.value}</a>
-                        </td>
-                        <td>
-                            ${number.symbol}
-                        </td>
-                        <td>
-                            <c:forEach var="word" items="${number.words}">
-                                <a href="<spring:url value='/content/word/edit/${word.id}' />">${word.text}</a>
-                            </c:forEach>
-                        </td>
-                        <td>
-                            <p>#${numberContributionEvent.revisionNumber}</p>
-                        </td>
-                    </tr>
-                </c:forEach>
-            </tbody>
-        </table>
-    </div>
-</content:section>
-
-<content:aside>
-    <h5 class="center"><fmt:message key="top.contributors" /> 🏆</h5>
-    <div class="card-panel deep-purple lighten-5">
-        <b><fmt:message key="storybooks" /></b><br />
-        <ol style="list-style-type: inherit;">
-            <c:forEach var="contributor" items="${contributorsWithStoryBookContributions}">
-                <li>
-                    <a href="<spring:url value='/contributor/${contributor.id}' />">
-                        <div class="chip">
-                            <c:choose>
-                                <c:when test="${not empty contributor.imageUrl}">
-                                    <img src="${contributor.imageUrl}" />
-                                </c:when>
-                                <c:when test="${not empty contributor.providerIdWeb3}">
-                                    <img src="https://effigy.im/a/<c:out value="${contributor.providerIdWeb3}" />.png" />
-                                </c:when>
-                                <c:otherwise>
-                                    <img src="<spring:url value='/static/img/placeholder.png' />" />
-                                </c:otherwise>
-                            </c:choose>
-                            <c:choose>
-                                <c:when test="${not empty contributor.firstName}">
-                                    <c:out value="${contributor.firstName}" />&nbsp;<c:out value="${contributor.lastName}" />
-                                </c:when>
-                                <c:when test="${not empty contributor.providerIdWeb3}">
-                                    ${fn:substring(contributor.providerIdWeb3, 0, 6)}...${fn:substring(contributor.providerIdWeb3, 38, 42)}
-                                </c:when>
-                            </c:choose>
-                        </div> (${storyBookContributionsCountMap[contributor.id]})
-                    </a>
-                </li>
-            </c:forEach>
-        </ol>
-        
-        <div class="divider" style="margin: 1em 0;"></div>
-        
-        <b><fmt:message key="audios" /></b><br />
-        <ol style="list-style-type: inherit;">
-            <c:forEach var="contributor" items="${contributorsWithAudioContributions}">
-                <li>
-                    <a href="<spring:url value='/contributor/${contributor.id}' />">
-                        <div class="chip">
-                            <c:choose>
-                                <c:when test="${not empty contributor.imageUrl}">
-                                    <img src="${contributor.imageUrl}" />
-                                </c:when>
-                                <c:when test="${not empty contributor.providerIdWeb3}">
-                                    <img src="https://effigy.im/a/<c:out value="${contributor.providerIdWeb3}" />.png" />
-                                </c:when>
-                                <c:otherwise>
-                                    <img src="<spring:url value='/static/img/placeholder.png' />" />
-                                </c:otherwise>
-                            </c:choose>
-                            <c:choose>
-                                <c:when test="${not empty contributor.firstName}">
-                                    <c:out value="${contributor.firstName}" />&nbsp;<c:out value="${contributor.lastName}" />
-                                </c:when>
-                                <c:when test="${not empty contributor.providerIdWeb3}">
-                                    ${fn:substring(contributor.providerIdWeb3, 0, 6)}...${fn:substring(contributor.providerIdWeb3, 38, 42)}
-                                </c:when>
-                            </c:choose>
-                        </div> (${audioContributionsCountMap[contributor.id]})
-                    </a>
-                </li>
-            </c:forEach>
-        </ol>
-        
-        <div class="divider" style="margin: 1em 0;"></div>
-        
-        <b><fmt:message key="words" /></b><br />
-        <ol style="list-style-type: inherit;">
-            <c:forEach var="contributor" items="${contributorsWithWordContributions}">
-                <li>
-                    <a href="<spring:url value='/contributor/${contributor.id}' />">
-                        <div class="chip">
-                            <c:choose>
-                                <c:when test="${not empty contributor.imageUrl}">
-                                    <img src="${contributor.imageUrl}" />
-                                </c:when>
-                                <c:when test="${not empty contributor.providerIdWeb3}">
-                                    <img src="https://effigy.im/a/<c:out value="${contributor.providerIdWeb3}" />.png" />
-                                </c:when>
-                                <c:otherwise>
-                                    <img src="<spring:url value='/static/img/placeholder.png' />" />
-                                </c:otherwise>
-                            </c:choose>
-                            <c:choose>
-                                <c:when test="${not empty contributor.firstName}">
-                                    <c:out value="${contributor.firstName}" />&nbsp;<c:out value="${contributor.lastName}" />
-                                </c:when>
-                                <c:when test="${not empty contributor.providerIdWeb3}">
-                                    ${fn:substring(contributor.providerIdWeb3, 0, 6)}...${fn:substring(contributor.providerIdWeb3, 38, 42)}
-                                </c:when>
-                            </c:choose>
-                        </div> (${wordContributionsCountMap[contributor.id]})
-                    </a>
-                </li>
-            </c:forEach>
-        </ol>
-        
-        <div class="divider" style="margin: 1em 0;"></div>
-        
-        <b><fmt:message key="numbers" /></b><br />
-        <ol style="list-style-type: inherit;">
-            <c:forEach var="contributor" items="${contributorsWithNumberContributions}">
-                <li>
-                    <a href="<spring:url value='/contributor/${contributor.id}' />">
-                        <div class="chip">
-                            <c:choose>
-                                <c:when test="${not empty contributor.imageUrl}">
-                                    <img src="${contributor.imageUrl}" />
-                                </c:when>
-                                <c:when test="${not empty contributor.providerIdWeb3}">
-                                    <img src="https://effigy.im/a/<c:out value="${contributor.providerIdWeb3}" />.png" />
-                                </c:when>
-                                <c:otherwise>
-                                    <img src="<spring:url value='/static/img/placeholder.png' />" />
-                                </c:otherwise>
-                            </c:choose>
-                            <c:choose>
-                                <c:when test="${not empty contributor.firstName}">
-                                    <c:out value="${contributor.firstName}" />&nbsp;<c:out value="${contributor.lastName}" />
-                                </c:when>
-                                <c:when test="${not empty contributor.providerIdWeb3}">
-                                    ${fn:substring(contributor.providerIdWeb3, 0, 6)}...${fn:substring(contributor.providerIdWeb3, 38, 42)}
-                                </c:when>
-                            </c:choose>
-                        </div> (${numberContributionsCountMap[contributor.id]})
-                    </a>
-                </li>
-            </c:forEach>
-        </ol>
-    </div>
-</content:aside>