From 7a5290a1c835c353b5fad96456f2fe4642a4bcd9 Mon Sep 17 00:00:00 2001 From: Alberto Di Gioacchino Date: Fri, 15 Jan 2021 10:09:25 +0100 Subject: [PATCH] refactor(app-general): use firebase enums singular --- .../src/_shared/dynamicData/apis/retrieveDynamicData.ts | 6 +++--- packages/game-app/src/createGame/apis/callCreateGame.ts | 4 ++-- packages/game-app/src/gameView/apis/callLoadCards.ts | 4 ++-- packages/game-app/src/signup/apis/executeSignup.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/game-app/src/_shared/dynamicData/apis/retrieveDynamicData.ts b/packages/game-app/src/_shared/dynamicData/apis/retrieveDynamicData.ts index b29ad71d..ba60aed5 100644 --- a/packages/game-app/src/_shared/dynamicData/apis/retrieveDynamicData.ts +++ b/packages/game-app/src/_shared/dynamicData/apis/retrieveDynamicData.ts @@ -1,12 +1,12 @@ import firebase from 'firebase/app'; -import { DevOpsMaturitiesDoc, FirebaseCollections, FirebaseDocs, GameRolesDoc } from '@pipeline/common'; +import { DevOpsMaturitiesDoc, FirebaseCollection, FirebaseDoc, GameRolesDoc } from '@pipeline/common'; import 'firebase/firestore'; export async function executeRetrieveGameRoles(): Promise { const gameRolesDoc = await firebase .firestore() - .doc(`${FirebaseCollections.DynamicData}/${FirebaseDocs.GameRoles}`) + .doc(`${FirebaseCollection.DynamicData}/${FirebaseDoc.GameRoles}`) .get(); if (!gameRolesDoc.exists) { //TODO handle this @@ -17,7 +17,7 @@ export async function executeRetrieveGameRoles(): Promise { export async function executeRetrieveDevOpsMaturities(): Promise { const devOpsMaturitiesDoc = await firebase .firestore() - .doc(`${FirebaseCollections.DynamicData}/${FirebaseDocs.DevOpsMaturities}`) + .doc(`${FirebaseCollection.DynamicData}/${FirebaseDoc.DevOpsMaturities}`) .get(); if (!devOpsMaturitiesDoc.exists) { //TODO handle this diff --git a/packages/game-app/src/createGame/apis/callCreateGame.ts b/packages/game-app/src/createGame/apis/callCreateGame.ts index d94542e3..1aaebf00 100644 --- a/packages/game-app/src/createGame/apis/callCreateGame.ts +++ b/packages/game-app/src/createGame/apis/callCreateGame.ts @@ -1,14 +1,14 @@ import { GameCreationData } from '../types/gameCreationData'; import firebase from 'firebase/app'; import 'firebase/firestore'; -import { FirebaseCollections, Game } from '@pipeline/common'; +import { FirebaseCollection, Game } from '@pipeline/common'; const DEFAULT_DECK_ID = '7p5qqvE8kCV9WWysVc2n'; export default function callCreateGame(data: GameCreationData, userId: string): Promise { return firebase .firestore() - .collection(FirebaseCollections.Games) + .collection(FirebaseCollection.Games) .add({ scenarioContent: data.scenarioContent, scenarioTitle: data.scenarioTitle, diff --git a/packages/game-app/src/gameView/apis/callLoadCards.ts b/packages/game-app/src/gameView/apis/callLoadCards.ts index 8027c94b..c7de9f8e 100644 --- a/packages/game-app/src/gameView/apis/callLoadCards.ts +++ b/packages/game-app/src/gameView/apis/callLoadCards.ts @@ -1,9 +1,9 @@ import firebase from 'firebase/app'; import 'firebase/firestore'; -import { CardEntity, FirebaseCollections } from '@pipeline/common'; +import { CardEntity, FirebaseCollection } from '@pipeline/common'; export default async function loadCards(): Promise { - const cards = await firebase.firestore().collection(FirebaseCollections.Cards).get(); + const cards = await firebase.firestore().collection(FirebaseCollection.Cards).get(); return cards.docs.map(d => ({ id: d.id, ...d.data() } as CardEntity)); } diff --git a/packages/game-app/src/signup/apis/executeSignup.ts b/packages/game-app/src/signup/apis/executeSignup.ts index 17c0f846..af423f75 100644 --- a/packages/game-app/src/signup/apis/executeSignup.ts +++ b/packages/game-app/src/signup/apis/executeSignup.ts @@ -1,6 +1,6 @@ import { SignupInfo } from '../types/signupInfo'; import firebase from 'firebase/app'; -import { FirebaseCollections } from '@pipeline/common'; +import { FirebaseCollection } from '@pipeline/common'; import 'firebase/auth'; import 'firebase/firestore'; import { AuthUser } from '../../_shared/auth/slice'; @@ -10,7 +10,7 @@ export async function executeSignup(signupInfo: SignupInfo): Promise { if (credentials.user) { const user = credentials.user; try { - await firebase.firestore().doc(`${FirebaseCollections.Users}/${user?.uid}`).set({ + await firebase.firestore().doc(`${FirebaseCollection.Users}/${user?.uid}`).set({ email: signupInfo.email, role: signupInfo.role, devOpsMaturity: signupInfo.devOpsMaturity,