Merge branch 'main' into prod

README.md

@@ -0,0 +1,20 @@
+# MidJourney Cloud Function
+
+This is a Google Cloud Function used to access the MidJourney Discord channel on my Discord Server and query the MidJourney bot to generate stuff. This function is triggered when a new document (generation) is created.
+
+## How it works
+
+```mermaid
+graph TB;
+    weather_journey_app[Weather Journey App] -->|User selects a location| generation_process[Initiate Generation Process]
+    generation_process -->|API request| weather_journey_image_api[Weather Journey Image API]
+    weather_journey_image_api -->|Fetch weather data & craft ChatGPT prompt| midJourneyPrompt[Create Generation Document in Firestore]
+    midJourneyPrompt -->|Document creation triggers| cloudFunction[Cloud Function]
+    cloudFunction -->|Function invokes| midJourney[MidJourney Bot]
+
+    classDef classDefault fill:#fff,stroke:#333,stroke-width:1px;
+    classDef classLink stroke:#333,stroke-width:1px;
+    class weather_journey_app,generation_process,weather_journey_image_api,midJourneyPrompt,cloudFunction,midJourney classDefault;
+    linkStyle default classLink;
+```
+

functions/src/entities/generation.entity.ts

@@ -20,7 +20,7 @@ export class Generation {
     return new Generation(id, data.generatedImage, data.progress, data.prompt, data.createdAt);
   }
 
-  static fromJson(data: any): Generation {
+  static fromJSON(data: any): Generation {
     return new Generation(data.id, data.generatedImage, data.progress, data.prompt, data.createdAt);
   }
 
@@ -34,7 +34,7 @@ export class Generation {
     };
   }
 
-  toJson(): any {
+  toJSON(): any {
     return {
       id: this.id,
       generatedImage: (this.generatedImage == null) ? null : this.generatedImage.toJSON(),

functions/src/entities/location.entity.ts

@@ -0,0 +1,39 @@
+export class Location {
+    id: string;
+    city: string;
+    latitude: number;
+    longitude: number;
+
+    public constructor(id: string, city: string, latitude: number, longitude: number) {
+        this.id = id;
+        this.city = city;
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
+    static fromFirestoreDocument(id: any, data: any): Location {
+        return new Location(id, data.city, data.latitude, data.longitude);
+    }
+
+    static fromJson(data: any): Location {
+        return new Location(data.id, data.city, data.latitude, data.longitude);
+    }
+
+    toFirestoreDocument(): any {
+        return {
+            id: this.id,
+            city: this.city,
+            latitude: this.latitude,
+            longitude: this.longitude,
+        };
+    }
+
+    toJson(): any {
+        return {
+            id: this.id,
+            city: this.city,
+            latitude: this.latitude,
+            longitude: this.longitude,
+        };
+    }
+}

functions/src/entities/root-generation-user.entity.ts

@@ -0,0 +1,61 @@
+export class RootGenerationUser {
+    id: string;
+    firstname: string;
+    lastname: string;
+    email: string;
+
+    public constructor(
+        id: string,
+        firstname: string,
+        lastname: string,
+        email: string,
+    ) {
+        this.id = id;
+        this.firstname = firstname;
+        this.lastname = lastname;
+        this.email = email;
+    }
+
+    static fromFirestoreDocument(id: any, data: any): RootGenerationUser {
+        return new RootGenerationUser(
+            id,
+            data.firstname,
+            data.lastname,
+            data.email,
+        );
+    }
+
+    static fromJson(data: any): RootGenerationUser {
+        return new RootGenerationUser(
+            data.id,
+            data.firstname,
+            data.lastname,
+            data.email,
+        );
+    }
+
+    toFirestoreDocument(): any {
+        const firestoreDocument: any = {
+            id: this.id,
+            firstname: this.firstname,
+            lastname: this.lastname,
+            email: this.email,
+        };
+        //Remove all undefined values
+        Object.keys(firestoreDocument).forEach(
+            (key) =>
+                firestoreDocument[key] === undefined && delete firestoreDocument[key],
+        );
+
+        return firestoreDocument;
+    }
+
+    toJson(): any {
+        return {
+            id: this.id,
+            firstname: this.firstname,
+            lastname: this.lastname,
+            email: this.email,
+        };
+    }
+}

functions/src/entities/root-generation.entity.ts

@@ -0,0 +1,43 @@
+import {Generation} from "./generation.entity";
+import {Location} from "./location.entity";
+import {RootGenerationUser} from "./root-generation-user.entity";
+
+export class RootGeneration {
+    id: string;
+    generation: Generation;
+    location: Location;
+    user: RootGenerationUser;
+
+    public constructor(id: string, generation: Generation, location: Location, user: RootGenerationUser) {
+        this.id = id;
+        this.generation = generation;
+        this.location = location;
+        this.user = user;
+    }
+
+    static fromFirestoreDocument(id: any, data: any): RootGeneration {
+        return new RootGeneration(id, data.generation, data.location, data.user);
+    }
+
+    static fromJson(data: any): RootGeneration {
+        return new RootGeneration(data.id, data.generation, data.location, data.user);
+    }
+
+    toFirestoreDocument(): any {
+        return {
+            id: this.id,
+            generation: (this.generation == null) ? null : this.generation.toFirestoreDocument(),
+            location: (this.location == null) ? null : this.location.toFirestoreDocument(),
+            user: (this.user == null) ? null : this.user.toFirestoreDocument(),
+        };
+    }
+
+    toJson(): any {
+        return {
+            id: this.id,
+            generatedImage: (this.generation == null) ? null : this.generation.toJSON(),
+            location: (this.location == null) ? null : this.location.toJson(),
+            user: (this.user == null) ? null : this.user.toJson(),
+        };
+    }
+}

functions/src/index.ts

@@ -2,6 +2,9 @@ import * as functions from "firebase-functions";
 import { Generation } from "./entities/generation.entity";
 import { ImageGeneratorService } from "./services/image_generator.service";
 import * as admin from 'firebase-admin';
+import {RootGeneration} from "./entities/root-generation.entity";
+import {Location} from "./entities/location.entity";
+import {RootGenerationUser} from "./entities/root-generation-user.entity";
 
 admin.initializeApp();
 const db = admin.firestore();
@@ -36,6 +39,19 @@ export const onGenerationCreated = functions.runWith({ timeoutSeconds: 160 }).re
 
     });
     imageGeneratorService.offProgress();
+
+    const userRef = db.collection('users').doc(context.params.userId);
+    const user = await userRef.get();
+
+    const locationRef = db.collection('users').doc(context.params.userId).collection('locations').doc(context.params.locationId);
+    const location = await locationRef.get();
+
+    //Create a generation document in root generations collection for easy access
+    const generationRef = db.collection('generations').doc(generationId);
+    console.log("Saving generation to root generations collection")
+    console.log(new RootGeneration(generationId, generation, Location.fromFirestoreDocument(location.id, location.data()), RootGenerationUser.fromFirestoreDocument(user.id, user.data())).toFirestoreDocument());
+    await generationRef.set(new RootGeneration(generationId, generation, Location.fromFirestoreDocument(location.id, location.data()), RootGenerationUser.fromFirestoreDocument(user.id, user.data())).toFirestoreDocument());
+
 });