Refactor/lin 78 actions access

src/actions/external/getHtmlJustWatch.ts

@@ -7,7 +7,7 @@ import { ProviderInfo } from '@/types/justwatch/providers';
 export const getHtmlJustWatch = async (moviename: string) => {
   const encode = encodeURIComponent(moviename);
 
-  const res = await fetch(`https://www.justwatch.com/kr/검색?q=${encode}`, {
+  const res = await fetch(`https://www.justwatch.com/kr/search?content_type=movie&q=${encode}`, {
     //.json말고 .text해야해서 그냥 fetch로
     cache: 'force-cache',
     headers: {
@@ -20,15 +20,39 @@ export const getHtmlJustWatch = async (moviename: string) => {
   const $ = cheerio.load(html);
 
   const providers: ProviderInfo[] = [];
-  $('.buybox-row a').each((_, el) => {
-    const $el = $(el);
-    const url = $el.attr('href') || '';
-    const logo = $el.find('img').attr('src');
-
-    if (url.startsWith('http') && !providers.some((p) => p.logo === logo)) {
-      providers.push({ url, logo });
-    }
-  });
-
-  return providers;
+  let matched = false;
+  const allowedProviders = ['netflix', 'watcha', 'disney', 'wavve'];
+
+  const firstTitleRow = $('.title-list-row__row').first();
+
+  //검색 결과의 첫번째 항목
+  const title = firstTitleRow.find('.title-list-row__column-header').text().trim();
+
+  // 검색어가 영화 제목에 '포함' 되어 있는지?
+  if (title.toLowerCase().includes(moviename.toLowerCase())) {
+    matched = true;
+
+    //첫번째 항목 안의 프로바이더들 중
+    firstTitleRow.find('.buybox-row a').each((_, el) => {
+      const $el = $(el);
+      const url = $el.attr('href') || '';
+      const logo = $el.find('img').attr('src');
+
+      const lowerUrl = url.toLowerCase();
+      if (
+        allowedProviders.some((p) => lowerUrl.includes(p)) && //[넷플, 디즈니, 웨이브, 왓챠만]
+        url.startsWith('http') &&
+        !providers.some((p) => p.logo === logo)
+      ) {
+        const providerName = allowedProviders.find((p) => lowerUrl.includes(p));
+        const alreadyAdded = providers.some((p) => p.url.toLowerCase().includes(providerName!));
+
+        if (!alreadyAdded) {
+          providers.push({ url, logo });
+        }
+      }
+    });
+  }
+
+  return matched ? providers : [];
 };

src/actions/profile/getUserInfo.ts

@@ -19,13 +19,9 @@ export const getMyInfo = async () => {
 };
 
 export const getUserInfo = async (userid: number) => {
-  const session = await auth();
-  const accessToken = session?.accessToken;
-
   return await fetcher(`${process.env.API_BASE_URL}/${process.env.TEST_TEAM_ID}/users/${userid}`, {
     method: 'GET',
     headers: {
-      Authorization: `Bearer ${accessToken}`,
       'Content-Type': 'application/json',
     },
     cache: 'no-store',

src/app/(profile)/(component)/Activities.tsx

@@ -22,12 +22,12 @@ const Activities = async ({ userid }: Props) => {
         <StatisticsCard title='남긴 별점 평균'>
           <div className='text-yellow-ffc83c flex gap-[5px]'>
             <StarIcon size={20} />
-            <span className='text-white-f1f1f5 light:text-gray-9fa6b2'>{RoundaverageRating}</span>
+            <span className='text-white-f1f1f5'>{RoundaverageRating}</span>
           </div>
         </StatisticsCard>
 
         <StatisticsCard title='남긴 리뷰'>
-          <div className='light:text-gray-9fa6b2 flex gap-[5px]'>
+          <div className='flex gap-[5px]'>
             <ReviewIcon size={20} />
             {data.reviewCount}
           </div>

src/app/(profile)/(component)/ProfileUpdateForm.tsx

@@ -4,7 +4,6 @@ import { useState } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useSession } from 'next-auth/react';
-import { useErrorBoundary } from 'react-error-boundary';
 import { Controller, useForm } from 'react-hook-form';
 
 import { patchProfileInfo } from '@/actions/profile/patchProfileInfo';
@@ -17,7 +16,6 @@ import { useUserInfoStore } from '@/store/userInfoStore';
 import { profileSchema, type ProfileFormValues } from '@/types/profile/profileUpdateSchema';
 
 const ProfileUpdateForm = () => {
-  const { showBoundary } = useErrorBoundary();
   const { update } = useSession();
   const closeModal = useModalStore((state) => state.closeModal);
   const [isLoading, setIsLoading] = useState(false);
@@ -26,6 +24,8 @@ const ProfileUpdateForm = () => {
   const description = useUserInfoStore((state) => state.description);
   const image = useUserInfoStore((state) => state.image);
 
+  const [err, setError] = useState(false);
+
   const {
     register,
     handleSubmit,
@@ -63,8 +63,8 @@ const ProfileUpdateForm = () => {
       });
 
       closeModal();
-    } catch (err) {
-      showBoundary(err);
+    } catch {
+      setError(true);
     } finally {
       setIsLoading(false);
     }
@@ -86,6 +86,9 @@ const ProfileUpdateForm = () => {
           maxLength={10}
           defaultValue={nickname}
           {...register('nickname')}
+          setError={setError}
+          errorMessage={err ? ' ' : ''}
+          className={err ? 'animate-shake' : ''}
         />
 
         <Textbox
@@ -95,8 +98,8 @@ const ProfileUpdateForm = () => {
           {...register('description')}
         />
 
-        <Button disabled={!isDirty || isLoading} className='my-5'>
-          {isLoading ? '저장 중...' : '저장하기'}
+        <Button disabled={!isDirty || isLoading || err} className='my-5'>
+          {isLoading ? '저장 중...' : err ? '닉네임이 중복되었습니다' : '저장하기'}
         </Button>
       </form>
     </div>

src/app/(profile)/(component)/StatisticsCard.tsx

@@ -7,7 +7,7 @@ interface Props {
 
 const ActivityCard = ({ title, children }: Props) => {
   return (
-    <div className='border-black-353542 bg-black-252530 light:bg-white flex h-[119px] w-full min-w-[92px] flex-col items-center justify-center gap-[15px] rounded-[12px] xl:h-[128px] xl:gap-5'>
+    <div className='border-black-353542 bg-black-252530 flex h-[119px] w-full min-w-[92px] flex-col items-center justify-center gap-[15px] rounded-[12px] xl:h-[128px] xl:gap-5'>
       <h3 className='text-mogazoa-14px-500 xl:text-mogazoa-16px-500 text-gray-9fa6b2 text-center break-keep'>
         {title}
       </h3>

src/app/testTrailer/StreamingIcon.tsx

@@ -13,8 +13,8 @@ interface Props {
 
 export const StreamingIcon = ({ providers }: Props) => {
   return (
-    <div className='relative inline-block'>
-      <h3 className='text-mogazoa-16px-600 text-black-2e2e3a mb-5'>감상하기</h3>
+    <div className='relative inline-block min-w-40'>
+      <h3 className='text-mogazoa-16px-600 text-black-2e2e3a mb-5'>{`바로 감상하기`}</h3>
       <div className='inline-flex items-center'>
         {providers.map((item) => (
           <Link

src/components/common/Input.tsx

@@ -55,7 +55,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
                 if (maxLength) e.target.value = truncated(e.target.value, maxLength);
                 return e.target.value.length;
               });
-              setError && setError(false);
+              if (setError) setError(false);
               props.onChange?.(e);
             }}
           />