🐛 レシピの取得系APIの修正 & マイレシピの公開非公開フラグの適応

src/actions/cartListActions.ts → src/actions/actionsForCartList.ts

@@ -3,12 +3,11 @@
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { ActionsResult } from "@/src/types/ActionsResult";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerActionClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { ActionsResult } from "../types/ActionsResult";
-import { Database } from "../types/SupabaseTypes";
-
 export const addCartList = async (recipeId: string, ingredientId: number): Promise<ActionsResult> => {
   const supabaseServerClient = createServerActionClient<Database>({ cookies });
 

src/actions/favoriteRecipeActions.ts → src/actions/actionsForFavoriteRecipe.ts

@@ -4,12 +4,11 @@ import { revalidatePath } from "next/cache";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { ActionsResult } from "@/src/types/ActionsResult";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerActionClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { ActionsResult } from "../types/ActionsResult";
-import { Database } from "../types/SupabaseTypes";
-
 export const favoriteRecipe = async (recipeId: string): Promise<ActionsResult> => {
   const {
     data: { session },

src/actions/followActions.ts → src/actions/actionsForFollow.ts

@@ -4,12 +4,11 @@ import { revalidatePath } from "next/cache";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { ActionsResult } from "@/src/types/ActionsResult";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerActionClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { ActionsResult } from "../types/ActionsResult";
-import { Database } from "../types/SupabaseTypes";
-
 // シェフをフォローする
 export const followChef = async (followedId: string): Promise<ActionsResult> => {
   const supabaseServerClient = createServerActionClient<Database>({ cookies });

src/actions/deleteChefs.ts

@@ -3,8 +3,7 @@
 import { revalidatePath } from "next/cache";
 
 import { prisma } from "@/src/lib/prisma";
-
-import { ActionsResult } from "../types/ActionsResult";
+import { ActionsResult } from "@/src/types/ActionsResult";
 
 export const deleteChefs = async (chefIds: string[]): Promise<ActionsResult> => {
   try {

src/actions/deleteDraftRecipe.ts

@@ -4,10 +4,9 @@ import { revalidatePath } from "next/cache";
 import { cookies } from "next/headers";
 
 import { prisma } from "@/src/lib/prisma";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerActionClient } from "@supabase/auth-helpers-nextjs";
 
-import { Database } from "../types/SupabaseTypes";
-
 type DeleteDraftRecipeResult = {
   isSuccess: boolean;
   error?: Error;

src/actions/deleteMemo.ts

@@ -2,8 +2,8 @@
 
 import { revalidatePath } from "next/cache";
 
-import { prisma } from "../lib/prisma";
-import { ActionsResult } from "../types/ActionsResult";
+import { prisma } from "@/src/lib/prisma";
+import { ActionsResult } from "@/src/types/ActionsResult";
 
 export const deleteMemo = async (id: number): Promise<ActionsResult> => {
   try {

src/actions/deleteRecipe.ts

@@ -5,11 +5,10 @@ import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
 import { prisma } from "@/src/lib/prisma";
+import { ActionsResult } from "@/src/types/ActionsResult";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerActionClient } from "@supabase/auth-helpers-nextjs";
 
-import { ActionsResult } from "../types/ActionsResult";
-import { Database } from "../types/SupabaseTypes";
-
 export const deleteRecipe = async (id: string): Promise<ActionsResult> => {
   const {
     data: { session },

src/actions/getAuthenticatedUser.ts

@@ -1,11 +1,10 @@
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { Database } from "../types/SupabaseTypes";
-
 export const getAuthenticatedUser = async () => {
   const supabaseServerClient = createServerComponentClient<Database>({ cookies });
 

src/actions/getCartList.ts

@@ -1,11 +1,10 @@
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { Database } from "../types/SupabaseTypes";
-
 export const getCartList = async () => {
   const supabaseServerClient = createServerComponentClient<Database>({ cookies });
 

src/actions/getChefById.ts

@@ -1,11 +1,10 @@
 import { cookies } from "next/headers";
 import { notFound, redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { Database } from "../types/SupabaseTypes";
-
 export const getChefById = async ({ id, orderByLikes = false }: { id: string; orderByLikes?: boolean }) => {
   const chef = await prisma.user.findUnique({
     where: {

src/actions/getChefs.ts

@@ -1,4 +1,4 @@
-import { prisma } from "../lib/prisma";
+import { prisma } from "@/src/lib/prisma";
 
 export const getChefs = async () => {
   const chefs = await prisma.user.findMany({

src/actions/getFollowingChefs.ts → src/actions/getChefsInMyFollowingList.ts

@@ -6,7 +6,7 @@ import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 import { prisma } from "../lib/prisma";
 import { Database } from "../types/SupabaseTypes";
 
-export const getFollowingChefs = async () => {
+export const getChefsInMyFollowingList = async () => {
   const supabaseServerClient = createServerComponentClient<Database>({ cookies });
 
   const {

src/actions/getTopFollowersInLast3Days.ts → src/actions/getChefsTopFollowersInLast3Days.ts

@@ -2,7 +2,7 @@ import { addDays } from "date-fns";
 
 import { prisma } from "../lib/prisma";
 
-export const getTopFollowersInLast3Days = async () => {
+export const getChefsWithTopFollowersInLast3Days = async () => {
   const threeDaysAgo = addDays(new Date(), -3);
 
   const followers = await prisma.userFollower.groupBy({

src/actions/getDraftRecipe.ts

@@ -1,4 +1,4 @@
-import { prisma } from "../lib/prisma";
+import { prisma } from "@/src/lib/prisma";
 
 export const getDraftRecipe = async (id: string) => {
   const draftRecipe = await prisma.draftRecipe.findUnique({

src/actions/getDraftRecipes.ts

@@ -1,11 +1,10 @@
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { Database } from "../types/SupabaseTypes";
-
 export const getDraftRecipes = async () => {
   const supabaseServerClient = createServerComponentClient<Database>({ cookies });
 

src/actions/getMemos.ts

@@ -1,11 +1,10 @@
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { Database } from "../types/SupabaseTypes";
-
 export const getMemos = async () => {
   const supabaseServerClient = createServerComponentClient<Database>({ cookies });
 

src/actions/getMyRecipes.ts

@@ -1,13 +1,11 @@
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { PaginationParams } from "@/src/types/PaginationParams";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { kInfiniteScrollCount } from "../constants/constants";
-import { prisma } from "../lib/prisma";
-import { PaginationParams } from "../types/PaginationParams";
-import { Database } from "../types/SupabaseTypes";
-
 export const getMyRecipes = async (
   { orderByLikes, limit, skip }: { orderByLikes?: boolean } & PaginationParams = {
     orderByLikes: false,

src/actions/getRecipeById.ts

@@ -1,11 +1,10 @@
 import { cookies } from "next/headers";
 import { notFound, redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { Database } from "../types/SupabaseTypes";
-
 export const getRecipeById = async (id: string) => {
   const supabaseServerClient = createServerComponentClient<Database>({ cookies });
 

src/actions/getRecipes.ts

@@ -1,6 +1,6 @@
-import { kInfiniteScrollCount } from "../constants/constants";
-import { prisma } from "../lib/prisma";
-import { PaginationParams } from "../types/PaginationParams";
+import { kInfiniteScrollCount } from "@/src/constants/constants";
+import { prisma } from "@/src/lib/prisma";
+import { PaginationParams } from "@/src/types/PaginationParams";
 
 export const getRecipes = async (
   { skip, limit }: PaginationParams = {
@@ -16,6 +16,11 @@ export const getRecipes = async (
     orderBy: {
       createdAt: "desc",
     },
+    where: {
+      user: {
+        role: "CHEF",
+      },
+    },
     skip,
     take: limit,
   });

src/actions/getMyFavoriteRecipes.ts → src/actions/getRecipesInMyFavorites.ts

@@ -1,14 +1,13 @@
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { kInfiniteScrollCount } from "@/src/constants/constants";
+import { prisma } from "@/src/lib/prisma";
+import { PaginationParams } from "@/src/types/PaginationParams";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { kInfiniteScrollCount } from "../constants/constants";
-import { prisma } from "../lib/prisma";
-import { PaginationParams } from "../types/PaginationParams";
-import { Database } from "../types/SupabaseTypes";
-
-export const getMyFavoriteRecipes = async (
+export const getRecipesInMyFavorites = async (
   { skip, limit }: PaginationParams = {
     skip: 0,
     limit: kInfiniteScrollCount,
@@ -25,6 +24,10 @@ export const getMyFavoriteRecipes = async (
   const favoriteRecipes = await prisma.favorite.findMany({
     where: {
       userId: session.user.id,
+      recipe: {
+        // マイレシピは非公開のものも含めて取得する
+        OR: [{ isPublished: true }, { userId: session.user.id }],
+      },
     },
     include: {
       recipe: {

src/actions/getNewRecipesFromFollowingChefs.ts → src/actions/getRecipesNewFromFollowedChefs.ts

@@ -1,14 +1,13 @@
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { kInfiniteScrollCount } from "@/src/constants/constants";
+import { prisma } from "@/src/lib/prisma";
+import { PaginationParams } from "@/src/types/PaginationParams";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 
-import { kInfiniteScrollCount } from "../constants/constants";
-import { prisma } from "../lib/prisma";
-import { PaginationParams } from "../types/PaginationParams";
-import { Database } from "../types/SupabaseTypes";
-
-export const getNewRecipesFromFollowingChefs = async (
+export const getRecipesNewFromFollowedChefs = async (
   { limit, skip }: PaginationParams = {
     skip: 0,
     limit: kInfiniteScrollCount,

src/actions/getTopFavoriteRecipesInLast3Days.ts → src/actions/getRecipesTopFavoritesInLast3Days.ts

@@ -1,10 +1,9 @@
+import { kInfiniteScrollCount } from "@/src/constants/constants";
+import { prisma } from "@/src/lib/prisma";
+import { PaginationParams } from "@/src/types/PaginationParams";
 import { addDays } from "date-fns";
 
-import { kInfiniteScrollCount } from "../constants/constants";
-import { prisma } from "../lib/prisma";
-import { PaginationParams } from "../types/PaginationParams";
-
-export const getTopFavoriteRecipesInLast3Days = async (
+export const getRecipesTopFavoritesInLast3Days = async (
   { limit, skip }: PaginationParams = {
     skip: 0,
     limit: kInfiniteScrollCount,
@@ -38,6 +37,9 @@ export const getTopFavoriteRecipesInLast3Days = async (
       id: {
         in: recipeIds,
       },
+      user: {
+        role: "CHEF",
+      },
     },
     include: {
       RecipeImage: true,

src/actions/patchRecipePublishStatus.ts

@@ -0,0 +1,58 @@
+"use server";
+
+import { revalidatePath } from "next/cache";
+
+import { prisma } from "@/src/lib/prisma";
+import { ActionsResult } from "@/src/types/ActionsResult";
+
+export const patchRecipePublishStatus = async (id: string): Promise<ActionsResult> => {
+  try {
+    const currentRecipe = await prisma.recipe.findUnique({
+      where: {
+        id,
+      },
+      select: {
+        isPublished: true,
+      },
+    });
+
+    if (!currentRecipe) {
+      return {
+        isSuccess: false,
+        error: "レシピの取得に失敗しました🥲",
+      };
+    }
+
+    const updatedRecipe = await prisma.recipe.update({
+      where: {
+        id,
+      },
+      data: {
+        isPublished: !currentRecipe.isPublished,
+      },
+      select: {
+        isPublished: true,
+      },
+    });
+
+    if (!updatedRecipe) {
+      return {
+        isSuccess: false,
+        error: "レシピの更新に失敗しました🥲",
+      };
+    }
+
+    revalidatePath(`/my-recipe/${id}`);
+
+    return {
+      isSuccess: true,
+      message: `レシピの公開状態を${updatedRecipe.isPublished ? "「公開」" : "「非公開」"}に変更しました🎉`,
+    };
+  } catch (error) {
+    console.log(error);
+    return {
+      isSuccess: false,
+      error: "レシピの公開状態の変更に失敗しました🥲",
+    };
+  }
+};

src/actions/postAllToCart.ts

@@ -4,12 +4,11 @@ import { revalidatePath } from "next/cache";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 
+import { prisma } from "@/src/lib/prisma";
+import { ActionsResult } from "@/src/types/ActionsResult";
+import { Database } from "@/src/types/SupabaseTypes";
 import { createServerActionClient } from "@supabase/auth-helpers-nextjs";
 
-import { prisma } from "../lib/prisma";
-import { ActionsResult } from "../types/ActionsResult";
-import { Database } from "../types/SupabaseTypes";
-
 export const postAllToCart = async (recipeId: string, ingredientIds: number[]): Promise<ActionsResult> => {
   const supabaseServerClient = createServerActionClient<Database>({ cookies });