From d9f0775be417a74e54d0c9653ecaa9c91fb2f347 Mon Sep 17 00:00:00 2001
From: Bruno Perel <brunoperel@gmail.com>
Date: Sat, 31 Aug 2024 23:02:06 +0200
Subject: [PATCH] web,api:Cleanup

---
 apps/web/src/components/Bookcase.vue        | 111 +++++++++-----------
 apps/web/src/components/BookcasePopover.vue |  10 +-
 apps/web/src/components/Edge.vue            |  27 +++--
 apps/web/src/components/Event.vue           |   6 +-
 apps/web/src/components/Issue.vue           |   2 +-
 apps/web/src/components/IssueList.story.vue |   2 +-
 apps/web/src/components/RecentEvents.vue    |   8 +-
 packages/api/services/events/index.ts       |  19 ++--
 packages/types/events/EdgeCreationEvent.ts  |   4 +-
 9 files changed, 83 insertions(+), 106 deletions(-)

diff --git a/apps/web/src/components/Bookcase.vue b/apps/web/src/components/Bookcase.vue
index 7c39cf6fe..a1e6df6c6 100644
--- a/apps/web/src/components/Bookcase.vue
+++ b/apps/web/src/components/Bookcase.vue
@@ -7,68 +7,55 @@
     }"
   >
     <template v-for="edgeIndex of edgeIndexesToLoad" :key="`edge-${edgeIndex}`">
-      <Edge
-        v-if="embedded"
-        :id="`edge-${edgeIndex}${embedded}`"
-        v-bind="
-          (({ issuecode, issueCondition }) => ({
-            issue: issuecodeDetails[issuecode],
-            issueCondition,
-          }))(sortedBookcase[edgeIndex] as SimpleBookcaseEdge)
-        "
-        :orientation="orientation"
-        existing
-        embedded
-        @loaded="onEdgeLoaded(edgeIndex)"
-        ><template #edge-prefix="{ edge }"
-          ><slot
-            name="edge-prefix"
-            :edge="{
-              issueCondition: edge.issueCondition!,
-            }" /></template
-      ></Edge>
-      <Edge
-        v-else
-        :id="`edge-${edgeIndex}`"
-        :invisible="
-          currentEdgeOpened === sortedBookcaseWithPopularity![edgeIndex] ||
-          edgeIndex > lastEdgeIndexContinuouslyLoaded
-        "
-        :highlighted="
-          currentEdgeHighlighted === sortedBookcaseWithPopularity![edgeIndex].id
-        "
-        v-bind="
-          (({
-            issuecode,
-            issueCondition,
-            popularity,
-          }: BookcaseEdgeWithPopularity) => ({
-            issue: issuecodeDetails[issuecode],
-            issueCondition,
-            
-            popularity
-          }))(sortedBookcaseWithPopularity![edgeIndex])
-        "
-        :creation-date="
-          sortedBookcaseWithPopularity![edgeIndex].creationDate?.toString()
-        "
-        :existing="!!sortedBookcaseWithPopularity![edgeIndex].edgeId"
-        :sprite-path="
-          edgesUsingSprites?.[
-            sortedBookcaseWithPopularity![edgeIndex].edgeId
-          ] || null
-        "
-        :orientation="orientation"
-        @loaded="onEdgeLoaded(edgeIndex)"
-        @open-book="
-          $emit('open-book', sortedBookcaseWithPopularity![edgeIndex])
-        "
-        ><template #edge-prefix="{ edge }"
-          ><slot
-            name="edge-prefix"
-            :edge="{
-              issueCondition: edge.issueCondition!,
-            }" /></template></Edge
+      <template v-if="issuecodeDetails[sortedBookcase[edgeIndex].issuecode]">
+        <Edge
+          v-if="embedded"
+          :id="`edge-${edgeIndex}${embedded}`"
+          :issuecode="sortedBookcase![edgeIndex].issuecode"
+          :orientation="orientation"
+          existing
+          embedded
+          @loaded="onEdgeLoaded(edgeIndex)"
+          ><template #edge-prefix="{ edge }"
+            ><slot
+              name="edge-prefix"
+              :edge="{
+                issueCondition: edge.issueCondition!,
+              }" /></template
+        ></Edge>
+        <Edge
+          v-else
+          :id="`edge-${edgeIndex}`"
+          :invisible="
+            currentEdgeOpened === sortedBookcaseWithPopularity![edgeIndex] ||
+            edgeIndex > lastEdgeIndexContinuouslyLoaded
+          "
+          :highlighted="
+            currentEdgeHighlighted ===
+            sortedBookcaseWithPopularity![edgeIndex].id
+          "
+          :edge="sortedBookcaseWithPopularity![edgeIndex]"
+          :issuecode="sortedBookcaseWithPopularity![edgeIndex].issuecode"
+          :creation-date="
+            sortedBookcaseWithPopularity![edgeIndex].creationDate?.toString()
+          "
+          :existing="!!sortedBookcaseWithPopularity![edgeIndex].edgeId"
+          :sprite-path="
+            edgesUsingSprites?.[
+              sortedBookcaseWithPopularity![edgeIndex].edgeId
+            ] || null
+          "
+          :orientation="orientation"
+          @loaded="onEdgeLoaded(edgeIndex)"
+          @open-book="
+            $emit('open-book', sortedBookcaseWithPopularity![edgeIndex])
+          "
+          ><template #edge-prefix="{ edge }"
+            ><slot
+              name="edge-prefix"
+              :edge="{
+                issueCondition: edge.issueCondition!,
+              }" /></template></Edge></template
     ></template>
   </div>
 </template>
diff --git a/apps/web/src/components/BookcasePopover.vue b/apps/web/src/components/BookcasePopover.vue
index 755b79f85..8d070b6d4 100644
--- a/apps/web/src/components/BookcasePopover.vue
+++ b/apps/web/src/components/BookcasePopover.vue
@@ -4,18 +4,18 @@
     <template #content>
       <Bookcase
         :bookcase-textures="bookcaseTextures"
-        :sorted-bookcase="edges"
+        :sorted-bookcase="issuecodes"
         embedded
       />
       <b-row>
         <b-col
-          v-for="(edge, edgeId) in edges"
-          :key="`bookcase-${id}-issue-${edgeId}`"
+          v-for="(issuecode, idx) in issuecodes"
+          :key="`bookcase-${id}-issue-${idx}`"
           cols="6"
         >
           <Issue
             class="issue"
-            :issuecode="edge.issuecode"
+            :issuecode="issuecode"
             hide-condition
             :flex="false"
           />
@@ -28,7 +28,7 @@
 <script setup lang="ts">
 defineProps<{
   id: string;
-  edges: { issuecode: string }[];
+  issuecodes: string[];
 }>();
 
 const bookcaseTextures = {
diff --git a/apps/web/src/components/Edge.vue b/apps/web/src/components/Edge.vue
index 1988b2dea..a94de586d 100644
--- a/apps/web/src/components/Edge.vue
+++ b/apps/web/src/components/Edge.vue
@@ -8,7 +8,7 @@
     v-if="embedded"
     :id="id"
     :src="src"
-    :issuecode="issue.issuecode"
+    :issuecode="issuecode"
     :sprite-path="spritePath"
     :invisible="invisible"
     :highlighted="highlighted"
@@ -23,12 +23,12 @@
     :extra-points="popularity"
   >
     <template #title>
-      <Issue :issuecode="issue.issuecode" />
+      <Issue :issuecode="issuecode" />
     </template>
     <EdgeContents
       :id="id"
       :src="src"
-      :issuecode="issue.issuecode"
+      :issuecode="issuecode"
       :sprite-path="spritePath"
       :invisible="invisible"
       :highlighted="highlighted"
@@ -41,13 +41,12 @@
 </template>
 
 <script setup lang="ts">
-import type { inducks_issue } from "~prisma-schemas/schemas/coa";
 import type { issue_condition } from "~prisma-schemas/schemas/dm";
 
 const SPRITES_ROOT = "https://res.cloudinary.com/dl7hskxab/image/sprite/";
 const {
   creationDate = null,
-  issue,
+  issuecode,
   issueCondition,
   spritePath = null,
   popularity = null,
@@ -57,7 +56,7 @@ const {
   orientation = "vertical",
 } = defineProps<{
   id: string;
-  issue: Pick<inducks_issue, "publicationcode" | "issuecode" | "issuenumber">;
+  issuecode: string;
   issueCondition?: issue_condition;
   creationDate?: string;
   popularity?: number | null;
@@ -78,17 +77,17 @@ defineSlots<{
 const CLOUDINARY_ROTATED_URL =
   "https://res.cloudinary.com/dl7hskxab/image/upload/a_270/edges/";
 
-const { publicationNames } = storeToRefs(coa());
+const { publicationNames, issuecodeDetails } = storeToRefs(coa());
 
-let countryCode = $computed(() => issue.publicationcode.split("/")[0]),
-  magazineCode = $computed(() => issue.publicationcode.split("/")[1]),
-  src = $computed(() =>
-    spritePath && !ignoreSprite
+let src = $computed(() => {
+    const { publicationcode, issuenumber } = issuecodeDetails.value[issuecode];
+    const [countrycode, magazineCode] = publicationcode.split("/");
+    return spritePath && !ignoreSprite
       ? `${SPRITES_ROOT}${spritePath}.png`
-      : `${orientation === "vertical" ? import.meta.env.VITE_EDGES_ROOT : CLOUDINARY_ROTATED_URL}${countryCode}/gen/${magazineCode}.${issue.issuenumber.replaceAll(
+      : `${orientation === "vertical" ? import.meta.env.VITE_EDGES_ROOT : CLOUDINARY_ROTATED_URL}${countrycode}/gen/${magazineCode}.${issuenumber.replaceAll(
           " ",
           "",
-        )}.png?${creationDate ? new Date(creationDate).getTime() : "default"}`,
-  ),
+        )}.png?${creationDate ? new Date(creationDate).getTime() : "default"}`;
+  }),
   ignoreSprite = $ref(false);
 </script>
diff --git a/apps/web/src/components/Event.vue b/apps/web/src/components/Event.vue
index 0e0255909..ac50f7ff6 100644
--- a/apps/web/src/components/Event.vue
+++ b/apps/web/src/components/Event.vue
@@ -62,15 +62,15 @@
       <template v-else>&nbsp;{{ $t("a créé la tranche") }} </template>
       &nbsp;<BookcasePopover
         :id="`event-edges-${event.timestamp}`"
-        :edges="edgeEvent.edges"
+        :issuecodes="edgeEvent.issuecodes"
       >
         <span class="fw-bold" style="cursor: help">
           <Issue
-            :issuecode="edgeEvent.edges[0].issuecode"
+            :issuecode="edgeEvent.issuecodes[0]"
             hide-condition
             :flex="false"
           />&nbsp;<OtherIssues
-            :number="edgeEvent.edges.length"
+            :number="edgeEvent.issuecodes.length"
             :text-single="$t('autre tranche')"
             :text-multiple="$t('autres tranches')"
           />
diff --git a/apps/web/src/components/Issue.vue b/apps/web/src/components/Issue.vue
index 303213cf9..a6cfe4060 100644
--- a/apps/web/src/components/Issue.vue
+++ b/apps/web/src/components/Issue.vue
@@ -39,7 +39,7 @@ const store = coa();
 const issue = computed(() => store.issuecodeDetails?.[issuecode]);
 const publicationname = computed(
   () =>
-    issue.value.publicationcode &&
+    issue.value?.publicationcode &&
     store.publicationNames?.[issue.value.publicationcode],
 );
 </script>
diff --git a/apps/web/src/components/IssueList.story.vue b/apps/web/src/components/IssueList.story.vue
index 1cfeed808..73812fba6 100644
--- a/apps/web/src/components/IssueList.story.vue
+++ b/apps/web/src/components/IssueList.story.vue
@@ -16,7 +16,7 @@ import dayjs from "dayjs";
 
 import type { issue } from "~prisma-schemas/schemas/dm";
 
-const customIssues: (issue & { issuecode: string })[] = [
+const customIssues: issue[] = [
   {
     id: 167808,
     publicationcode: "fr/MP",
diff --git a/apps/web/src/components/RecentEvents.vue b/apps/web/src/components/RecentEvents.vue
index 8da9d1918..e8f7ea298 100644
--- a/apps/web/src/components/RecentEvents.vue
+++ b/apps/web/src/components/RecentEvents.vue
@@ -41,7 +41,7 @@ const isCollectionUpdateEvent = (
 
 const isEdgeCreationEvent = (
   event: AbstractEvent,
-): event is EdgeCreationEvent => event.hasOwnProperty("edges");
+): event is EdgeCreationEvent => event.hasOwnProperty("issuecodes");
 
 const fetchEventsAndAssociatedData = async () => {
   await fetchEvents();
@@ -52,9 +52,7 @@ const fetchEventsAndAssociatedData = async () => {
       .map(({ exampleIssuecode }) => exampleIssuecode),
     ...events.value
       .filter((event) => isEdgeCreationEvent(event))
-      .reduce<
-        string[]
-      >((acc, { edges }) => [...acc, ...edges.map(({ issuecode }) => issuecode)], []),
+      .reduce<string[]>((acc, { issuecodes }) => [...acc, ...issuecodes], []),
   ]);
 
   await fetchPublicationNames([
@@ -68,7 +66,7 @@ const fetchEventsAndAssociatedData = async () => {
       .filter((event) => isEdgeCreationEvent(event))
       .reduce<
         string[]
-      >((acc, { edges }) => [...acc, ...edges.map(({ issuecode }) => issuecodeDetails.value[issuecode].publicationcode)], []),
+      >((acc, { issuecodes }) => [...acc, ...issuecodes.map((issuecode) => issuecodeDetails.value[issuecode].publicationcode)], []),
   ]);
 
   await fetchStats(eventUserIds.filter((userId) => userId !== null));
diff --git a/packages/api/services/events/index.ts b/packages/api/services/events/index.ts
index a0fad85f6..7aba61f09 100644
--- a/packages/api/services/events/index.ts
+++ b/packages/api/services/events/index.ts
@@ -135,32 +135,25 @@ const retrieveBookstoreCreations = async (): Promise<BookstoreCommentEvent[]> =>
 const retrieveEdgeCreations = async (): Promise<EdgeCreationEvent[]> =>
   (
     await prismaDm.$queryRaw<EdgeCreationEventRaw[]>`
-        select 'edge'                       as type,
-               CONCAT('[', GROUP_CONCAT(json_object(
-                       'publicationcode',
-                       publicationcode,
-                       'issuenumber',
-                       issuenumber
-                   )), ']')                 AS edges,
+        select 'edge'                       AS type,
+               GROUP_CONCAT(issuecode)      AS issuecodes,
                UNIX_TIMESTAMP(creationDate) AS timestamp,
                users
-        from (SELECT tp.publicationcode,
-                     tp.issuenumber,
+        from (SELECT tp.issuecode,
                      tp.dateajout                       AS creationDate,
                      GROUP_CONCAT(DISTINCT tpc.ID_user) AS users
               FROM tranches_pretes tp
                        INNER JOIN users_contributions tpc ON tpc.ID_tranche = tp.ID
               WHERE tp.dateajout > DATE_ADD(NOW(), INTERVAL -1 MONTH)
                 AND NOT (tp.publicationcode = 'fr/JM' AND tp.issuenumber REGEXP '^[0-9]+$')
-                AND NOT (tp.publicationcode = 'be/MMN')
-                AND NOT (tp.publicationcode = 'it/TL')
-                AND NOT (tp.publicationcode = 'se/WDS')
+                AND tp.publicationcode NOT IN ('be/MMN', 'it/TL', 'se/WDS')
               GROUP BY tp.ID) as edges_and_collaborators
         group by DATE_FORMAT(creationDate, '%Y-%m-%d %H:00:00'), edges_and_collaborators.users
+        having count(issuecode) > 0
     `
   ).map((event) => ({
     ...mapUsers<EdgeCreationEvent>(event),
-    edges: JSON.parse(event.edges),
+    issuecodes: event.issuecodes.split(","),
   }));
 
 const retrieveNewMedals = async () =>
diff --git a/packages/types/events/EdgeCreationEvent.ts b/packages/types/events/EdgeCreationEvent.ts
index a11e4430e..66a77e266 100644
--- a/packages/types/events/EdgeCreationEvent.ts
+++ b/packages/types/events/EdgeCreationEvent.ts
@@ -2,12 +2,12 @@ import { AbstractEvent } from "./AbstractEvent";
 
 export interface EdgeCreationEventRaw {
   type: string;
-  edges: string;
+  issuecodes: string;
   timestamp: number;
   users: string;
 }
 
 export class EdgeCreationEvent extends AbstractEvent {
   type = "edge";
-  edges: { issuecode: string }[] = [];
+  issuecodes: string[] = [];
 }