fix : fix disponibilities solidarity

back/api/espace/controllers/espace.js

@@ -9,6 +9,12 @@ const isToday = require("date-fns/isToday");
  * to customize this controller
  */
 
+const filterUserAttributes = (users_permissions_user) => {
+  const { id, structureName, email, phone, website, blocked } = users_permissions_user
+
+  return { id, structureName, email, phone, website, blocked }
+}
+
 const populate = [
   "disponibilities",
   "disponibilities.booking",
@@ -23,7 +29,7 @@ const populate = [
 
 module.exports = {
   async myPlaces(ctx) {
-    const {query}=ctx.request;
+    const { query } = ctx.request;
     const { id } = ctx.state.user;
     return strapi.query("espace").find(
       {
@@ -38,6 +44,8 @@ module.exports = {
   async find(ctx) {
     const { _sort, perimeter, ...query } = ctx.query;
     const isSortOnDisponibility = ["dispoAsc", "nbDispoDesc"].includes(_sort);
+    const isCampaignMode = Boolean(query['disponibilities.campaign'])
+
 
     if (perimeter && query["city.name_eq"]) {
       const placesInPerimeter =
@@ -51,7 +59,6 @@ module.exports = {
       }
     }
 
-
     let places = await strapi.services.espace
       .find(
         {
@@ -81,8 +88,11 @@ module.exports = {
         );
 
       return place;
-    });
+    }).map(p => ({ ...p, users_permissions_user: filterUserAttributes(p.users_permissions_user) }))
 
+    const filterDispo = (disponibilities) => disponibilities?.filter(d => {
+      return isCampaignMode ? d.campaign !== null : d.campaign === null
+    })
 
     if (isSortOnDisponibility) {
       if (_sort === "nbDispoDesc") {
@@ -92,33 +102,36 @@ module.exports = {
       } else if (_sort === "dispoAsc") {
         return places.sort((a, b) => {
           const dateFirst =
-            a.disponibilities.length > 0
-              ? min(a.disponibilities.map(({ start }) => new Date(start)))
+            filterDispo(a.disponibilities).length > 0
+              ? min(filterDispo(a.disponibilities).map(({ start }) => new Date(start)))
               : new Date("3000-01-01");
+
+
           const dateSecond =
-            b.disponibilities.length > 0
-              ? min(b.disponibilities.map(({ start }) => new Date(start)))
+            filterDispo(b.disponibilities).length > 0
+              ? min(filterDispo(b.disponibilities).map(({ start }) => new Date(start)))
               : new Date("3000-01-01");
 
           return dateFirst - dateSecond;
         });
       }
     }
-    return places;
+
+    return places
   },
   async update(ctx) {
     const { id } = ctx.params;
 
     let entity;
     if (ctx.is("multipart")) {
       const { data, files, campaign_files } = parseMultipartData(ctx);
-      entity = await strapi.services.espace.update({ id }, data, {files, campaign_files});
+      entity = await strapi.services.espace.update({ id }, data, { files, campaign_files });
     } else {
-      const { files,campaign_files, ...body } = ctx.request.body;
-      await Promise.all([files, campaign_files].map(async(fileList)=>{
+      const { files, campaign_files, ...body } = ctx.request.body;
+      await Promise.all([files, campaign_files].map(async (fileList) => {
         if (fileList && fileList.length > 0) {
           await Promise.all(
-            fileList.map(async(file) => {
+            fileList.map(async (file) => {
               await strapi.plugins["upload"].services.upload.updateFileInfo(file.id, {
                 caption: file.caption,
               });

web/components/Actuality/ActuCard.tsx

@@ -1,20 +1,19 @@
-import React from 'react'
-import { Text, Box, Flex, Button, AspectRatio, LinkBox } from '@chakra-ui/react'
-import LinkOverlay from '~components/LinkOverlay'
+import { AspectRatio, Box, Button, Flex, Text } from '@chakra-ui/react'
+import { useTranslation } from 'next-i18next'
+import removeMd from 'remove-markdown'
 import Image from '~components/Image'
 import Link from '~components/Link'
-import { format } from '~utils/date'
 import { ROUTE_ACTU_DETAIL } from '~constants'
 import { Actuality } from '~typings/api'
-import { useTranslation } from 'next-i18next'
-import removeMd from 'remove-markdown'
+import { format } from '~utils/date'
 
 interface IActuCard {
   actu: Actuality
 }
 
 const ActuCard = ({ actu }: IActuCard) => {
   const { t } = useTranslation('actuality')
+  console.log({ lol: actu?.image.formats })
   return (
     <Link
       _hover={{
@@ -28,7 +27,7 @@ const ActuCard = ({ actu }: IActuCard) => {
       <AspectRatio w="100%" maxH="300px" ratio={16 / 9} overflow="hidden">
         <Image
           // @ts-ignore
-          src={actu?.image.formats.thumbnail.url || actu?.image?.url}
+          src={actu?.image.formats.large.url || actu?.image?.url}
           objectFit="cover"
           transition="transform ease-in-out 200ms"
           _groupHover={{ transform: 'scale(1.05)' }}

web/components/Home/HomePlacesSolidarity.tsx

@@ -1,21 +1,20 @@
-import React from 'react'
 import {
-  Flex,
   Box,
-  Text,
   Button,
-  useBreakpointValue,
+  Flex,
   HStack,
   Stack,
+  Text,
+  useBreakpointValue,
 } from '@chakra-ui/react'
 import { useTranslation } from 'next-i18next'
 import Arrow from 'public/assets/img/arrow-bottom.svg'
-import { usePlaces } from '~hooks/usePlaces'
-import PlaceGrid from '~components/Place/PlaceGrid'
+import HomeHelperSolidarity from '~components/Campaign/HomeHelperSolidarity'
+import useCampaignContext from '~components/Campaign/useCampaignContext'
 import Link from '~components/Link'
+import PlaceGrid from '~components/Place/PlaceGrid'
 import { ROUTE_PLACES } from '~constants'
-import useCampaignContext from '~components/Campaign/useCampaignContext'
-import HomeHelperSolidarity from '~components/Campaign/HomeHelperSolidarity'
+import { usePlaces } from '~hooks/usePlaces'
 
 const HomePlacesSolidarity = () => {
   const isLgOrSm = useBreakpointValue({

web/components/Place/Booking/BookingRecapInsert/AuthBookingInsert.tsx

@@ -1,9 +1,8 @@
-import React from 'react'
-import { Button, Text, Box, ButtonGroup } from '@chakra-ui/react'
+import { Box, Button, ButtonGroup, Text } from '@chakra-ui/react'
+import { useTranslation } from 'next-i18next'
 import Link from '~components/Link'
-import { ROUTE_SIGNUP } from '~constants'
 import SigninModal from '~components/Signin/SigninModal'
-import { useTranslation } from 'next-i18next'
+import { ROUTE_SIGNUP } from '~constants'
 
 const AuthBookingInsert = ({
   nbSelected,

web/components/Place/Booking/BookingRecapInsert/BookingRecap.tsx

@@ -1,12 +1,11 @@
-import React, { useMemo, useContext } from 'react'
-import { Flex, Text, Box } from '@chakra-ui/react'
-import BookingScheduleContext from '~components/Place/Booking/BookingScheduleContext'
+import { Flex } from '@chakra-ui/react'
 import { useTranslation } from 'next-i18next'
-import { useCurrentUser } from '~hooks/useCurrentUser'
+import { useContext, useMemo } from 'react'
 import AuthBookingInsert from '~components/Place/Booking/BookingRecapInsert/AuthBookingInsert'
 import ConfirmBookingInsert from '~components/Place/Booking/BookingRecapInsert/ConfirmBookingInsert'
-import { is } from 'date-fns/locale'
 import NotConfirmedBookingInsert from '~components/Place/Booking/BookingRecapInsert/NotConfirmedBookingInsert'
+import BookingScheduleContext from '~components/Place/Booking/BookingScheduleContext'
+import { useCurrentUser } from '~hooks/useCurrentUser'
 
 const BookingRecap = ({ isCampaignMode }: { isCampaignMode?: boolean }) => {
   const { t } = useTranslation('place')

web/components/Place/PlaceDetailPage/PlaceDetailCalendar.tsx

@@ -1,8 +1,8 @@
 import { Box, Flex, Text } from '@chakra-ui/react'
-import BookingScheduleContainer from '~components/Place/Booking/BookingScheduleContainer'
+import { useTranslation } from 'next-i18next'
 import Calendar from 'public/assets/img/calendar.svg'
+import BookingScheduleContainer from '~components/Place/Booking/BookingScheduleContainer'
 import { Espace } from '~typings/api'
-import { useTranslation } from 'next-i18next'
 
 const PlaceDetailCalendar = ({ place }: { place: Espace }) => {
   const { t } = useTranslation('place')
@@ -17,7 +17,6 @@ const PlaceDetailCalendar = ({ place }: { place: Espace }) => {
           {t('detail.calendar')}
         </Text>
       </Flex>
-
       <BookingScheduleContainer place={place} />
     </>
   )

web/components/Place/PlaceGridCard.tsx

@@ -1,29 +1,28 @@
-import React from 'react'
 import {
+  AspectRatio,
   Box,
-  Flex,
-  Text,
   Divider,
-  AspectRatio,
+  Flex,
   LinkBox,
+  Text,
 } from '@chakra-ui/react'
-import { Espace } from '~typings/api'
-import PlaceCardCarousel from '~components/Place/PlaceCardCarousel'
-import { ROUTE_PLACE_DETAIL } from '~constants'
+import addWeeks from 'date-fns/addWeeks'
 import { useTranslation } from 'next-i18next'
+import { DisponibilityStatus } from '~@types/disponibility.d'
+import CampaignTag from '~components/Campaign/CampaignTag'
+import useCampaignContext from '~components/Campaign/useCampaignContext'
 import FallbackImage from '~components/FallbackImage'
 import LinkOverlay from '~components/LinkOverlay'
+import PlaceCardCarousel from '~components/Place/PlaceCardCarousel'
 import Tag from '~components/Tag'
-import { DisponibilityStatus } from '~@types/disponibility.d'
-import { SearchQuery } from '~utils/search'
+import { ROUTE_PLACE_DETAIL } from '~constants'
+import useCampaignDispo from '~hooks/useCampaignDispo'
+import { useCurrentUser } from '~hooks/useCurrentUser'
 import useDispoInRange from '~hooks/useDispoInRange'
 import useNbDispoPerWeek from '~hooks/useNbDispoPerWeek'
-import addWeeks from 'date-fns/addWeeks'
-import useCampaignContext from '~components/Campaign/useCampaignContext'
+import { Espace } from '~typings/api'
 import { format } from '~utils/date'
-import CampaignTag from '~components/Campaign/CampaignTag'
-import useCampaignDispo from '~hooks/useCampaignDispo'
-import { useCurrentUser } from '~hooks/useCurrentUser'
+import { SearchQuery } from '~utils/search'
 
 interface Props {
   place: Espace
@@ -36,28 +35,44 @@ const PlaceGridCard = ({ place, searchParams, gridMode }: Props) => {
   const { applications } = useCurrentUser()
   const { t } = useTranslation('place')
 
+  const filteredDisponibilities =
+    place?.disponibilities?.filter((item) => {
+      if (gridMode === 'campaign') {
+        return Boolean(item.campaign)
+      }
+
+      return item.campaign === null
+    }) ?? []
+
   const disposInRange = useDispoInRange(
-    place?.disponibilities,
+    filteredDisponibilities,
     searchParams?.['disponibilities.start_gte'],
     searchParams?.['disponibilities.end_lte'],
   )
 
   const disposThisWeek = useNbDispoPerWeek(
     new Date(),
-    disposInRange || place?.disponibilities,
+    disposInRange || filteredDisponibilities,
   )
+
   const disposNextWeek = useNbDispoPerWeek(
     addWeeks(new Date(), 1),
-    disposInRange || place?.disponibilities,
+    disposInRange || filteredDisponibilities,
   )
 
-  const { campaignDisposNum, campaignDispos } = useCampaignDispo(
-    place?.disponibilities,
-  )
+  const {
+    campaignDisposNum,
+    campaignDispos,
+    solidarityDispos,
+    solidarityDisposNum,
+  } = useCampaignDispo(place?.disponibilities)
+
   const hasCampaignDispo =
     currentCampaign?.mode === 'applications' && !!campaignDisposNum
 
-  if (!place) return null
+  if (!place) {
+    return null
+  }
 
   return (
     <LinkBox>
@@ -120,7 +135,7 @@ const PlaceGridCard = ({ place, searchParams, gridMode }: Props) => {
                 {place?.users_permissions_user?.structureName}
               </Text>
             </Box>
-            {place?.disponibilities?.length === 0 && gridMode !== 'campaign' && (
+            {filteredDisponibilities?.length === 0 && gridMode !== 'campaign' && (
               <Tag
                 status={DisponibilityStatus.PAST}
                 alignSelf="flex-start"

web/components/Place/PlaceList.tsx

@@ -1,8 +1,8 @@
-import React, { useMemo, useState } from 'react'
-import { Box, VStack, Flex } from '@chakra-ui/react'
+import { Box, Flex, VStack } from '@chakra-ui/react'
 import dynamic from 'next/dynamic'
-import Loading from '~components/Loading'
+import { useMemo, useState } from 'react'
 import Loader from '~components/Loader'
+import Loading from '~components/Loading'
 import PlaceListCard from '~components/Place/PlaceListCard'
 import PlaceListCardSkeleton from '~components/Place/PlaceListCardSkeleton'
 const Map = dynamic(() => import('~components/Map'), { ssr: false })

web/components/Place/PlaceListCard.tsx

@@ -1,22 +1,21 @@
-import React from 'react'
 import {
+  AspectRatio,
   Box,
   Flex,
-  Text,
-  AspectRatio,
   LinkBox,
   SimpleGrid,
+  Text,
 } from '@chakra-ui/react'
-import { Espace } from '~typings/api'
-import PlaceCardCarousel from '~components/Place/PlaceCardCarousel'
-import { ROUTE_PLACE_DETAIL } from '~constants'
 import { useTranslation } from 'next-i18next'
-import FallbackImage from '~components/FallbackImage'
-import LinkOverlay from '~components/LinkOverlay'
-import { format } from '~utils/date'
 import CampaignTag from '~components/Campaign/CampaignTag'
 import useCampaignContext from '~components/Campaign/useCampaignContext'
+import FallbackImage from '~components/FallbackImage'
+import LinkOverlay from '~components/LinkOverlay'
+import PlaceCardCarousel from '~components/Place/PlaceCardCarousel'
+import { ROUTE_PLACE_DETAIL } from '~constants'
 import useCampaignDispo from '~hooks/useCampaignDispo'
+import { Espace } from '~typings/api'
+import { format } from '~utils/date'
 
 interface Props {
   place: Espace

web/components/Place/PlacesCampaignTabs.tsx

@@ -107,7 +107,6 @@ const PlacesCampaignTabs = () => {
           display={{ base: 'none', xl: 'inherit' }}
         />
       </HStack>
-
       <TabPanels>
         <TabPanel padding={0}>
           <PlacesPage />