Merge pull request #45 from quinnturner/cloud-fns-cleanup

Cloud functions updates and clean up
caravanapp-ca · Sep 19, 2020 · 9798a74 · 9798a74
2 parents afdc1bb + 5258aac
commit 9798a74
Show file tree

Hide file tree

Showing 10 changed files with 618 additions and 433 deletions.
diff --git a/cloud-functions/functions/src/db.ts b/cloud-functions/functions/src/db.ts
@@ -1,6 +1,7 @@
-import { Firestore } from '@google-cloud/firestore';
 import mongoose, { ConnectionOptions } from 'mongoose';
 
+import { Firestore } from '@google-cloud/firestore';
+
 const firestore = new Firestore();
 
 const dbConnectionString = process.env.MONGO_DB;

diff --git a/cloud-functions/functions/src/discordMessenger.ts b/cloud-functions/functions/src/discordMessenger.ts
@@ -1,7 +1,9 @@
-import { Message, MessageOptions, Channel, TextChannel } from 'discord.js';
-import { Firestore } from '@caravanapp/types';
-import { shouldSendWithLease, markSent } from './idempotent';
+import { Channel, Message, MessageOptions, TextChannel } from 'discord.js';
+
+import type { Firestore } from '@caravanapp/types';
+
 import { firestore } from './db';
+import { markSent, shouldSendWithLease } from './idempotent';
 
 export const sendDiscordMessage = async (
   eventId: string,

diff --git a/cloud-functions/functions/src/email.ts b/cloud-functions/functions/src/email.ts
@@ -1,5 +1,5 @@
-import { shouldSendWithLease, markSent } from './idempotent';
 import { firestore } from './db';
+import { markSent, shouldSendWithLease } from './idempotent';
 
 export const sendEmail = async (eventId: string) => {
   const emailRef = firestore.collection('sentEmails').doc(eventId);

diff --git a/cloud-functions/functions/src/idempotent.ts b/cloud-functions/functions/src/idempotent.ts
@@ -1,6 +1,7 @@
-import { DocumentReference, DocumentData } from '@google-cloud/firestore';
+import type { DocumentData, DocumentReference } from '@google-cloud/firestore';
+
+import { IdempotentSendData } from '../';
 import { firestore } from './db';
-import { IdempotentSendData } from '..';
 
 const leaseTime = 60 * 1000; // 60s
 

diff --git a/cloud-functions/functions/src/pubsub/onClubMembershipChange.ts b/cloud-functions/functions/src/pubsub/onClubMembershipChange.ts
@@ -1,11 +1,11 @@
-import { CloudFunctionsContext } from '@google-cloud/functions-framework';
+import type { CloudFunctionsContext } from '@google-cloud/functions-framework/build/src/functions';
 import type { PubSub as PubSubTypes } from '@caravanapp/types';
+import type { EventData } from '../..';
+import { connect } from '../db';
 import { ReadingDiscordBot } from '../discord';
 import { sendDiscordMessage } from '../discordMessenger';
-import { getUser, getUserProfileUrl } from '../services/user';
 import { getClub } from '../services/club';
-import { connect } from '../db';
-import { EventData } from '../..';
+import { getUser, getUserProfileUrl } from '../services/user';
 
 export const onJoinClub = async (
   context: Required<CloudFunctionsContext>,

diff --git a/cloud-functions/functions/src/services/user.ts b/cloud-functions/functions/src/services/user.ts
@@ -1,7 +1,8 @@
-import { GuildMember } from 'discord.js';
+import type { GuildMember } from 'discord.js';
+
+import { checkObjectIdIsValid } from '../workspace/mongo/common/mongoose';
 // These imports will only exist after building
 import { UserDoc, UserModel } from '../workspace/mongo/models/user';
-import { checkObjectIdIsValid } from '../workspace/mongo/common/mongoose';
 
 export const getUserProfileUrl = (urlSlug: string) =>
   `https://caravanapp.ca/user/${urlSlug}`;

diff --git a/cloud-functions/functions/src/test/sendgrid.ts b/cloud-functions/functions/src/test/sendgrid.ts
@@ -1,5 +1,6 @@
+import type { HttpFunction } from '@google-cloud/functions-framework/build/src/functions';
 import sgMail from '@sendgrid/mail';
-import { HttpFunction } from '@google-cloud/functions-framework';
+
 import { loadLocalEnv } from './loadenv';
 
 export const testSendGrid: HttpFunction = async (req, res) => {

diff --git a/cloud-functions/functions/yarn.lock b/cloud-functions/functions/yarn.lock
diff --git a/packages/mongo/src/common/mongoose.ts b/packages/mongo/src/common/mongoose.ts
@@ -2,7 +2,7 @@ import { Schema, SchemaType, SchemaTypeOpts, Types } from 'mongoose';
 
 import type { FilterAutoMongoKeys } from '@caravanapp/types';
 
-export function checkObjectIdIsValid(id: string) {
+export function checkObjectIdIsValid(id: string): boolean {
   return (
     Types.ObjectId.isValid(id) && new Types.ObjectId(id).toHexString() === id
   );

diff --git a/packages/mongo/src/models/club.ts b/packages/mongo/src/models/club.ts
@@ -47,7 +47,7 @@ export const shelfSchemaDefinition: MongooseSchema<ShelfEntry> = {
     required: true,
     index: true,
     validate: {
-      validator: function (v: BookSource) {
+      validator: function (v: BookSource): boolean {
         return ALLOWED_BOOK_SOURCES[v] === true;
       },
     },