polishin data contracts

packages/components/src/apis/client.ts

@@ -30,9 +30,9 @@ export class BaseClient {
     return (await this.api.get<T>(`${endpoint}/${identifier || identifier === 0 ? identifier : ''}`)).data
   }
 
-  protected async getResources<T>(endpoint: string, params: object = {}): Promise<T[]> {
+  protected async getResources<T>(endpoint: string, params: object = {}): Promise<T> {
     return (
-      await this.api.get<T[]>(endpoint, {
+      await this.api.get<T>(endpoint, {
         params: { ...params },
       })
     ).data

packages/components/src/apis/videos.ts → packages/components/src/apis/feeds.ts

@@ -1,21 +1,21 @@
 import { BaseClient } from './client'
 import { ENDPOINTS } from '../constants/endpoints'
-import { VideoAttributesSchema, VideoAttributes } from '@toktik/contracts'
+import { FeedsAPI } from '@toktik/contracts'
 
 export class VideosAPI extends BaseClient {
-  public async searchVideos(keywords: string, count: number): Promise<VideoAttributes[]> {
-    return this.getResources(`${ENDPOINTS.VIDEOS}/search`, {
+  public async searchVideos(keywords: string, count: number): Promise<FeedsAPI.SearchResponse> {
+    return this.getResources<FeedsAPI.SearchResponse>(`${ENDPOINTS.FEEDS}/search`, {
       keywords,
       count,
     })
   }
 
   public async getVideoById(id: string): Promise<any> {
-    return this.getResource(ENDPOINTS.VIDEOS, id)
+    return this.getResource(ENDPOINTS.FEEDS, id)
   }
 
   public async getStreamVideoById(id: string): Promise<any> {
-    return this.getResource(`${ENDPOINTS.VIDEOS}/stream`, id)
+    return this.getResource(`${ENDPOINTS.FEEDS}/stream`, id)
   }
 }
 const videosAPI = new VideosAPI()

packages/components/src/components/social-wall/SocialWallVideos.vue

@@ -3,7 +3,7 @@ import { ref, onMounted } from 'vue'
 import VLazyImage from 'v-lazy-image'
 
 import SocialWallVideoView from '@components/social-wall/SocialWallVideoView.vue'
-import videosAPI from '@apis/videos'
+import videosAPI from '@apis/feeds'
 
 const props = defineProps<{
   id?: string

packages/components/src/constants/endpoints.ts

@@ -1,4 +1,4 @@
 export const ENDPOINTS = {
-  VIDEOS: '/feeds',
+  FEEDS: '/feeds',
   RECOMMENDATIONS: '/recommendations',
 }

packages/contracts/src/v1/common/videos.ts → packages/contracts/src/v1/common/feeds.ts

@@ -25,7 +25,7 @@ const AuthorSchema = z.object({
   avatar: z.string(),
 })
 
-export const VideoAttributesSchema = z.object({
+export const FeedsAttributesSchema = z.object({
   id: z.string().optional(),
   aweme_id: z.string(),
   video_id: z.string(),
@@ -58,4 +58,4 @@ export const VideoAttributesSchema = z.object({
   is_top: z.number(),
 })
 
-export type VideoAttributes = z.infer<typeof VideoAttributesSchema>
+export type FeedsAttributes = z.infer<typeof FeedsAttributesSchema>

packages/contracts/src/v1/feeds/api.ts

@@ -0,0 +1,25 @@
+import { z } from 'zod'
+import { FeedsAttributesSchema, FeedsAttributes } from '../common/feeds'
+
+// Get
+export const GetResponseSchema = z.object({
+  data: FeedsAttributesSchema,
+})
+export type GetResponse = z.infer<typeof GetResponseSchema>
+
+export const GetRequestSchema = z.object({
+  id: z.string(),
+})
+export type GetRequest = z.infer<typeof GetRequestSchema>
+
+// Search
+export const SearchResponseSchema = z.object({
+  data: z.array(FeedsAttributesSchema),
+})
+export type SearchResponse = z.infer<typeof SearchResponseSchema>
+
+export const SearchRequestSchema = z.object({
+  keywords: z.string(),
+  count: z.string(),
+})
+export type SearchRequest = z.infer<typeof SearchRequestSchema>

packages/contracts/src/v1/index.ts

@@ -1 +1,4 @@
-export * from './common/videos'
+export * from './common/feeds'
+export * as FeedsAPI from './feeds/api'
+export * as RecommendationTagsAPI from './recommendations/tags/api'
+export * as RecommendationKeywordsAPI from './recommendations/keywords/api'

packages/contracts/src/v1/recommendations/keywords/api.ts

@@ -0,0 +1,9 @@
+// Get
+import { z } from 'zod'
+
+export const GetResponseSchema = z.object({
+  data: z.object({
+    keywords: z.array(z.string()),
+  }),
+})
+export type GetResponse = z.infer<typeof GetResponseSchema>

packages/contracts/src/v1/recommendations/tags/api.ts

@@ -0,0 +1,9 @@
+// Get
+import { z } from 'zod'
+
+export const GetResponseSchema = z.object({
+  data: z.object({
+    tags: z.array(z.string()),
+  }),
+})
+export type GetResponse = z.infer<typeof GetResponseSchema>

server/internal/recommendations/features/get_recommendation_keywords/v1/dtos/get_recommendation_keywords_response_dto.go

@@ -1,7 +1,7 @@
 package dtos
 
 type GetRecommendationsData struct {
-	Titles []string `json:"titles"`
+	Keywords []string `json:"keywords"`
 }
 
 type GetRecommendationsResponseDTO struct {

server/internal/recommendations/features/get_recommendation_keywords/v1/get_recommendation_keywords_handler.go

@@ -64,7 +64,7 @@ func (c *GetRecommendationKeywordsHandler) Handle(
 
 		return &dtos.GetRecommendationsResponseDTO{
 			Data: dtos.GetRecommendationsData{
-				Titles: helper.SafeSubslice(titles, 3),
+				Keywords: helper.SafeSubslice(titles, 3),
 			},
 		}, nil
 	}
@@ -99,7 +99,7 @@ func (c *GetRecommendationKeywordsHandler) Handle(
 		log.Println("Found title similarities: ", titles, titleSimilarityScores)
 		result = &dtos.GetRecommendationsResponseDTO{
 			Data: dtos.GetRecommendationsData{
-				Titles: helper.SafeSubslice(titles, 3),
+				Keywords: helper.SafeSubslice(titles, 3),
 			},
 		}
 	}