Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add function for pins after user updates #3852

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions functions/src/discussionUpdates/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { firestore } from 'firebase-admin'
import * as functions from 'firebase-functions'

import { db } from '../Firebase/firestoreDB'
import { DB_ENDPOINTS } from '../models'

import type { IUserDB, IDiscussion } from '../models'
import type { firestore } from 'firebase-admin'
import type { IDiscussion, IUserDB } from '../models'

/*********************************************************************
* Side-effects to be carried out on various question updates, namely:
Expand All @@ -21,7 +21,6 @@ export const handleDiscussionUpdate = functions
async function updateDocument(
change: functions.Change<firestore.QueryDocumentSnapshot>,
) {
// add new comments to user.stats.userCreatedComments
const addedComments = getAddedComments(change)
for (const addedComment of addedComments) {
const commentId = addedComment._id
Expand All @@ -31,10 +30,12 @@ async function updateDocument(
.get()
const user = userSnapshot.docs[0].data() as IUserDB

let userCreatedComments = user.stats?.userCreatedComments ?? {}
const _lastActive = Date.now().toString(16)
const userCreatedComments = user.stats?.userCreatedComments ?? {}
userCreatedComments[commentId] = addedComment.parentCommentId

await userSnapshot.docs[0].ref.update({
_lastActive,
'stats.userCreatedComments': userCreatedComments,
})
}
Expand All @@ -49,10 +50,12 @@ async function updateDocument(
.get()
const user = userSnapshot.docs[0].data() as IUserDB

let userCreatedComments = user.stats?.userCreatedComments ?? {}
const _lastActive = Date.now().toString(16)
const userCreatedComments = user.stats?.userCreatedComments ?? {}
delete userCreatedComments[commentId]

await userSnapshot.docs[0].ref.update({
_lastActive,
'stats.userCreatedComments': userCreatedComments,
})
}
Expand Down
8 changes: 4 additions & 4 deletions functions/src/emulator/seed/users-create.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { MOCK_AUTH_USERS } from 'oa-shared/mocks/auth'
import type { IUserDB } from '../../models'

import { firebaseAuth } from '../../Firebase/auth'
import { setDoc } from '../../Firebase/firestoreDB'
import { IModerationStatus } from 'oa-shared'

import type { IUserDB } from '../../models'

/**
* Create auth users to allow sign-in on firebase emulators
Expand Down Expand Up @@ -43,11 +44,10 @@ export async function seedUsersCreate() {
_deleted: false,
displayName: user.label,
userName: uid,
moderation: IModerationStatus.AWAITING_MODERATION,
notifications: [],
userRoles: roles,
links: [],
['profileType' as any]: 'member', // include pp profile field
profileType: 'member',
coverImages: [],
verified: true,
}
Expand Down
12 changes: 8 additions & 4 deletions functions/src/questionUpdates/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { firestore } from 'firebase-admin'
import * as functions from 'firebase-functions'

import { db } from '../Firebase/firestoreDB'
import { DB_ENDPOINTS } from '../models'

import type { IUserDB, IQuestionDB } from '../models'
import type { firestore } from 'firebase-admin'
import type { IQuestionDB, IUserDB } from '../models'

/*********************************************************************
* Side-effects to be carried out on various question updates, namely:
Expand Down Expand Up @@ -41,10 +41,12 @@ async function updateDocument(docSnapshot: firestore.QueryDocumentSnapshot) {
.get()
const user = userSnapshot.docs[0].data() as IUserDB

let userCreatedQuestions = user.stats?.userCreatedQuestions ?? {}
const _lastActive = Date.now().toString(16)
const userCreatedQuestions = user.stats?.userCreatedQuestions ?? {}
userCreatedQuestions[question_id] = question.moderation

await userSnapshot.docs[0].ref.update({
_lastActive,
'stats.userCreatedQuestions': userCreatedQuestions,
})
}
Expand All @@ -59,10 +61,12 @@ async function deleteDocument(docSnapshot: firestore.QueryDocumentSnapshot) {
.get()
const user = userSnapshot.docs[0].data() as IUserDB

let userCreatedQuestions = user.stats?.userCreatedQuestions ?? {}
const _lastActive = Date.now().toString(16)
const userCreatedQuestions = user.stats?.userCreatedQuestions ?? {}
delete userCreatedQuestions[question_id]

await userSnapshot.docs[0].ref.update({
_lastActive,
'stats.userCreatedQuestions': userCreatedQuestions,
})
}
40 changes: 0 additions & 40 deletions functions/src/userUpdates/hasKeyDetailsChanged.ts

This file was deleted.

6 changes: 4 additions & 2 deletions functions/src/userUpdates/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { db } from '../Firebase/firestoreDB'
import { DB_ENDPOINTS } from '../models'
import { backupUser } from './backupUser'
import { updateDiscussionComments } from './updateDiscussionComments'
import { updateMapPins } from './updateMapPins'

import type { IDBDocChange, IUserDB } from '../models'

Expand All @@ -17,12 +18,12 @@ import type { IDBDocChange, IUserDB } from '../models'
export const handleUserUpdates = functions
.runWith({ memory: '512MB' })
.firestore.document(`${DB_ENDPOINTS.users}/{id}`)
.onUpdate(async (change, context) => {
.onUpdate(async (change, _) => {
await backupUser(change)
await updateDocuments(change)
})

const isUserCountryDifferent = (prevInfo, info) => {
const isUserCountryDifferent = (prevInfo: IUserDB, info: IUserDB) => {
const prevCountryCode = prevInfo.location?.countryCode
const newCountryCode = info.location?.countryCode
const prevCountry = prevInfo.country
Expand All @@ -48,6 +49,7 @@ async function updateDocuments(change: IDBDocChange) {
}

await updateDiscussionComments(prevInfo, info)
await updateMapPins(prevInfo, info)

const didDelete = prevDeleted !== deleted && deleted
if (didDelete) {
Expand Down
16 changes: 5 additions & 11 deletions functions/src/userUpdates/updateDiscussionComments.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
import { DB_ENDPOINTS } from 'oa-shared'

import { db } from '../Firebase/firestoreDB'
import { hasKeyDetailsChanged } from './hasKeyDetailsChanged'
import { getCreatorImage, hasDetailsForCommentsChanged } from './utils'

import type { IDiscussion, IUserDB } from '../models'

export const updateDiscussionComments = async (
prevUser: IUserDB,
user: IUserDB,
) => {
if (!hasKeyDetailsChanged(prevUser, user)) return
if (!hasDetailsForCommentsChanged(prevUser, user)) return

const snapshot = await db
.collection(DB_ENDPOINTS.discussions)
.where('contributorIds', 'array-contains', user._id)
.get()

if (!snapshot.empty) {
const { _id, badges, userImage, location } = user
const { _id, badges, country, userImage, location } = user
const creatorImage = getCreatorImage(userImage)
const creatorCountry = location?.countryCode || country || ''

const userDetails = {
creatorCountry: location?.countryCode || '',
creatorCountry,
creatorImage,
isUserVerified: !!badges?.verified,
isUserSupporter: !!badges?.supporter,
Expand All @@ -47,10 +48,3 @@ export const updateDiscussionComments = async (
return console.log(`Updated ${updatedCommentCount} discussion comments`)
}
}

const getCreatorImage = (userImage: IUserDB['userImage']) => {
if (userImage && userImage.downloadUrl) {
return userImage.downloadUrl
}
return null
}
62 changes: 62 additions & 0 deletions functions/src/userUpdates/updateMapPins.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { DB_ENDPOINTS } from 'oa-shared'

import { db } from '../Firebase/firestoreDB'
import {
getCreatorImage,
getFirstCoverImage,
hasDetailsForMapPinChanged,
} from './utils'

import type { IUserDB } from '../models'

export const updateMapPins = async (prevUser: IUserDB, user: IUserDB) => {
if (!hasDetailsForMapPinChanged(prevUser, user)) {
return
}

const snapshot = await db
.collection(DB_ENDPOINTS.mappins)
.where('_id', '==', user._id)
.get()

if (snapshot.empty) {
return
}

const {
_id,
_lastActive,
about,
badges,
country,
coverImages,
displayName,
isContactableByPublic,
profileType,
subType,
userImage,
location,
} = user
const creatorImage = getCreatorImage(userImage)
const coverImage = getFirstCoverImage(coverImages)
const countryCode = location?.countryCode || country || ''

const creator = {
_lastActive,
about,
badges,
countryCode,
coverImage,
displayName,
isContactableByPublic,
profileType,
subType,
userImage: creatorImage,
}

// Only one expected
for (const doc of snapshot.docs) {
await doc.ref.update({ creator })
}
return console.log(`Updated ${_id}'s mapPin`)
}
Loading
Loading