Merge pull request #10 from parkcoool/dev

dev

Author: parkcoool

.github/workflows/deploy-functions.yml

@@ -0,0 +1,39 @@
+name: Deploy Firebase Functions
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "apps/functions/**"
+      - "packages/schemas/**"
+      - ".github/workflows/deploy-functions.yml"
+
+jobs:
+  deploy_functions:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Build Functions
+        working-directory: apps/functions
+        run: npm run build
+
+      - name: Deploy to Firebase
+        uses: firebase/[email protected]
+        with:
+          args: deploy --only functions
+        env:
+          FIREBASE_CONFIG: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_KEY }}
+          PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}

.gitignore

@@ -5,4 +5,6 @@
 firebase-debug.log
 firestore-debug.log
 
-dist
+dist
+
+dev-data

apps/frontend/android/app/src/main/java/com/anonymous/lymoapp/MediaModule.kt

@@ -51,28 +51,39 @@ class MediaModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaM
         return Base64.encodeToString(byteArray, Base64.DEFAULT)
     }
 
-    private fun sendMediaData() {
+    private fun createMediaDataMap(): WritableMap? {
         val controller = mediaController
         val metadata = controller?.metadata
         val state = controller?.playbackState
 
         if (controller == null || metadata == null || state == null) {
-            sendEvent("onMediaDataChanged", null)
-            return
+            return null
         }
 
         val albumArtBitmap = metadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART)
         val albumArtBase64 = "data:image/png;base64," + bitmapToBase64(albumArtBitmap)
 
-        val mediaData = Arguments.createMap().apply {
+        return Arguments.createMap().apply {
             putString("title", metadata.getString(MediaMetadata.METADATA_KEY_TITLE))
             putString("artist", metadata.getString(MediaMetadata.METADATA_KEY_ARTIST))
             putString("album", metadata.getString(MediaMetadata.METADATA_KEY_ALBUM))
             putDouble("duration", metadata.getLong(MediaMetadata.METADATA_KEY_DURATION).toDouble())
             putBoolean("isPlaying", state.state == PlaybackState.STATE_PLAYING)
-            putString("coverUrl", albumArtBase64)
+            putString("albumArt", albumArtBase64)
+        }
+    }
+
+    private fun sendMediaData() {
+        sendEvent("onMediaDataChanged", createMediaDataMap())
+    }
+
+    @ReactMethod
+    fun getCurrentMediaState(promise: Promise) {
+        try {
+            promise.resolve(createMediaDataMap())
+        } catch (e: Exception) {
+            promise.reject("GET_MEDIA_STATE_ERROR", e.message)
         }
-        sendEvent("onMediaDataChanged", mediaData)
     }
 
     private fun sendEvent(eventName: String, params: WritableMap?) {

apps/frontend/apis/addTrack.ts

@@ -1,4 +1,4 @@
-import type { TrackDoc } from "@lymo/schemas/doc";
+import type { Track } from "@lymo/schemas/doc";
 import {
   collection,
   getDocs,
@@ -11,9 +11,9 @@ import {
 import db from "@/core/firestore";
 
 export default async function getNewTracks() {
-  const tracksCollection = collection(db, "tracks");
-  const q = query(tracksCollection, orderBy("createdAt", "desc"), limit(10));
-  const trackDocs = (await getDocs(q)) as FirebaseFirestoreTypes.QuerySnapshot<TrackDoc>;
+  const trackCollectionRef = collection(db, "tracks");
+  const q = query(trackCollectionRef, orderBy("createdAt", "desc"), limit(10));
+  const trackDocs = (await getDocs(q)) as FirebaseFirestoreTypes.QuerySnapshot<Track>;
 
   const result = trackDocs.docs.map((doc) => ({ ...doc.data(), id: doc.id }));
   return result;

apps/frontend/apis/generateDetail.ts

@@ -1,4 +1,4 @@
-import type { TrackDoc } from "@lymo/schemas/doc";
+import type { Track } from "@lymo/schemas/doc";
 import {
   collection,
   getDocs,
@@ -11,14 +11,14 @@ import {
 import db from "@/core/firestore";
 
 export default async function getPopularTracks() {
-  const tracksCollection = collection(db, "tracks");
+  const trackCollectionRef = collection(db, "tracks");
   const q = query(
-    tracksCollection,
-    orderBy("play", "desc"),
+    trackCollectionRef,
+    orderBy("stats.viewCount", "desc"),
     orderBy("createdAt", "asc"),
     limit(20)
   );
-  const trackDocs = (await getDocs(q)) as FirebaseFirestoreTypes.QuerySnapshot<TrackDoc>;
+  const trackDocs = (await getDocs(q)) as FirebaseFirestoreTypes.QuerySnapshot<Track>;
 
   const result = trackDocs.docs.map((doc) => ({ ...doc.data(), id: doc.id }));
   return result;

apps/frontend/apis/getLyrics.ts

@@ -0,0 +1,32 @@
+import type { Story } from "@lymo/schemas/doc";
+import { Language } from "@lymo/schemas/shared";
+import {
+  collection,
+  getDocs,
+  limit,
+  query,
+  where,
+  type FirebaseFirestoreTypes,
+} from "@react-native-firebase/firestore";
+
+import db from "@/core/firestore";
+
+interface GetStoryByTrackIdParams {
+  trackId: string;
+  language: Language;
+}
+
+export default async function getStoryByTrackId({ trackId, language }: GetStoryByTrackIdParams) {
+  const storyCollectionRef = collection(db, "stories");
+  const q = query(
+    storyCollectionRef,
+    where("language", "==", language),
+    where("trackId", "==", trackId),
+    limit(1)
+  );
+
+  const storyDoc = (await getDocs(q)).docs[0] as
+    | FirebaseFirestoreTypes.QueryDocumentSnapshot<Story>
+    | undefined;
+  return storyDoc?.data() ?? null;
+}