feat: 마켓 표시 로직 추가

src/components/feedPage/Market.tsx

@@ -9,25 +9,28 @@ const Market = ({market, onPress}: Props) => {
   return (
     <S.MarketWrapper onPress={() => onPress(market.id)}>
       <S.MarketImageContainer>
-        {market.products.slice(0, 3).map(product => (
-          <S.MarketImageBox key={product.id}>
-            <S.MarketImage source={{uri: product.image}} />
-            <S.MenuGradation
-              colors={[
-                'rgba(0, 0, 0, 0.7)',
-                'rgba(0, 0, 0, 0.28)',
-                'rgba(0, 0, 0, 0)',
-              ]}
-              locations={[0, 0.3, 0.7]}
-              start={{x: 0.5, y: 0}}
-              end={{x: 0.5, y: 1}}
-            />
-            <S.MenuLabel numberOfLines={1}>{product.name}</S.MenuLabel>
-            <S.PriceLabel>
-              {product.discountPrice.toLocaleString()}원
-            </S.PriceLabel>
-          </S.MarketImageBox>
-        ))}
+        {market.products
+          .filter(p => p.stock)
+          .slice(0, 3)
+          .map(product => (
+            <S.MarketImageBox key={product.id}>
+              <S.MarketImage source={{uri: product.image}} />
+              <S.MenuGradation
+                colors={[
+                  'rgba(0, 0, 0, 0.7)',
+                  'rgba(0, 0, 0, 0.28)',
+                  'rgba(0, 0, 0, 0)',
+                ]}
+                locations={[0, 0.3, 0.7]}
+                start={{x: 0.5, y: 0}}
+                end={{x: 0.5, y: 1}}
+              />
+              <S.MenuLabel numberOfLines={1}>{product.name}</S.MenuLabel>
+              <S.PriceLabel>
+                {product.discountPrice.toLocaleString()}원
+              </S.PriceLabel>
+            </S.MarketImageBox>
+          ))}
       </S.MarketImageContainer>
       <S.MarketInfoDiscription>
         <S.MarketTitle>{market.name}</S.MarketTitle>

src/components/map/MyLocationMap.tsx

@@ -29,7 +29,7 @@ const MyLocationMap = ({
     <S.MapWrapper width={windowWidth - 30}>
       <S.MapView
         center={{
-          zoom: 10,
+          zoom: 14,
           tilt: 0,
           //TODO: 에뮬레이터 확인위해 현재 인덱스1로 설정, 배포시 0으로 수정
           latitude: cords[1]?.latitude || 37.582831666666664,
@@ -42,8 +42,7 @@ const MyLocationMap = ({
               latitude: coord.latitude,
               longitude: coord.longitude,
             }}
-            //TODO: DB 주소 수정되면 인덱스 0인경우만 green 처리
-            pinColor={index === (0 || 1) ? 'green' : 'blue'}
+            pinColor={index === 0 ? 'green' : 'blue'}
             caption={{
               text: coord.marketName,
               textSize: 12,

src/components/orderPage/PaymentSummary.tsx

@@ -37,7 +37,7 @@ const PaymentSummary = ({originPrice, discountPrice}: Props) => {
         />
         <PaymentSummaryItem
           title="할인금액"
-          price={`-${discountPrice.toLocaleString()}원`}
+          price={`-${(originPrice - discountPrice).toLocaleString()}원`}
           primary
         />
       </S.PaymentSummaryItemList>

src/screens/FeedScreen/index.tsx

@@ -23,6 +23,7 @@ type Props = {
 
 const FeedScreen = ({navigation}: Props) => {
   const [marketList, setMarketList] = useState<MarketType[] | null>(null);
+
   const [location, setLocation] = useState<{
     userLatitude: number;
     userLongitude: number;
@@ -39,7 +40,8 @@ const FeedScreen = ({navigation}: Props) => {
       Alert.alert('가게내역받아오기실패.');
       return;
     }
-    setMarketList(res.markets);
+    // TODO: 필터링 로직 추가
+    setMarketList(res.markets.filter(market => market.products.length));
   }, [location]);
 
   // const getCurrentLocation = useCallback(() => {
@@ -138,7 +140,9 @@ const FeedScreen = ({navigation}: Props) => {
             market.latitude >= -90 &&
             market.latitude <= 90 &&
             market.longitude >= -180 &&
-            market.longitude <= 180,
+            market.longitude <= 180 &&
+            market.products.length &&
+            market.products.some(p => p.stock),
         )
         .map(market => ({
           marketName: market.name,

src/screens/MarketDetailScreen/MarketDetailPage.tsx

@@ -77,8 +77,17 @@ const MarketDetailPage = ({
       }
     });
   };
+
   const productsByTags = products.reduce(
     (acc: {[key: string]: ProductType[]}, product) => {
+      if (product.tags.length === 0) {
+        if (!acc['메뉴']) {
+          acc['메뉴'] = [];
+        }
+        acc['메뉴'].push(product);
+        return acc;
+      }
+
       product.tags.forEach(tagObj => {
         const tag = tagObj.tagName;
         if (!acc[tag]) {
@@ -90,6 +99,7 @@ const MarketDetailPage = ({
     },
     {},
   );
+
   const sortedProductsByTags = Object.entries(productsByTags)
     .sort(([tagA, productsA], [tagB, productsB]) => {
       if (tagA === '추천메뉴') return -1;

src/screens/MarketDetailScreen/index.tsx

@@ -46,7 +46,9 @@ const MarketDetailScreen = ({navigation, route}: Props) => {
       pickupStartAt={marketDetail.pickupStartAt}
       pickupEndAt={marketDetail.pickupEndAt}
       address={marketDetail.address}
-      products={marketDetail.products}
+      products={marketDetail.products.filter(
+        product => product.productStatus !== 'HIDDEN',
+      )}
       id={marketDetail.id}
       specificAddress={marketDetail.specificAddress}
       summary={marketDetail.summary}

src/screens/MyPageScreen/UserMyPage.tsx

@@ -62,20 +62,6 @@ const UserMyPage = ({profile, refreshing, onRefresh}: UserMyPageProps) => {
             isNotice={false}
           />
         </S.ButtonContainer>
-        <S.ButtonContainer>
-          <NavigationTextButton
-            text="공지사항"
-            fontSize="20px"
-            onPress={handlePress}
-            isNotice={false}
-          />
-          <NavigationTextButton
-            text="약관 및 정책"
-            fontSize="20px"
-            onPress={handlePress}
-            isNotice={false}
-          />
-        </S.ButtonContainer>
       </S.NoticeSection>
       <S.BottomSectionContainer>
         <S.BottomSection>

src/types/Bucket.ts

@@ -6,6 +6,9 @@ export type BucketType = {
   products: ({count: number} & ProductType)[];
 };
 
-export type BucketProductType = Omit<ProductType, 'tags'> & {
+export type BucketProductType = Omit<
+  ProductType,
+  'tags' | 'productStatus' | 'stock'
+> & {
   count: number;
 };

src/types/ProductType.ts

@@ -5,6 +5,8 @@ export type ProductType = {
   originPrice: number;
   discountPrice: number;
   tags: TagType[];
+  productStatus: 'IN_STOCK' | 'OUT_OF_STOCK' | 'HIDDEN';
+  stock: number;
 };
 
 export type TagType = {