Merge pull request #20 from SinSo-API/dev

bugfix: song-suggestion-missing-sinhala-details

Author: VishalRashmika

doc/openapi.spec.ts

@@ -1165,6 +1165,16 @@ export const generateOpenAPISpec = () => {
               type: 'string', 
               example: 'Lyricist Name',
               description: 'Name of the lyricist (Optional)'
+            },
+            submitter_name: { 
+              type: 'string', 
+              example: 'Sample User',
+              description: 'Name of the person submitting the suggestion (Optional)'
+            },
+            submitter_email: { 
+              type: 'string', 
+              example: 'example@example.com',
+              description: 'Email of the person submitting the suggestion (Optional)'
             }
           }
         },

src/models/Suggestion.ts

@@ -2,9 +2,15 @@ export interface Suggestion {
   id?: number;
   title: string;
   artist: string;
+  songNameSinhala?: string | null;
+  artistNameSinhala?: string | null;
   album?: string | null;
   year?: number | null;
   lyrics: string;
+  lyricContentSinhala?: string | null;
+  duration?: number | null;
+  composer?: string | null;
+  lyricist?: string | null;
   submitter_name?: string | null;
   submitter_email?: string | null;
   status: 'pending' | 'approved' | 'rejected';
@@ -16,9 +22,15 @@ export interface Suggestion {
 export interface SuggestionCreateInput {
   title: string;
   artist: string;
+  title_sinhala?: string;
+  artist_sinhala?: string;
   album?: string;
   year?: number;
   lyrics: string;
+  lyrics_sinhala?: string;
+  duration?: number;
+  composer?: string;
+  lyricist?: string;
   submitter_name?: string;
   submitter_email?: string;
 }

src/routes/suggestions.ts

@@ -18,7 +18,7 @@ suggestionsRouter.get('/health', (c) => {
 suggestionsRouter.post('/', async (c) => {
   try {
     const body = await c.req.json<SuggestionCreateInput>();
-    const { title, artist, album, year, lyrics, submitter_name, submitter_email } = body;
+    const { title, artist, title_sinhala, artist_sinhala, album, year, lyrics, lyrics_sinhala, duration, composer, lyricist, submitter_name, submitter_email } = body;
 
     // Validation
     if (!title || !artist || !lyrics) {
@@ -50,15 +50,7 @@ suggestionsRouter.post('/', async (c) => {
     }
 
     const service = new SuggestionsService(c.env.sinso_api_db);
-    const result = await service.createSuggestion({
-      title,
-      artist,
-      album,
-      year,
-      lyrics,
-      submitter_name,
-      submitter_email
-    });
+    const result = await service.createSuggestion(body);
 
     return c.json(
       {

src/services/suggestionsService.ts

@@ -4,18 +4,31 @@ export class SuggestionsService {
   constructor(private db: D1Database) {}
 
   async createSuggestion(input: SuggestionCreateInput): Promise<{ id: number; suggestion: Suggestion }> {
+    console.log('Creating suggestion with input:', JSON.stringify(input, null, 2));
+    console.log('Sinhala fields:', {
+      title_sinhala: input.title_sinhala,
+      artist_sinhala: input.artist_sinhala,
+      lyrics_sinhala: input.lyrics_sinhala
+    });
+    
     const result = await this.db
       .prepare(
         `INSERT INTO pending_suggestions 
-         (title, artist, album, year, lyrics, submitter_name, submitter_email, status, created_at) 
-         VALUES (?, ?, ?, ?, ?, ?, ?, 'pending', datetime('now'))`
+         (title, artist, songNameSinhala, artistNameSinhala, album, year, lyrics, lyricContentSinhala, duration, composer, lyricist, submitter_name, submitter_email, status, created_at) 
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending', datetime('now'))`
       )
       .bind(
         input.title,
         input.artist,
+        input.title_sinhala || null,
+        input.artist_sinhala || null,
         input.album || null,
         input.year || null,
         input.lyrics,
+        input.lyrics_sinhala || null,
+        input.duration || null,
+        input.composer || null,
+        input.lyricist || null,
         input.submitter_name || null,
         input.submitter_email || null
       )
@@ -29,9 +42,15 @@ export class SuggestionsService {
         id: suggestionId,
         title: input.title,
         artist: input.artist,
+        songNameSinhala: input.title_sinhala || null,
+        artistNameSinhala: input.artist_sinhala || null,
         album: input.album || null,
         year: input.year || null,
         lyrics: input.lyrics,
+        lyricContentSinhala: input.lyrics_sinhala || null,
+        duration: input.duration || null,
+        composer: input.composer || null,
+        lyricist: input.lyricist || null,
         submitter_name: input.submitter_name || null,
         submitter_email: input.submitter_email || null,
         status: 'pending',
@@ -43,7 +62,7 @@ export class SuggestionsService {
   async getSuggestionStatus(id: number): Promise<Suggestion | null> {
     const suggestion = await this.db
       .prepare(
-        `SELECT id, title, artist, status, created_at, reviewed_at 
+        `SELECT id, title, artist, songNameSinhala, artistNameSinhala, status, created_at, reviewed_at 
          FROM pending_suggestions 
          WHERE id = ?`
       )
@@ -56,8 +75,8 @@ export class SuggestionsService {
   async getAllSuggestions(status: string = 'pending'): Promise<Suggestion[]> {
     const { results } = await this.db
       .prepare(
-        `SELECT id, title, artist, album, year, lyrics, 
-                submitter_name, submitter_email, status, created_at, reviewed_at, rejection_reason 
+        `SELECT id, title, artist, songNameSinhala, artistNameSinhala, album, year, lyrics, lyricContentSinhala,
+                duration, composer, lyricist, submitter_name, submitter_email, status, created_at, reviewed_at, rejection_reason 
          FROM pending_suggestions 
          WHERE status = ?
          ORDER BY created_at DESC`