Merge pull request #281 from EnMarche/feature/door/fixes

Fix door to door comments part 1

src/assets/localizables/fr.json

@@ -484,10 +484,9 @@
       "noPassage": "Aucun passage",
       "passageOn": "le {{date}}",
       "lastPassageBy": "{{firstname}} {{lastname}}., le {{date}}",
-      "electorsMet": "Électeurs rencontrés",
       "doorKnocked": "Portes frappées",
       "date_format": "D MMM YYYY",
-      "doorsSurveysCount": "{{numberOfSurveys}}/{{numberOfDoors}}",
+      "doorsSurveysCount": "{{numberOfDoors}}/{{numberOfSurveys}}",
       "votersCount": "{{votersCount}}",
       "ranking": {
         "title": "Classements",
@@ -556,7 +555,8 @@
           "newDoor": "Une porte de plus !",
           "recap": "Tu as réalisé un total de {{doorsCount}} porte frappée et récolté {{pollsCount}} questionnaire. Merci pour ton engagement !",
           "knockNewDoor": "Frapper à une nouvelle porte",
-          "stop": "Arrêter le porte-à-porte"
+          "stop": "Arrêter le porte-à-porte",
+          "ranking": "Classement"
         }
       }
     }

src/core/entities/BuildingBlock.ts

@@ -1,4 +1,5 @@
 import uuid from 'react-native-uuid'
+import { BuildingType } from './DoorToDoor'
 
 export interface BuildingBlock {
   name: string
@@ -21,6 +22,9 @@ export type BuildingBlockStatus = 'todo' | 'ongoing' | 'completed'
 export type BuildingBlocFloorStatus = 'todo' | 'ongoing' | 'completed'
 
 export class BuildingBlockHelper {
+  private HOUSE_DEFAULT_FLOOR_COUNT = 1
+  private BUILDING_DEFAULT_FLOOR_COUNT = 3
+
   public createLocalFloor(name: number): BuildingBlockFloor {
     return {
       number: name,
@@ -32,7 +36,14 @@ export class BuildingBlockHelper {
     }
   }
 
-  public createLocalBlock(name: string, floorsCount: number): BuildingBlock {
+  public createLocalBlock(
+    name: string,
+    buildingType: BuildingType,
+  ): BuildingBlock {
+    const floorsCount =
+      buildingType === 'building'
+        ? this.BUILDING_DEFAULT_FLOOR_COUNT
+        : this.HOUSE_DEFAULT_FLOOR_COUNT
     const floors = Array.from({ length: floorsCount }, (_, i) =>
       this.createLocalFloor(i),
     )

src/core/entities/DoorToDoorPollParams.ts

@@ -1,6 +1,6 @@
 export interface DoorToDoorPollParams {
   campaignId: string
-  interlocutorStatus: string
+  status: string
   buildingId: string
   block: string
   floor: number

src/core/interactor/GetDoorToDoorCampaignPopupInteractor.ts → src/core/interactor/GetDoorToDoorCampaignInfoInteractor.ts

@@ -2,10 +2,10 @@ import DoorToDoorRepository from '../../data/DoorToDoorRepository'
 import { DoorToDoorCampaign } from '../entities/DoorToDoorCampaign'
 import { DoorToDoorCampaignRanking } from '../entities/DoorToDoorCampaignRanking'
 
-export class GetDoorToDoorCampaignPopupInteractor {
+export class GetDoorToDoorCampaignInfoInteractor {
   private repository = DoorToDoorRepository.getInstance()
 
-  public async execute(campaignId: string): Promise<DoorToDoorCampaignPopup> {
+  public async execute(campaignId: string): Promise<DoorToDoorCampaignInfo> {
     const campaign = await this.repository.getCampaign(campaignId)
     const ranking = await this.repository.getDoorToDoorCampaignRanking(
       campaignId,
@@ -17,7 +17,7 @@ export class GetDoorToDoorCampaignPopupInteractor {
   }
 }
 
-export interface DoorToDoorCampaignPopup {
+export interface DoorToDoorCampaignInfo {
   campaign: DoorToDoorCampaign
   ranking: DoorToDoorCampaignRanking
 }

src/core/interactor/SendDoorPollAnswersInteractor.ts

@@ -8,23 +8,23 @@ export class SendDoorPollAnswersInteractor {
 
   public async execute(
     campaignId: string,
-    interlocutorStatus: string,
+    status: string,
     buildingParams: BuildingSelectedParams,
-    pollResult: DoorToDoorPollResult,
+    pollResult?: DoorToDoorPollResult,
   ): Promise<void> {
     const pollParams = {
       campaignId: campaignId,
       buildingId: buildingParams.id,
-      interlocutorStatus: interlocutorStatus,
+      status: status,
       block: buildingParams.block,
       floor: buildingParams.floor,
       door: buildingParams.door,
     }
     const response = await this.repository.createDoorPollCampaignHistory(
       pollParams,
-      pollResult,
+      pollResult ?? { answers: [], qualificationAnswers: [] },
     )
-    if (interlocutorStatus === INTERLOCUTOR_ACCEPT_TO_ANSWER_CODE) {
+    if (status === INTERLOCUTOR_ACCEPT_TO_ANSWER_CODE && pollResult) {
       await this.repository.sendDoorToDoorPollAnswers(response.uuid, pollResult)
     }
   }

src/core/interactor/UpdateBuildingLayoutInteractor.ts

@@ -0,0 +1,69 @@
+import DoorToDoorRepository from '../../data/DoorToDoorRepository'
+import AlphabetHelper from '../../utils/AlphabetHelper'
+import {
+  BuildingBlock,
+  BuildingBlockFloor,
+  BuildingBlockHelper,
+} from '../entities/BuildingBlock'
+import { BuildingType } from '../entities/DoorToDoor'
+
+export class UpdateBuildingLayoutInteractor {
+  private buildingBlockHelper = new BuildingBlockHelper()
+  private repository = DoorToDoorRepository.getInstance()
+
+  public async execute(
+    buildingId: string,
+    campaignId: string,
+    buildingType: BuildingType,
+    currentBuidlingLayout: Array<BuildingBlock>,
+  ): Promise<Array<BuildingBlock>> {
+    const remoteBlocks = await this.repository.buildingBlocks(
+      buildingId,
+      campaignId,
+    )
+
+    const localBuildingBlocks = currentBuidlingLayout.filter(
+      (item) => item.local || item.floors.some((floor) => floor.local),
+    )
+
+    const blocksMap = remoteBlocks.reduce((map, block) => {
+      return map.set(block.name, block)
+    }, new Map<string, BuildingBlock>())
+
+    localBuildingBlocks.forEach((localBlock) => {
+      if (blocksMap.has(localBlock.name)) {
+        // Add missing local floors to building block
+        const currentBlock = blocksMap.get(localBlock.name)
+        if (currentBlock) {
+          const floors = currentBlock?.floors ?? []
+          const floorsMap = floors.reduce((map, floor) => {
+            return map.set(floor.number, floor)
+          }, new Map<number, BuildingBlockFloor>())
+
+          localBlock.floors.forEach((floor) => {
+            if (!floorsMap?.has(floor.number)) {
+              floorsMap.set(floor.number, floor)
+            }
+          })
+
+          currentBlock.floors = Array.from(floorsMap.values())
+        }
+      } else {
+        // Add missing local building block
+        blocksMap.set(localBlock.name, localBlock)
+      }
+    })
+
+    const mergedBlocks = Array.from(blocksMap.values())
+    if (mergedBlocks.length === 0) {
+      mergedBlocks.push(
+        this.buildingBlockHelper.createLocalBlock(
+          AlphabetHelper.firstLetterInAlphabet,
+          buildingType,
+        ),
+      )
+    }
+
+    return mergedBlocks
+  }
+}

src/data/mapper/DoorToDoorMapper.ts

@@ -8,7 +8,7 @@ export const DoorToDoorMapper = {
     const buildingType = restObject.building.type
     if (rest_campaign !== null && buildingType !== null) {
       const campaign = {
-        numberOfDoors: rest_campaign.nb_doors,
+        numberOfDoors: rest_campaign.nb_visited_doors,
         numberOfSurveys: rest_campaign.nb_surveys,
         status: rest_campaign.status,
         id: rest_campaign.uuid,

src/data/mapper/RestDoorToDoorPollRequestMapper.ts

@@ -12,7 +12,7 @@ export const RestDoorToDoorPollRequestMapper = {
     return {
       ...RestPollExtraAnswersRequestMapper.map(pollResult.qualificationAnswers),
       campaign: pollParams.campaignId,
-      status: pollParams.interlocutorStatus,
+      status: pollParams.status,
       building: pollParams.buildingId,
       building_block: pollParams.block,
       floor: pollParams.floor,

src/data/restObjects/BuildingLayoutMapper.ts

@@ -10,14 +10,14 @@ export const BuildingLayoutMapper = {
           return {
             number: restFloor.number,
             id: restFloor.uuid,
-            status: restFloor.campaign_statistics.status,
-            nbSurveys: restFloor.campaign_statistics.nb_surveys,
-            visitedDoors: restFloor.campaign_statistics.visited_doors,
+            status: restFloor.campaign_statistics?.status ?? 'todo',
+            nbSurveys: restFloor.campaign_statistics?.nb_surveys ?? 0,
+            visitedDoors: restFloor.campaign_statistics?.visited_doors ?? [],
             local: false,
           }
         }),
         id: restBlock.uuid,
-        status: restBlock.campaign_statistics.status,
+        status: restBlock.campaign_statistics?.status ?? 'todo',
         local: false,
       }
     })

src/data/restObjects/RestBuildingBlock.ts

@@ -2,7 +2,7 @@ export interface RestBuildingBlock {
   name: string
   floors: RestBuildingBlockFloor[]
   uuid: string
-  campaign_statistics: RestBuildingBlockCampaignStatistics
+  campaign_statistics?: RestBuildingBlockCampaignStatistics
 }
 
 export interface RestBuildingBlockCampaignStatistics {
@@ -12,7 +12,7 @@ export interface RestBuildingBlockCampaignStatistics {
 export type RestBuildingBlockFloor = {
   number: number
   uuid: string
-  campaign_statistics: RestBuildingBlockFloorCampaignStatistics
+  campaign_statistics?: RestBuildingBlockFloorCampaignStatistics
 }
 
 export type RestBuildingBlockFloorCampaignStatistics = {

src/data/restObjects/RestDoorToDoorAddress.ts

@@ -12,7 +12,7 @@ export interface RestDoorToDoorAddress {
     uuid: string
     campaign_statistics: {
       uuid: string
-      nb_doors: number
+      nb_visited_doors: number
       nb_surveys: number
       last_passage: string | null
       status: 'todo' | 'ongoing' | 'completed'