diff --git a/src/components/Account/AccountInfo.tsx b/src/components/Account/AccountInfo.tsx index 0652075..01b1cb9 100644 --- a/src/components/Account/AccountInfo.tsx +++ b/src/components/Account/AccountInfo.tsx @@ -1,6 +1,6 @@ import validateEmailRequest from '@/requests/User/validateEmailRequest'; import validateUsernameRequest from '@/requests/validateUsernameRequest'; -import { BaseCreateUserSchema } from '@/services/User/schema/CreateUserValidationSchemas'; +import { BaseCreateUserSchema } from '@/services/users/User/schema/CreateUserValidationSchemas'; import { Switch } from '@headlessui/react'; import { zodResolver } from '@hookform/resolvers/zod'; import { Dispatch, FC, useContext } from 'react'; diff --git a/src/components/Account/Security.tsx b/src/components/Account/Security.tsx index 4be98ce..cde42bd 100644 --- a/src/components/Account/Security.tsx +++ b/src/components/Account/Security.tsx @@ -3,7 +3,7 @@ import { Dispatch, FunctionComponent } from 'react'; import { SubmitHandler, useForm } from 'react-hook-form'; import { zodResolver } from '@hookform/resolvers/zod'; import { z } from 'zod'; -import { UpdatePasswordSchema } from '@/services/User/schema/CreateUserValidationSchemas'; +import { UpdatePasswordSchema } from '@/services/users/User/schema/CreateUserValidationSchemas'; import sendUpdatePasswordRequest from '@/requests/User/sendUpdatePasswordRequest'; import { AccountPageState, AccountPageAction } from '@/reducers/accountPageReducer'; import toast from 'react-hot-toast'; diff --git a/src/components/Account/UpdateProfileForm.tsx b/src/components/Account/UpdateProfileForm.tsx index 87ea529..effbcb7 100644 --- a/src/components/Account/UpdateProfileForm.tsx +++ b/src/components/Account/UpdateProfileForm.tsx @@ -5,7 +5,7 @@ import FormSegment from '@/components/ui/forms/FormSegment'; import Link from 'next/link'; import FormTextArea from '@/components/ui/forms/FormTextArea'; import { FC } from 'react'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import type { UseFormHandleSubmit, SubmitHandler, @@ -13,7 +13,7 @@ import type { UseFormRegister, } from 'react-hook-form'; import { z } from 'zod'; -import UpdateProfileSchema from '../../services/User/schema/UpdateProfileSchema'; +import UpdateProfileSchema from '../../services/users/User/schema/UpdateProfileSchema'; type UpdateProfileSchemaT = z.infer; diff --git a/src/components/Account/UserAvatar.tsx b/src/components/Account/UserAvatar.tsx index 9c4df15..1696881 100644 --- a/src/components/Account/UserAvatar.tsx +++ b/src/components/Account/UserAvatar.tsx @@ -1,7 +1,7 @@ import { FC } from 'react'; import { CldImage } from 'next-cloudinary'; import { z } from 'zod'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import { FaUser } from 'react-icons/fa'; interface UserAvatarProps { diff --git a/src/components/BeerById/BeerCommentForm.tsx b/src/components/BeerById/BeerCommentForm.tsx index 9f58b50..19fd302 100644 --- a/src/components/BeerById/BeerCommentForm.tsx +++ b/src/components/BeerById/BeerCommentForm.tsx @@ -1,6 +1,6 @@ import sendCreateBeerCommentRequest from '@/requests/BeerComment/sendCreateBeerCommentRequest'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { zodResolver } from '@hookform/resolvers/zod'; import { FunctionComponent } from 'react'; diff --git a/src/components/BeerById/BeerInfoHeader.tsx b/src/components/BeerById/BeerInfoHeader.tsx index fae2384..73381c3 100644 --- a/src/components/BeerById/BeerInfoHeader.tsx +++ b/src/components/BeerById/BeerInfoHeader.tsx @@ -4,7 +4,7 @@ import { FC, useContext } from 'react'; import UserContext from '@/contexts/UserContext'; import { FaRegEdit } from 'react-icons/fa'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { z } from 'zod'; import useGetBeerPostLikeCount from '@/hooks/data-fetching/beer-likes/useBeerPostLikeCount'; import useTimeDistance from '@/hooks/utilities/useTimeDistance'; diff --git a/src/components/BeerById/BeerPostCommentsSection.tsx b/src/components/BeerById/BeerPostCommentsSection.tsx index 8143923..fe53bf2 100644 --- a/src/components/BeerById/BeerPostCommentsSection.tsx +++ b/src/components/BeerById/BeerPostCommentsSection.tsx @@ -1,6 +1,6 @@ import UserContext from '@/contexts/UserContext'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { FC, MutableRefObject, useContext, useRef } from 'react'; import { z } from 'zod'; diff --git a/src/components/BeerById/BeerRecommendations.tsx b/src/components/BeerById/BeerRecommendations.tsx index edb81c4..66c3154 100644 --- a/src/components/BeerById/BeerRecommendations.tsx +++ b/src/components/BeerById/BeerRecommendations.tsx @@ -3,7 +3,7 @@ import { FC, MutableRefObject, useRef } from 'react'; import { useInView } from 'react-intersection-observer'; import { z } from 'zod'; import useBeerRecommendations from '@/hooks/data-fetching/beer-posts/useBeerRecommendations'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import debounce from 'lodash/debounce'; import BeerRecommendationLoadingComponent from './BeerRecommendationLoadingComponent'; diff --git a/src/components/BeerIndex/BeerCard.tsx b/src/components/BeerIndex/BeerCard.tsx index b79413c..df0ff8d 100644 --- a/src/components/BeerIndex/BeerCard.tsx +++ b/src/components/BeerIndex/BeerCard.tsx @@ -1,7 +1,7 @@ import Link from 'next/link'; import { FC, useContext } from 'react'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { z } from 'zod'; import UserContext from '@/contexts/UserContext'; import useGetBeerPostLikeCount from '@/hooks/data-fetching/beer-likes/useBeerPostLikeCount'; diff --git a/src/components/BeerStyleById/BeerStyleBeerSection.tsx b/src/components/BeerStyleById/BeerStyleBeerSection.tsx index c0c4d45..38e6d3a 100644 --- a/src/components/BeerStyleById/BeerStyleBeerSection.tsx +++ b/src/components/BeerStyleById/BeerStyleBeerSection.tsx @@ -3,7 +3,7 @@ import { FC, MutableRefObject, useRef } from 'react'; import { useInView } from 'react-intersection-observer'; import { z } from 'zod'; -import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult'; +import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult'; import useBeerPostsByBeerStyle from '@/hooks/data-fetching/beer-posts/useBeerPostsByBeerStyles'; import BeerRecommendationLoadingComponent from '../BeerById/BeerRecommendationLoadingComponent'; diff --git a/src/components/BeerStyleById/BeerStyleCommentForm.tsx b/src/components/BeerStyleById/BeerStyleCommentForm.tsx index 1ffe005..0436428 100644 --- a/src/components/BeerStyleById/BeerStyleCommentForm.tsx +++ b/src/components/BeerStyleById/BeerStyleCommentForm.tsx @@ -8,7 +8,7 @@ import CreateCommentValidationSchema from '@/services/schema/CommentSchema/Creat import toast from 'react-hot-toast'; import createErrorToast from '@/util/createErrorToast'; -import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult'; +import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult'; import useBeerStyleComments from '@/hooks/data-fetching/beer-style-comments/useBeerStyleComments'; import sendCreateBeerStyleCommentRequest from '@/requests/BeerStyleComment/sendCreateBeerStyleCommentRequest'; import CommentForm from '../ui/CommentForm'; diff --git a/src/components/BeerStyleById/BeerStyleCommentSection.tsx b/src/components/BeerStyleById/BeerStyleCommentSection.tsx index 96f8554..7d1d665 100644 --- a/src/components/BeerStyleById/BeerStyleCommentSection.tsx +++ b/src/components/BeerStyleById/BeerStyleCommentSection.tsx @@ -5,7 +5,7 @@ import { z } from 'zod'; import { useRouter } from 'next/router'; import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema'; -import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult'; +import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult'; import useBeerStyleComments from '@/hooks/data-fetching/beer-style-comments/useBeerStyleComments'; import LoadingComponent from '../BeerById/LoadingComponent'; import CommentsComponent from '../ui/CommentsComponent'; diff --git a/src/components/BeerStyleById/BeerStyleHeader.tsx b/src/components/BeerStyleById/BeerStyleHeader.tsx index e479b52..c68312a 100644 --- a/src/components/BeerStyleById/BeerStyleHeader.tsx +++ b/src/components/BeerStyleById/BeerStyleHeader.tsx @@ -7,7 +7,7 @@ import { FaRegEdit } from 'react-icons/fa'; import { z } from 'zod'; import useTimeDistance from '@/hooks/utilities/useTimeDistance'; -import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult'; +import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult'; import useBeerStyleLikeCount from '@/hooks/data-fetching/beer-style-likes/useBeerStyleLikeCount'; import BeerStyleLikeButton from './BeerStyleLikeButton'; diff --git a/src/components/BeerStyleIndex/BeerStyleCard.tsx b/src/components/BeerStyleIndex/BeerStyleCard.tsx index 331c68b..bd76c95 100644 --- a/src/components/BeerStyleIndex/BeerStyleCard.tsx +++ b/src/components/BeerStyleIndex/BeerStyleCard.tsx @@ -1,4 +1,4 @@ -import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult'; +import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult'; import Link from 'next/link'; import { FC } from 'react'; diff --git a/src/components/BreweryById/BreweryBeerSection.tsx b/src/components/BreweryById/BreweryBeerSection.tsx index 9abfaf9..7d11225 100644 --- a/src/components/BreweryById/BreweryBeerSection.tsx +++ b/src/components/BreweryById/BreweryBeerSection.tsx @@ -1,5 +1,5 @@ import UseBeerPostsByBrewery from '@/hooks/data-fetching/beer-posts/useBeerPostsByBrewery'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import Link from 'next/link'; import { FC, MutableRefObject, useContext, useRef } from 'react'; import { useInView } from 'react-intersection-observer'; diff --git a/src/components/BreweryById/BreweryCommentForm.tsx b/src/components/BreweryById/BreweryCommentForm.tsx index fcaf4ee..aa58d4a 100644 --- a/src/components/BreweryById/BreweryCommentForm.tsx +++ b/src/components/BreweryById/BreweryCommentForm.tsx @@ -1,5 +1,5 @@ import useBreweryPostComments from '@/hooks/data-fetching/brewery-comments/useBreweryPostComments'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema'; import { zodResolver } from '@hookform/resolvers/zod'; import { FC } from 'react'; diff --git a/src/components/BreweryById/BreweryCommentsSection.tsx b/src/components/BreweryById/BreweryCommentsSection.tsx index 8afaae9..f87ec82 100644 --- a/src/components/BreweryById/BreweryCommentsSection.tsx +++ b/src/components/BreweryById/BreweryCommentsSection.tsx @@ -1,5 +1,5 @@ import UserContext from '@/contexts/UserContext'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { FC, MutableRefObject, useContext, useRef } from 'react'; import { z } from 'zod'; import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema'; diff --git a/src/components/BreweryById/BreweryInfoHeader.tsx b/src/components/BreweryById/BreweryInfoHeader.tsx index 262fbe7..c2fcb00 100644 --- a/src/components/BreweryById/BreweryInfoHeader.tsx +++ b/src/components/BreweryById/BreweryInfoHeader.tsx @@ -1,7 +1,7 @@ import UserContext from '@/contexts/UserContext'; import useGetBreweryPostLikeCount from '@/hooks/data-fetching/brewery-likes/useGetBreweryPostLikeCount'; import useTimeDistance from '@/hooks/utilities/useTimeDistance'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { format } from 'date-fns'; import { FC, useContext } from 'react'; diff --git a/src/components/BreweryIndex/BreweryCard.tsx b/src/components/BreweryIndex/BreweryCard.tsx index 357fda5..39cda05 100644 --- a/src/components/BreweryIndex/BreweryCard.tsx +++ b/src/components/BreweryIndex/BreweryCard.tsx @@ -1,6 +1,6 @@ import UserContext from '@/contexts/UserContext'; import useGetBreweryPostLikeCount from '@/hooks/data-fetching/brewery-likes/useGetBreweryPostLikeCount'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { FC, useContext } from 'react'; import Link from 'next/link'; import { z } from 'zod'; diff --git a/src/components/BreweryPost/CreateBreweryPostForm.tsx b/src/components/BreweryPost/CreateBreweryPostForm.tsx index 19ca318..d2dbb24 100644 --- a/src/components/BreweryPost/CreateBreweryPostForm.tsx +++ b/src/components/BreweryPost/CreateBreweryPostForm.tsx @@ -1,6 +1,6 @@ import sendUploadBreweryImagesRequest from '@/requests/BreweryImage/sendUploadBreweryImageRequest'; import sendCreateBreweryPostRequest from '@/requests/BreweryPost/sendCreateBreweryPostRequest'; -import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema'; +import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema'; import UploadImageValidationSchema from '@/services/schema/ImageSchema/UploadImageValidationSchema'; import createErrorToast from '@/util/createErrorToast'; import { Tab } from '@headlessui/react'; diff --git a/src/components/CreateBeerPostForm.tsx b/src/components/CreateBeerPostForm.tsx index 3f2eea7..5156154 100644 --- a/src/components/CreateBeerPostForm.tsx +++ b/src/components/CreateBeerPostForm.tsx @@ -4,8 +4,8 @@ import router from 'next/router'; import { FunctionComponent } from 'react'; import { useForm, SubmitHandler, FieldError } from 'react-hook-form'; import { z } from 'zod'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; -import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; +import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema'; import sendCreateBeerPostRequest from '@/requests/BeerPost/sendCreateBeerPostRequest'; import UploadImageValidationSchema from '@/services/schema/ImageSchema/UploadImageValidationSchema'; import sendUploadBeerImagesRequest from '@/requests/BeerImage/sendUploadBeerImageRequest'; diff --git a/src/components/EditBeerPostForm.tsx b/src/components/EditBeerPostForm.tsx index 8e60360..d78604f 100644 --- a/src/components/EditBeerPostForm.tsx +++ b/src/components/EditBeerPostForm.tsx @@ -7,7 +7,7 @@ import { useForm, SubmitHandler } from 'react-hook-form'; import { zodResolver } from '@hookform/resolvers/zod'; import deleteBeerPostRequest from '@/requests/BeerPost/deleteBeerPostRequest'; -import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema'; +import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema'; import sendEditBeerPostRequest from '@/requests/BeerPost/sendEditBeerPostRequest'; import createErrorToast from '@/util/createErrorToast'; import Button from './ui/forms/Button'; diff --git a/src/components/Login/LoginForm.tsx b/src/components/Login/LoginForm.tsx index a9d5443..d25f687 100644 --- a/src/components/Login/LoginForm.tsx +++ b/src/components/Login/LoginForm.tsx @@ -1,5 +1,5 @@ import sendLoginUserRequest from '@/requests/User/sendLoginUserRequest'; -import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema'; +import LoginValidationSchema from '@/services/users/User/schema/LoginValidationSchema'; import { zodResolver } from '@hookform/resolvers/zod'; import { useRouter } from 'next/router'; import { useContext } from 'react'; diff --git a/src/components/RegisterUserForm.tsx b/src/components/RegisterUserForm.tsx index 7102ee0..1589cd0 100644 --- a/src/components/RegisterUserForm.tsx +++ b/src/components/RegisterUserForm.tsx @@ -1,5 +1,5 @@ import sendRegisterUserRequest from '@/requests/User/sendRegisterUserRequest'; -import { CreateUserValidationSchemaWithUsernameAndEmailCheck } from '@/services/User/schema/CreateUserValidationSchemas'; +import { CreateUserValidationSchemaWithUsernameAndEmailCheck } from '@/services/users/User/schema/CreateUserValidationSchemas'; import { zodResolver } from '@hookform/resolvers/zod'; import { useRouter } from 'next/router'; import { FC } from 'react'; diff --git a/src/components/UserPage/UserFollowButton.tsx b/src/components/UserPage/UserFollowButton.tsx index 59c4050..4813639 100644 --- a/src/components/UserPage/UserFollowButton.tsx +++ b/src/components/UserPage/UserFollowButton.tsx @@ -2,7 +2,7 @@ import useFollowStatus from '@/hooks/data-fetching/user-follows/useFollowStatus' import useGetUsersFollowedByUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowedByUser'; import useGetUsersFollowingUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowingUser'; import sendUserFollowRequest from '@/requests/UserFollow/sendUserFollowRequest'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import { FC, useState } from 'react'; import { FaUserCheck, FaUserPlus } from 'react-icons/fa'; import { z } from 'zod'; diff --git a/src/components/UserPage/UserHeader.tsx b/src/components/UserPage/UserHeader.tsx index 7715b41..cf0481c 100644 --- a/src/components/UserPage/UserHeader.tsx +++ b/src/components/UserPage/UserHeader.tsx @@ -3,7 +3,7 @@ import useTimeDistance from '@/hooks/utilities/useTimeDistance'; import { FC, useContext } from 'react'; import { z } from 'zod'; import { format } from 'date-fns'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import useGetUsersFollowedByUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowedByUser'; import useGetUsersFollowingUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowingUser'; import UserContext from '@/contexts/UserContext'; diff --git a/src/config/auth/localStrat.ts b/src/config/auth/localStrat.ts index 4417f51..d74efb6 100644 --- a/src/config/auth/localStrat.ts +++ b/src/config/auth/localStrat.ts @@ -1,4 +1,4 @@ -import findUserByUsername from '@/services/User/findUserByUsername'; +import findUserByUsername from '@/services/users/User/findUserByUsername'; import Local from 'passport-local'; import ServerError from '../util/ServerError'; import { validatePassword } from './passwordFns'; diff --git a/src/config/auth/types.ts b/src/config/auth/types.ts index c02fb94..96e4962 100644 --- a/src/config/auth/types.ts +++ b/src/config/auth/types.ts @@ -1,4 +1,4 @@ -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import { IncomingMessage } from 'http'; import { NextApiRequest } from 'next'; import { z } from 'zod'; diff --git a/src/config/nextConnect/middleware/getCurrentUser.ts b/src/config/nextConnect/middleware/getCurrentUser.ts index 10bae13..e7aba93 100644 --- a/src/config/nextConnect/middleware/getCurrentUser.ts +++ b/src/config/nextConnect/middleware/getCurrentUser.ts @@ -1,6 +1,6 @@ import { NextApiResponse } from 'next'; import { NextHandler } from 'next-connect'; -import findUserById from '@/services/User/findUserById'; +import findUserById from '@/services/users/User/findUserById'; import ServerError from '@/config/util/ServerError'; import { getLoginSession } from '../../auth/session'; import { UserExtendedNextApiRequest } from '../../auth/types'; diff --git a/src/contexts/UserContext.tsx b/src/contexts/UserContext.tsx index 2cf7213..f1cc76f 100644 --- a/src/contexts/UserContext.tsx +++ b/src/contexts/UserContext.tsx @@ -1,5 +1,5 @@ import useUser from '@/hooks/auth/useUser'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import { ReactNode, createContext } from 'react'; import { z } from 'zod'; diff --git a/src/controllers/comments/beerComments/index.ts b/src/controllers/comments/beerComments/index.ts index 25192df..35b1df0 100644 --- a/src/controllers/comments/beerComments/index.ts +++ b/src/controllers/comments/beerComments/index.ts @@ -1,13 +1,13 @@ import ServerError from '@/config/util/ServerError'; import DBClient from '@/prisma/DBClient'; -import editBeerCommentById from '@/services/BeerComment/editBeerCommentById'; -import findBeerCommentById from '@/services/BeerComment/findBeerCommentById'; +import editBeerCommentById from '@/services/comments/BeerComment/editBeerCommentById'; +import findBeerCommentById from '@/services/comments/BeerComment/findBeerCommentById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { NextHandler } from 'next-connect'; import { z } from 'zod'; -import createNewBeerComment from '@/services/BeerComment/createNewBeerComment'; -import getAllBeerComments from '@/services/BeerComment/getAllBeerComments'; +import createNewBeerComment from '@/services/comments/BeerComment/createNewBeerComment'; +import getAllBeerComments from '@/services/comments/BeerComment/getAllBeerComments'; import { CommentRequest, EditAndCreateCommentRequest, diff --git a/src/controllers/comments/beerStyleComments/index.ts b/src/controllers/comments/beerStyleComments/index.ts index a070af8..5e88f76 100644 --- a/src/controllers/comments/beerStyleComments/index.ts +++ b/src/controllers/comments/beerStyleComments/index.ts @@ -1,14 +1,14 @@ import ServerError from '@/config/util/ServerError'; import DBClient from '@/prisma/DBClient'; -import updateBeerStyleCommentById from '@/services/BeerStyleComment/updateBeerStyleCommentById'; +import updateBeerStyleCommentById from '@/services/comments/BeerStyleComment/updateBeerStyleCommentById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { NextHandler } from 'next-connect'; import { z } from 'zod'; import CommentQueryResult from '@/services/schema/CommentSchema/CommentQueryResult'; -import createNewBeerStyleComment from '@/services/BeerStyleComment/createNewBeerStyleComment'; -import getAllBeerStyleComments from '@/services/BeerStyleComment/getAllBeerStyleComments'; +import createNewBeerStyleComment from '@/services/comments/BeerStyleComment/createNewBeerStyleComment'; +import getAllBeerStyleComments from '@/services/comments/BeerStyleComment/getAllBeerStyleComments'; import { CommentRequest, diff --git a/src/controllers/comments/breweryComments/index.ts b/src/controllers/comments/breweryComments/index.ts index 956e3d0..8251814 100644 --- a/src/controllers/comments/breweryComments/index.ts +++ b/src/controllers/comments/breweryComments/index.ts @@ -1,13 +1,13 @@ import ServerError from '@/config/util/ServerError'; import DBClient from '@/prisma/DBClient'; -import getBreweryCommentById from '@/services/BreweryComment/getBreweryCommentById'; +import getBreweryCommentById from '@/services/comments/BreweryComment/getBreweryCommentById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { NextHandler } from 'next-connect'; import { z } from 'zod'; import CommentQueryResult from '@/services/schema/CommentSchema/CommentQueryResult'; -import createNewBreweryComment from '@/services/BreweryComment/createNewBreweryComment'; -import getAllBreweryComments from '@/services/BreweryComment/getAllBreweryComments'; +import createNewBreweryComment from '@/services/comments/BreweryComment/createNewBreweryComment'; +import getAllBreweryComments from '@/services/comments/BreweryComment/getAllBreweryComments'; import { CommentRequest, EditAndCreateCommentRequest, diff --git a/src/controllers/images/beerImages/index.ts b/src/controllers/images/beerImages/index.ts index cd996f7..afce7d5 100644 --- a/src/controllers/images/beerImages/index.ts +++ b/src/controllers/images/beerImages/index.ts @@ -1,5 +1,5 @@ import ServerError from '@/config/util/ServerError'; -import addBeerImageToDB from '@/services/BeerImage/addBeerImageToDB'; +import addBeerImageToDB from '@/services/images/BeerImage/addBeerImageToDB'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { z } from 'zod'; diff --git a/src/controllers/images/breweryImages/index.ts b/src/controllers/images/breweryImages/index.ts index 8f7b33b..eb217d6 100644 --- a/src/controllers/images/breweryImages/index.ts +++ b/src/controllers/images/breweryImages/index.ts @@ -1,5 +1,5 @@ import ServerError from '@/config/util/ServerError'; -import addBreweryImageToDB from '@/services/BreweryImage/addBreweryImageToDB'; +import addBreweryImageToDB from '@/services/images/BreweryImage/addBreweryImageToDB'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { z } from 'zod'; diff --git a/src/controllers/likes/beerPostLikes/index.ts b/src/controllers/likes/beerPostLikes/index.ts index dca294d..9a77de9 100644 --- a/src/controllers/likes/beerPostLikes/index.ts +++ b/src/controllers/likes/beerPostLikes/index.ts @@ -1,10 +1,10 @@ import { UserExtendedNextApiRequest } from '@/config/auth/types'; import ServerError from '@/config/util/ServerError'; -import getBeerPostById from '@/services/BeerPost/getBeerPostById'; -import createBeerPostLike from '@/services/BeerPostLike/createBeerPostLike'; -import findBeerPostLikeById from '@/services/BeerPostLike/findBeerPostLikeById'; -import getBeerPostLikeCountByBeerPostId from '@/services/BeerPostLike/getBeerPostLikeCount'; -import removeBeerPostLikeById from '@/services/BeerPostLike/removeBeerPostLikeById'; +import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById'; +import createBeerPostLike from '@/services/likes/BeerPostLike/createBeerPostLike'; +import findBeerPostLikeById from '@/services/likes/BeerPostLike/findBeerPostLikeById'; +import getBeerPostLikeCountByBeerPostId from '@/services/likes/BeerPostLike/getBeerPostLikeCount'; +import removeBeerPostLikeById from '@/services/likes/BeerPostLike/removeBeerPostLikeById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse, NextApiRequest } from 'next'; import { z } from 'zod'; diff --git a/src/controllers/likes/beerStyleLikes/index.ts b/src/controllers/likes/beerStyleLikes/index.ts index 6586113..3f18705 100644 --- a/src/controllers/likes/beerStyleLikes/index.ts +++ b/src/controllers/likes/beerStyleLikes/index.ts @@ -1,9 +1,9 @@ import ServerError from '@/config/util/ServerError'; -import createBeerStyleLike from '@/services/BeerStyleLike/createBeerStyleLike'; -import findBeerStyleLikeById from '@/services/BeerStyleLike/findBeerStyleLikeById'; -import getBeerStyleLikeCount from '@/services/BeerStyleLike/getBeerStyleLikeCount'; -import removeBeerStyleLikeById from '@/services/BeerStyleLike/removeBeerStyleLikeById'; -import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById'; +import createBeerStyleLike from '@/services/likes/BeerStyleLike/createBeerStyleLike'; +import findBeerStyleLikeById from '@/services/likes/BeerStyleLike/findBeerStyleLikeById'; +import getBeerStyleLikeCount from '@/services/likes/BeerStyleLike/getBeerStyleLikeCount'; +import removeBeerStyleLikeById from '@/services/likes/BeerStyleLike/removeBeerStyleLikeById'; +import getBeerStyleById from '@/services/posts/BeerStyles/getBeerStyleById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse, NextApiRequest } from 'next'; import { z } from 'zod'; diff --git a/src/controllers/posts/beerPosts/index.ts b/src/controllers/posts/beerPosts/index.ts index 9daf865..decce5c 100644 --- a/src/controllers/posts/beerPosts/index.ts +++ b/src/controllers/posts/beerPosts/index.ts @@ -1,16 +1,16 @@ import ServerError from '@/config/util/ServerError'; -import deleteBeerPostById from '@/services/BeerPost/deleteBeerPostById'; -import editBeerPostById from '@/services/BeerPost/editBeerPostById'; -import getBeerPostById from '@/services/BeerPost/getBeerPostById'; +import deleteBeerPostById from '@/services/posts/BeerPost/deleteBeerPostById'; +import editBeerPostById from '@/services/posts/BeerPost/editBeerPostById'; +import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { NextHandler } from 'next-connect'; import { z } from 'zod'; -import getBeerRecommendations from '@/services/BeerPost/getBeerRecommendations'; -import getAllBeerPosts from '@/services/BeerPost/getAllBeerPosts'; +import getBeerRecommendations from '@/services/posts/BeerPost/getBeerRecommendations'; +import getAllBeerPosts from '@/services/posts/BeerPost/getAllBeerPosts'; import DBClient from '@/prisma/DBClient'; -import createNewBeerPost from '@/services/BeerPost/createNewBeerPost'; -import getBeerPostsByPostedById from '@/services/BeerPost/getBeerPostsByPostedById'; +import createNewBeerPost from '@/services/posts/BeerPost/createNewBeerPost'; +import getBeerPostsByPostedById from '@/services/posts/BeerPost/getBeerPostsByPostedById'; import { BeerPostRequest, CreateBeerPostRequest, diff --git a/src/controllers/posts/beerPosts/types/index.ts b/src/controllers/posts/beerPosts/types/index.ts index a7b32aa..9bfca22 100644 --- a/src/controllers/posts/beerPosts/types/index.ts +++ b/src/controllers/posts/beerPosts/types/index.ts @@ -1,6 +1,6 @@ import { UserExtendedNextApiRequest } from '@/config/auth/types'; -import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema'; -import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema'; +import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema'; +import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema'; import { NextApiRequest } from 'next'; import { z } from 'zod'; diff --git a/src/controllers/posts/beerStyles/index.ts b/src/controllers/posts/beerStyles/index.ts index a49ea42..3cebe50 100644 --- a/src/controllers/posts/beerStyles/index.ts +++ b/src/controllers/posts/beerStyles/index.ts @@ -5,9 +5,9 @@ import DBClient from '@/prisma/DBClient'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; -import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById'; -import getBeerPostsByBeerStyleId from '@/services/BeerPost/getBeerPostsByBeerStyleId'; -import getAllBeerStyles from '@/services/BeerStyles/getAllBeerStyles'; +import getBeerStyleById from '@/services/posts/BeerStyles/getBeerStyleById'; +import getBeerPostsByBeerStyleId from '@/services/posts/BeerPost/getBeerPostsByBeerStyleId'; +import getAllBeerStyles from '@/services/posts/BeerStyles/getAllBeerStyles'; import ServerError from '@/config/util/ServerError'; import { CreateBeerStyleRequest, GetBeerStyleByIdRequest } from './types'; diff --git a/src/controllers/posts/beerStyles/types/index.ts b/src/controllers/posts/beerStyles/types/index.ts index edb0042..d4deb87 100644 --- a/src/controllers/posts/beerStyles/types/index.ts +++ b/src/controllers/posts/beerStyles/types/index.ts @@ -2,7 +2,7 @@ import { NextApiRequest } from 'next'; import { UserExtendedNextApiRequest } from '@/config/auth/types'; import { z } from 'zod'; -import CreateBeerStyleValidationSchema from '@/services/BeerStyles/schema/CreateBeerStyleValidationSchema'; +import CreateBeerStyleValidationSchema from '@/services/posts/BeerStyles/schema/CreateBeerStyleValidationSchema'; export interface GetBeerStyleByIdRequest extends NextApiRequest { query: { id: string }; diff --git a/src/controllers/posts/breweries/index.ts b/src/controllers/posts/breweries/index.ts index 05de01b..59fa617 100644 --- a/src/controllers/posts/breweries/index.ts +++ b/src/controllers/posts/breweries/index.ts @@ -1,14 +1,14 @@ import DBClient from '@/prisma/DBClient'; -import getAllBreweryPostsByPostedById from '@/services/BreweryPost/getAllBreweryPostsByPostedById'; +import getAllBreweryPostsByPostedById from '@/services/posts/BreweryPost/getAllBreweryPostsByPostedById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { z } from 'zod'; -import getAllBreweryPosts from '@/services/BreweryPost/getAllBreweryPosts'; -import createNewBreweryPost from '@/services/BreweryPost/createNewBreweryPost'; +import getAllBreweryPosts from '@/services/posts/BreweryPost/getAllBreweryPosts'; +import createNewBreweryPost from '@/services/posts/BreweryPost/createNewBreweryPost'; import geocode from '@/config/mapbox/geocoder'; import ServerError from '@/config/util/ServerError'; -import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { CreateBreweryPostRequest, GetBreweryPostsRequest } from './types'; import { GetAllPostsByConnectedPostId } from '../types'; diff --git a/src/controllers/posts/breweries/types/index.ts b/src/controllers/posts/breweries/types/index.ts index cfed9f8..c37b558 100644 --- a/src/controllers/posts/breweries/types/index.ts +++ b/src/controllers/posts/breweries/types/index.ts @@ -1,5 +1,5 @@ import { UserExtendedNextApiRequest } from '@/config/auth/types'; -import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema'; +import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema'; import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema'; import { NextApiRequest } from 'next'; import { z } from 'zod'; diff --git a/src/controllers/users/auth/index.ts b/src/controllers/users/auth/index.ts index 9b401e7..a056c59 100644 --- a/src/controllers/users/auth/index.ts +++ b/src/controllers/users/auth/index.ts @@ -3,24 +3,24 @@ import localStrat from '@/config/auth/localStrat'; import { getLoginSession, setLoginSession } from '@/config/auth/session'; import { UserExtendedNextApiRequest } from '@/config/auth/types'; import ServerError from '@/config/util/ServerError'; -import createNewUser from '@/services/User/createNewUser'; -import findUserByEmail from '@/services/User/findUserByEmail'; +import createNewUser from '@/services/users/User/createNewUser'; +import findUserByEmail from '@/services/users/User/findUserByEmail'; import { NextApiRequest, NextApiResponse } from 'next'; import { expressWrapper } from 'next-connect'; import passport from 'passport'; import { z } from 'zod'; -import findUserByUsername from '@/services/User/findUserByUsername'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; -import sendConfirmationEmail from '@/services/User/sendConfirmationEmail'; +import findUserByUsername from '@/services/users/User/findUserByUsername'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; +import sendConfirmationEmail from '@/services/users/User/sendConfirmationEmail'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import type { NextFunction } from 'express'; import { verifyConfirmationToken } from '@/config/jwt'; -import updateUserToBeConfirmedById from '@/services/User/updateUserToBeConfirmedById'; +import updateUserToBeConfirmedById from '@/services/users/User/updateUserToBeConfirmedById'; import DBClient from '@/prisma/DBClient'; -import sendResetPasswordEmail from '@/services/User/sendResetPasswordEmail'; +import sendResetPasswordEmail from '@/services/users/User/sendResetPasswordEmail'; import { hashPassword } from '@/config/auth/passwordFns'; -import deleteUserById from '@/services/User/deleteUserById'; +import deleteUserById from '@/services/users/User/deleteUserById'; import { CheckEmailRequest, CheckUsernameRequest, diff --git a/src/controllers/users/auth/types/index.ts b/src/controllers/users/auth/types/index.ts index adcadc4..48d51fd 100644 --- a/src/controllers/users/auth/types/index.ts +++ b/src/controllers/users/auth/types/index.ts @@ -2,8 +2,8 @@ import { UserExtendedNextApiRequest } from '@/config/auth/types'; import { CreateUserValidationSchema, UpdatePasswordSchema, -} from '@/services/User/schema/CreateUserValidationSchemas'; -import TokenValidationSchema from '@/services/User/schema/TokenValidationSchema'; +} from '@/services/users/User/schema/CreateUserValidationSchemas'; +import TokenValidationSchema from '@/services/users/User/schema/TokenValidationSchema'; import { NextApiRequest } from 'next'; import { z } from 'zod'; diff --git a/src/controllers/users/profile/index.ts b/src/controllers/users/profile/index.ts index dbe4989..c5db3b4 100644 --- a/src/controllers/users/profile/index.ts +++ b/src/controllers/users/profile/index.ts @@ -1,17 +1,17 @@ import ServerError from '@/config/util/ServerError'; import DBClient from '@/prisma/DBClient'; -import findUserById from '@/services/User/findUserById'; +import findUserById from '@/services/users/User/findUserById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { z } from 'zod'; -import getUsersFollowingUser from '@/services/UserFollows/getUsersFollowingUser'; -import getUsersFollowedByUser from '@/services/UserFollows/getUsersFollowedByUser'; +import getUsersFollowingUser from '@/services/users/UserFollows/getUsersFollowingUser'; +import getUsersFollowedByUser from '@/services/users/UserFollows/getUsersFollowedByUser'; import { NextHandler } from 'next-connect'; import updateUserAvatarById, { UpdateUserAvatarByIdParams, -} from '@/services/UserAccount/UpdateUserAvatarByIdParams'; +} from '@/services/users/UserAccount/UpdateUserAvatarByIdParams'; import { UserExtendedNextApiRequest } from '@/config/auth/types'; -import updateUserProfileById from '@/services/User/updateUserProfileById'; +import updateUserProfileById from '@/services/users/User/updateUserProfileById'; import { UserRouteRequest, GetUserFollowInfoRequest, diff --git a/src/controllers/users/profile/types/index.ts b/src/controllers/users/profile/types/index.ts index b80838b..7daf5c3 100644 --- a/src/controllers/users/profile/types/index.ts +++ b/src/controllers/users/profile/types/index.ts @@ -1,5 +1,5 @@ import { UserExtendedNextApiRequest } from '@/config/auth/types'; -import EditUserSchema from '@/services/User/schema/EditUserSchema'; +import EditUserSchema from '@/services/users/User/schema/EditUserSchema'; import { z } from 'zod'; export interface UserRouteRequest extends UserExtendedNextApiRequest { diff --git a/src/hooks/auth/useUser.ts b/src/hooks/auth/useUser.ts index 3f5dd52..0c82de9 100644 --- a/src/hooks/auth/useUser.ts +++ b/src/hooks/auth/useUser.ts @@ -1,4 +1,4 @@ -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWR from 'swr'; diff --git a/src/hooks/data-fetching/beer-posts/useBeerPostSearch.ts b/src/hooks/data-fetching/beer-posts/useBeerPostSearch.ts index d94aa00..c81e4d3 100644 --- a/src/hooks/data-fetching/beer-posts/useBeerPostSearch.ts +++ b/src/hooks/data-fetching/beer-posts/useBeerPostSearch.ts @@ -1,4 +1,4 @@ -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import useSWR from 'swr'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/beer-posts/useBeerPosts.ts b/src/hooks/data-fetching/beer-posts/useBeerPosts.ts index 6210bba..f72764c 100644 --- a/src/hooks/data-fetching/beer-posts/useBeerPosts.ts +++ b/src/hooks/data-fetching/beer-posts/useBeerPosts.ts @@ -1,4 +1,4 @@ -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/beer-posts/useBeerPostsByBeerStyles.ts b/src/hooks/data-fetching/beer-posts/useBeerPostsByBeerStyles.ts index c6f1dc9..9585bdf 100644 --- a/src/hooks/data-fetching/beer-posts/useBeerPostsByBeerStyles.ts +++ b/src/hooks/data-fetching/beer-posts/useBeerPostsByBeerStyles.ts @@ -1,4 +1,4 @@ -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/beer-posts/useBeerPostsByBrewery.ts b/src/hooks/data-fetching/beer-posts/useBeerPostsByBrewery.ts index f8dddaa..33875d6 100644 --- a/src/hooks/data-fetching/beer-posts/useBeerPostsByBrewery.ts +++ b/src/hooks/data-fetching/beer-posts/useBeerPostsByBrewery.ts @@ -1,4 +1,4 @@ -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/beer-posts/useBeerPostsByUser.ts b/src/hooks/data-fetching/beer-posts/useBeerPostsByUser.ts index 1b74340..7422ad5 100644 --- a/src/hooks/data-fetching/beer-posts/useBeerPostsByUser.ts +++ b/src/hooks/data-fetching/beer-posts/useBeerPostsByUser.ts @@ -1,4 +1,4 @@ -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/beer-posts/useBeerRecommendations.ts b/src/hooks/data-fetching/beer-posts/useBeerRecommendations.ts index ab83742..ec9aacb 100644 --- a/src/hooks/data-fetching/beer-posts/useBeerRecommendations.ts +++ b/src/hooks/data-fetching/beer-posts/useBeerRecommendations.ts @@ -1,4 +1,4 @@ -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/beer-styles/useBeerStyles.ts b/src/hooks/data-fetching/beer-styles/useBeerStyles.ts index c00b3dd..21581b8 100644 --- a/src/hooks/data-fetching/beer-styles/useBeerStyles.ts +++ b/src/hooks/data-fetching/beer-styles/useBeerStyles.ts @@ -1,4 +1,4 @@ -import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult'; +import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/brewery-posts/useBreweryMapPagePosts.ts b/src/hooks/data-fetching/brewery-posts/useBreweryMapPagePosts.ts index 2ea9fe3..4a905d4 100644 --- a/src/hooks/data-fetching/brewery-posts/useBreweryMapPagePosts.ts +++ b/src/hooks/data-fetching/brewery-posts/useBreweryMapPagePosts.ts @@ -1,4 +1,4 @@ -import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult'; +import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts b/src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts index 7ce0517..4c3725e 100644 --- a/src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts +++ b/src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts @@ -1,4 +1,4 @@ -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/brewery-posts/useBreweryPostsByUser.ts b/src/hooks/data-fetching/brewery-posts/useBreweryPostsByUser.ts index 3c8a5cd..ecf34ab 100644 --- a/src/hooks/data-fetching/brewery-posts/useBreweryPostsByUser.ts +++ b/src/hooks/data-fetching/brewery-posts/useBreweryPostsByUser.ts @@ -1,4 +1,4 @@ -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/user-follows/useGetUsersFollowedByUser.ts b/src/hooks/data-fetching/user-follows/useGetUsersFollowedByUser.ts index 58b28e4..58365b8 100644 --- a/src/hooks/data-fetching/user-follows/useGetUsersFollowedByUser.ts +++ b/src/hooks/data-fetching/user-follows/useGetUsersFollowedByUser.ts @@ -17,7 +17,7 @@ * - `mutate` A function to mutate the data. * - `error` The error object, if any. */ -import FollowInfoSchema from '@/services/UserFollows/schema/FollowInfoSchema'; +import FollowInfoSchema from '@/services/users/UserFollows/schema/FollowInfoSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/hooks/data-fetching/user-follows/useGetUsersFollowingUser.ts b/src/hooks/data-fetching/user-follows/useGetUsersFollowingUser.ts index c5406f7..85f57f2 100644 --- a/src/hooks/data-fetching/user-follows/useGetUsersFollowingUser.ts +++ b/src/hooks/data-fetching/user-follows/useGetUsersFollowingUser.ts @@ -1,4 +1,4 @@ -import FollowInfoSchema from '@/services/UserFollows/schema/FollowInfoSchema'; +import FollowInfoSchema from '@/services/users/UserFollows/schema/FollowInfoSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import useSWRInfinite from 'swr/infinite'; import { z } from 'zod'; diff --git a/src/pages/api/beers/[id]/index.ts b/src/pages/api/beers/[id]/index.ts index a5a40ca..1a82fc1 100644 --- a/src/pages/api/beers/[id]/index.ts +++ b/src/pages/api/beers/[id]/index.ts @@ -13,7 +13,7 @@ import { deleteBeerPost, } from '@/controllers/posts/beerPosts'; -import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema'; +import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; diff --git a/src/pages/api/beers/create.ts b/src/pages/api/beers/create.ts index 0787d82..29c0bb9 100644 --- a/src/pages/api/beers/create.ts +++ b/src/pages/api/beers/create.ts @@ -1,7 +1,7 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest'; import { createRouter } from 'next-connect'; -import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema'; +import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { z } from 'zod'; diff --git a/src/pages/api/beers/search.ts b/src/pages/api/beers/search.ts index e088143..dd2cca1 100644 --- a/src/pages/api/beers/search.ts +++ b/src/pages/api/beers/search.ts @@ -5,7 +5,7 @@ import { NextApiRequest, NextApiResponse } from 'next'; import { createRouter } from 'next-connect'; import { z } from 'zod'; import DBClient from '@/prisma/DBClient'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; const SearchSchema = z.object({ search: z.string().min(1), diff --git a/src/pages/api/beers/styles/create.ts b/src/pages/api/beers/styles/create.ts index 80ecf3b..5c51c89 100644 --- a/src/pages/api/beers/styles/create.ts +++ b/src/pages/api/beers/styles/create.ts @@ -2,7 +2,7 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser'; import validateRequest from '@/config/nextConnect/middleware/validateRequest'; import { createBeerStyle } from '@/controllers/posts/beerStyles'; import { CreateBeerStyleRequest } from '@/controllers/posts/beerStyles/types'; -import CreateBeerStyleValidationSchema from '@/services/BeerStyles/schema/CreateBeerStyleValidationSchema'; +import CreateBeerStyleValidationSchema from '@/services/posts/BeerStyles/schema/CreateBeerStyleValidationSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { createRouter } from 'next-connect'; diff --git a/src/pages/api/breweries/[id]/index.ts b/src/pages/api/breweries/[id]/index.ts index f491ea6..b359552 100644 --- a/src/pages/api/breweries/[id]/index.ts +++ b/src/pages/api/breweries/[id]/index.ts @@ -7,8 +7,8 @@ import { createRouter, NextHandler } from 'next-connect'; import { z } from 'zod'; import ServerError from '@/config/util/ServerError'; import DBClient from '@/prisma/DBClient'; -import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById'; -import EditBreweryPostValidationSchema from '@/services/BreweryPost/schema/EditBreweryPostValidationSchema'; +import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById'; +import EditBreweryPostValidationSchema from '@/services/posts/BreweryPost/schema/EditBreweryPostValidationSchema'; interface BreweryPostRequest extends UserExtendedNextApiRequest { query: { id: string }; diff --git a/src/pages/api/breweries/create.ts b/src/pages/api/breweries/create.ts index 12edf2d..0291b4e 100644 --- a/src/pages/api/breweries/create.ts +++ b/src/pages/api/breweries/create.ts @@ -5,8 +5,8 @@ import { NextApiResponse } from 'next'; import { z } from 'zod'; import NextConnectOptions from '@/config/nextConnect/NextConnectOptions'; import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser'; -import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema'; -import createNewBreweryPost from '@/services/BreweryPost/createNewBreweryPost'; +import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema'; +import createNewBreweryPost from '@/services/posts/BreweryPost/createNewBreweryPost'; import geocode from '@/config/mapbox/geocoder'; import ServerError from '@/config/util/ServerError'; import DBClient from '@/prisma/DBClient'; diff --git a/src/pages/api/breweries/map/index.ts b/src/pages/api/breweries/map/index.ts index 7c5f6d6..8781c54 100644 --- a/src/pages/api/breweries/map/index.ts +++ b/src/pages/api/breweries/map/index.ts @@ -1,6 +1,6 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest'; import DBClient from '@/prisma/DBClient'; -import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult'; +import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult'; import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; diff --git a/src/pages/api/users/[id]/index.ts b/src/pages/api/users/[id]/index.ts index afa2179..5572129 100644 --- a/src/pages/api/users/[id]/index.ts +++ b/src/pages/api/users/[id]/index.ts @@ -4,7 +4,7 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest'; import { editUserInfo, deleteAccount } from '@/controllers/users/auth'; import { checkIfUserCanEditUser } from '@/controllers/users/profile'; import { EditUserRequest } from '@/controllers/users/profile/types'; -import EditUserSchema from '@/services/User/schema/EditUserSchema'; +import EditUserSchema from '@/services/users/User/schema/EditUserSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; diff --git a/src/pages/api/users/confirm.ts b/src/pages/api/users/confirm.ts index 274cb0a..8e7cff3 100644 --- a/src/pages/api/users/confirm.ts +++ b/src/pages/api/users/confirm.ts @@ -9,7 +9,7 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest'; import { TokenValidationRequest } from '@/controllers/users/auth/types'; import { confirmUser } from '@/controllers/users/auth'; -import TokenValidationSchema from '@/services/User/schema/TokenValidationSchema'; +import TokenValidationSchema from '@/services/users/User/schema/TokenValidationSchema'; const router = createRouter< TokenValidationRequest, diff --git a/src/pages/api/users/edit-password.ts b/src/pages/api/users/edit-password.ts index 899b2f9..7701184 100644 --- a/src/pages/api/users/edit-password.ts +++ b/src/pages/api/users/edit-password.ts @@ -3,7 +3,7 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser'; import validateRequest from '@/config/nextConnect/middleware/validateRequest'; import { updatePassword } from '@/controllers/users/auth'; import { UpdatePasswordRequest } from '@/controllers/users/auth/types'; -import { UpdatePasswordSchema } from '@/services/User/schema/CreateUserValidationSchemas'; +import { UpdatePasswordSchema } from '@/services/users/User/schema/CreateUserValidationSchemas'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { createRouter } from 'next-connect'; diff --git a/src/pages/api/users/login.ts b/src/pages/api/users/login.ts index 4648f44..7fef08c 100644 --- a/src/pages/api/users/login.ts +++ b/src/pages/api/users/login.ts @@ -3,7 +3,7 @@ import NextConnectOptions from '@/config/nextConnect/NextConnectOptions'; import { createRouter } from 'next-connect'; import { NextApiResponse } from 'next'; import { z } from 'zod'; -import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema'; +import LoginValidationSchema from '@/services/users/User/schema/LoginValidationSchema'; import { UserExtendedNextApiRequest } from '@/config/auth/types'; import validateRequest from '@/config/nextConnect/middleware/validateRequest'; import { authenticateUser, loginUser } from '@/controllers/users/auth'; diff --git a/src/pages/api/users/register.ts b/src/pages/api/users/register.ts index 8ee065e..5ee8ef1 100644 --- a/src/pages/api/users/register.ts +++ b/src/pages/api/users/register.ts @@ -1,7 +1,7 @@ import { NextApiResponse } from 'next'; import { z } from 'zod'; import { createRouter } from 'next-connect'; -import { CreateUserValidationSchema } from '@/services/User/schema/CreateUserValidationSchemas'; +import { CreateUserValidationSchema } from '@/services/users/User/schema/CreateUserValidationSchemas'; import NextConnectOptions from '@/config/nextConnect/NextConnectOptions'; import validateRequest from '@/config/nextConnect/middleware/validateRequest'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; diff --git a/src/pages/beers/[id]/edit.tsx b/src/pages/beers/[id]/edit.tsx index c153afa..30c2fdf 100644 --- a/src/pages/beers/[id]/edit.tsx +++ b/src/pages/beers/[id]/edit.tsx @@ -3,8 +3,8 @@ import Head from 'next/head'; import React from 'react'; import withPageAuthRequired from '@/util/withPageAuthRequired'; -import getBeerPostById from '@/services/BeerPost/getBeerPostById'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import EditBeerPostForm from '@/components/EditBeerPostForm'; import FormPageLayout from '@/components/ui/forms/FormPageLayout'; import { BiBeer } from 'react-icons/bi'; diff --git a/src/pages/beers/[id]/index.tsx b/src/pages/beers/[id]/index.tsx index 3bf7bb3..dc79abc 100644 --- a/src/pages/beers/[id]/index.tsx +++ b/src/pages/beers/[id]/index.tsx @@ -1,8 +1,8 @@ import { NextPage, GetServerSideProps } from 'next'; import Head from 'next/head'; -import getBeerPostById from '@/services/BeerPost/getBeerPostById'; +import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { z } from 'zod'; diff --git a/src/pages/beers/styles/[id]/index.tsx b/src/pages/beers/styles/[id]/index.tsx index ea81bb0..3d652e8 100644 --- a/src/pages/beers/styles/[id]/index.tsx +++ b/src/pages/beers/styles/[id]/index.tsx @@ -5,9 +5,9 @@ import { z } from 'zod'; import useMediaQuery from '@/hooks/utilities/useMediaQuery'; import { Tab } from '@headlessui/react'; -import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById'; +import getBeerStyleById from '@/services/posts/BeerStyles/getBeerStyleById'; import BeerStyleHeader from '@/components/BeerStyleById/BeerStyleHeader'; -import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult'; +import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult'; import BeerStyleCommentSection from '@/components/BeerStyleById/BeerStyleCommentSection'; import BeerStyleBeerSection from '@/components/BeerStyleById/BeerStyleBeerSection'; diff --git a/src/pages/breweries/[id]/beers/create.tsx b/src/pages/breweries/[id]/beers/create.tsx index 4374e24..a55190c 100644 --- a/src/pages/breweries/[id]/beers/create.tsx +++ b/src/pages/breweries/[id]/beers/create.tsx @@ -3,12 +3,12 @@ import FormPageLayout from '@/components/ui/forms/FormPageLayout'; import withPageAuthRequired from '@/util/withPageAuthRequired'; import DBClient from '@/prisma/DBClient'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { BeerStyle } from '@prisma/client'; import { NextPage } from 'next'; import { BiBeer } from 'react-icons/bi'; import { z } from 'zod'; -import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById'; +import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById'; interface CreateBeerPageProps { brewery: z.infer; diff --git a/src/pages/breweries/[id]/edit.tsx b/src/pages/breweries/[id]/edit.tsx index 171d980..11d5807 100644 --- a/src/pages/breweries/[id]/edit.tsx +++ b/src/pages/breweries/[id]/edit.tsx @@ -5,9 +5,9 @@ import FormPageLayout from '@/components/ui/forms/FormPageLayout'; import FormSegment from '@/components/ui/forms/FormSegment'; import FormTextArea from '@/components/ui/forms/FormTextArea'; import FormTextInput from '@/components/ui/forms/FormTextInput'; -import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; -import EditBreweryPostValidationSchema from '@/services/BreweryPost/schema/EditBreweryPostValidationSchema'; +import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; +import EditBreweryPostValidationSchema from '@/services/posts/BreweryPost/schema/EditBreweryPostValidationSchema'; import withPageAuthRequired from '@/util/withPageAuthRequired'; import { zodResolver } from '@hookform/resolvers/zod'; import { NextPage } from 'next'; diff --git a/src/pages/breweries/[id]/index.tsx b/src/pages/breweries/[id]/index.tsx index 4665c2b..7dc3998 100644 --- a/src/pages/breweries/[id]/index.tsx +++ b/src/pages/breweries/[id]/index.tsx @@ -1,5 +1,5 @@ -import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { GetServerSideProps, NextPage } from 'next'; import { z } from 'zod'; diff --git a/src/pages/breweries/index.tsx b/src/pages/breweries/index.tsx index 2b6dae2..65e720f 100644 --- a/src/pages/breweries/index.tsx +++ b/src/pages/breweries/index.tsx @@ -3,7 +3,7 @@ import LoadingCard from '@/components/ui/LoadingCard'; import Spinner from '@/components/ui/Spinner'; import UserContext from '@/contexts/UserContext'; import useBreweryPosts from '@/hooks/data-fetching/brewery-posts/useBreweryPosts'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { NextPage } from 'next'; import Head from 'next/head'; import { useContext, MutableRefObject, useRef } from 'react'; diff --git a/src/pages/breweries/map.tsx b/src/pages/breweries/map.tsx index 61b0c20..4033493 100644 --- a/src/pages/breweries/map.tsx +++ b/src/pages/breweries/map.tsx @@ -7,7 +7,7 @@ import LocationMarker from '@/components/ui/LocationMarker'; import Link from 'next/link'; import Head from 'next/head'; import useGeolocation from '@/hooks/utilities/useGeolocation'; -import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult'; +import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult'; import { z } from 'zod'; import useBreweryMapPagePosts from '@/hooks/data-fetching/brewery-posts/useBreweryMapPagePosts'; import ControlPanel from '@/components/ui/maps/ControlPanel'; diff --git a/src/pages/users/[id].tsx b/src/pages/users/[id].tsx index 66c2d5d..7c2f05d 100644 --- a/src/pages/users/[id].tsx +++ b/src/pages/users/[id].tsx @@ -1,6 +1,6 @@ import useMediaQuery from '@/hooks/utilities/useMediaQuery'; -import findUserById from '@/services/User/findUserById'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import findUserById from '@/services/users/User/findUserById'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import Head from 'next/head'; import { FC } from 'react'; diff --git a/src/pages/users/account/edit-profile.tsx b/src/pages/users/account/edit-profile.tsx index 230399b..1d69c9c 100644 --- a/src/pages/users/account/edit-profile.tsx +++ b/src/pages/users/account/edit-profile.tsx @@ -21,7 +21,7 @@ import UpdateProfileForm from '@/components/Account/UpdateProfileForm'; import useGetUsersFollowedByUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowedByUser'; import useGetUsersFollowingUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowingUser'; -import UpdateProfileSchema from '@/services/User/schema/UpdateProfileSchema'; +import UpdateProfileSchema from '@/services/users/User/schema/UpdateProfileSchema'; import sendUpdateUserAvatarRequest from '@/requests/Account/sendUpdateUserAvatarRequest'; import sendUpdateUserProfileRequest from '@/requests/Account/sendUpdateUserProfileRequest'; import Spinner from '@/components/ui/Spinner'; diff --git a/src/pages/users/forgot-password.tsx b/src/pages/users/forgot-password.tsx index 1307b01..72023cd 100644 --- a/src/pages/users/forgot-password.tsx +++ b/src/pages/users/forgot-password.tsx @@ -4,7 +4,7 @@ import FormInfo from '@/components/ui/forms/FormInfo'; import FormLabel from '@/components/ui/forms/FormLabel'; import FormSegment from '@/components/ui/forms/FormSegment'; import FormTextInput from '@/components/ui/forms/FormTextInput'; -import { BaseCreateUserSchema } from '@/services/User/schema/CreateUserValidationSchemas'; +import { BaseCreateUserSchema } from '@/services/users/User/schema/CreateUserValidationSchemas'; import createErrorToast from '@/util/createErrorToast'; import { zodResolver } from '@hookform/resolvers/zod'; import { NextPage } from 'next'; diff --git a/src/pages/users/reset-password.tsx b/src/pages/users/reset-password.tsx index f51ae9f..e464987 100644 --- a/src/pages/users/reset-password.tsx +++ b/src/pages/users/reset-password.tsx @@ -1,7 +1,7 @@ import { setLoginSession } from '@/config/auth/session'; import { verifyResetPasswordToken } from '@/config/jwt'; import ServerError from '@/config/util/ServerError'; -import findUserById from '@/services/User/findUserById'; +import findUserById from '@/services/users/User/findUserById'; import { GetServerSideProps, NextApiResponse, NextPage } from 'next'; diff --git a/src/prisma/seed/create/createAdminUser.ts b/src/prisma/seed/create/createAdminUser.ts index 07b3d96..d81db79 100644 --- a/src/prisma/seed/create/createAdminUser.ts +++ b/src/prisma/seed/create/createAdminUser.ts @@ -4,7 +4,7 @@ import { hashPassword } from '../../../config/auth/passwordFns'; import { ADMIN_PASSWORD } from '../../../config/env'; import DBClient from '../../DBClient'; -import GetUserSchema from '../../../services/User/schema/GetUserSchema'; +import GetUserSchema from '../../../services/users/User/schema/GetUserSchema'; import imageUrls from '../util/imageUrls'; const createAdminUser = async () => { diff --git a/src/requests/Account/sendUpdateUserProfileRequest.ts b/src/requests/Account/sendUpdateUserProfileRequest.ts index b55fb8a..5846156 100644 --- a/src/requests/Account/sendUpdateUserProfileRequest.ts +++ b/src/requests/Account/sendUpdateUserProfileRequest.ts @@ -1,4 +1,4 @@ -import UpdateProfileSchema from '@/services/User/schema/UpdateProfileSchema'; +import UpdateProfileSchema from '@/services/users/User/schema/UpdateProfileSchema'; import { z } from 'zod'; interface UpdateProfileRequestParams { diff --git a/src/requests/BeerImage/sendUploadBeerImageRequest.ts b/src/requests/BeerImage/sendUploadBeerImageRequest.ts index de1906c..67b2e8c 100644 --- a/src/requests/BeerImage/sendUploadBeerImageRequest.ts +++ b/src/requests/BeerImage/sendUploadBeerImageRequest.ts @@ -1,4 +1,4 @@ -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { z } from 'zod'; diff --git a/src/requests/BeerPost/sendCreateBeerPostRequest.ts b/src/requests/BeerPost/sendCreateBeerPostRequest.ts index 960e75a..9e04ada 100644 --- a/src/requests/BeerPost/sendCreateBeerPostRequest.ts +++ b/src/requests/BeerPost/sendCreateBeerPostRequest.ts @@ -1,5 +1,5 @@ -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; -import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; +import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { z } from 'zod'; diff --git a/src/requests/BeerPost/sendEditBeerPostRequest.ts b/src/requests/BeerPost/sendEditBeerPostRequest.ts index f85d615..37d0366 100644 --- a/src/requests/BeerPost/sendEditBeerPostRequest.ts +++ b/src/requests/BeerPost/sendEditBeerPostRequest.ts @@ -1,4 +1,4 @@ -import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema'; +import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { z } from 'zod'; diff --git a/src/requests/BreweryImage/sendUploadBreweryImageRequest.ts b/src/requests/BreweryImage/sendUploadBreweryImageRequest.ts index 7875d68..0821c6d 100644 --- a/src/requests/BreweryImage/sendUploadBreweryImageRequest.ts +++ b/src/requests/BreweryImage/sendUploadBreweryImageRequest.ts @@ -1,4 +1,4 @@ -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { z } from 'zod'; interface SendUploadBeerImagesRequestArgs { diff --git a/src/requests/BreweryPost/sendCreateBreweryPostRequest.ts b/src/requests/BreweryPost/sendCreateBreweryPostRequest.ts index 2da3ed5..9b14b74 100644 --- a/src/requests/BreweryPost/sendCreateBreweryPostRequest.ts +++ b/src/requests/BreweryPost/sendCreateBreweryPostRequest.ts @@ -1,5 +1,5 @@ -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; -import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; +import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { z } from 'zod'; diff --git a/src/requests/User/sendEditUserRequest.ts b/src/requests/User/sendEditUserRequest.ts index 17eb453..7a0ecbf 100644 --- a/src/requests/User/sendEditUserRequest.ts +++ b/src/requests/User/sendEditUserRequest.ts @@ -1,4 +1,4 @@ -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { z } from 'zod'; diff --git a/src/requests/User/sendRegisterUserRequest.ts b/src/requests/User/sendRegisterUserRequest.ts index b29b5e5..66cc069 100644 --- a/src/requests/User/sendRegisterUserRequest.ts +++ b/src/requests/User/sendRegisterUserRequest.ts @@ -1,5 +1,5 @@ -import { CreateUserValidationSchema } from '@/services/User/schema/CreateUserValidationSchemas'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import { CreateUserValidationSchema } from '@/services/users/User/schema/CreateUserValidationSchemas'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { z } from 'zod'; diff --git a/src/requests/User/sendUpdatePasswordRequest.ts b/src/requests/User/sendUpdatePasswordRequest.ts index 01b55c3..407e8e7 100644 --- a/src/requests/User/sendUpdatePasswordRequest.ts +++ b/src/requests/User/sendUpdatePasswordRequest.ts @@ -1,4 +1,4 @@ -import { UpdatePasswordSchema } from '@/services/User/schema/CreateUserValidationSchemas'; +import { UpdatePasswordSchema } from '@/services/users/User/schema/CreateUserValidationSchemas'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { z } from 'zod'; diff --git a/src/services/BeerComment/createNewBeerComment.ts b/src/services/comments/BeerComment/createNewBeerComment.ts similarity index 83% rename from src/services/BeerComment/createNewBeerComment.ts rename to src/services/comments/BeerComment/createNewBeerComment.ts index 9abba2b..664e19e 100644 --- a/src/services/BeerComment/createNewBeerComment.ts +++ b/src/services/comments/BeerComment/createNewBeerComment.ts @@ -1,7 +1,7 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CreateCommentValidationSchema from '../schema/CommentSchema/CreateCommentValidationSchema'; -import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult'; +import CreateCommentValidationSchema from '../../schema/CommentSchema/CreateCommentValidationSchema'; +import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult'; const CreateNewBeerCommentServiceSchema = CreateCommentValidationSchema.extend({ userId: z.string().cuid(), diff --git a/src/services/BeerComment/editBeerCommentById.ts b/src/services/comments/BeerComment/editBeerCommentById.ts similarity index 89% rename from src/services/BeerComment/editBeerCommentById.ts rename to src/services/comments/BeerComment/editBeerCommentById.ts index 2aa4e3c..5449bf4 100644 --- a/src/services/BeerComment/editBeerCommentById.ts +++ b/src/services/comments/BeerComment/editBeerCommentById.ts @@ -1,6 +1,6 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult'; +import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult'; interface EditBeerCommentByIdArgs { id: string; diff --git a/src/services/BeerComment/findBeerCommentById.ts b/src/services/comments/BeerComment/findBeerCommentById.ts similarity index 88% rename from src/services/BeerComment/findBeerCommentById.ts rename to src/services/comments/BeerComment/findBeerCommentById.ts index f985414..e27acff 100644 --- a/src/services/BeerComment/findBeerCommentById.ts +++ b/src/services/comments/BeerComment/findBeerCommentById.ts @@ -1,6 +1,6 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult'; +import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult'; interface FindBeerCommentArgs { beerCommentId: string; diff --git a/src/services/BeerComment/getAllBeerComments.ts b/src/services/comments/BeerComment/getAllBeerComments.ts similarity index 90% rename from src/services/BeerComment/getAllBeerComments.ts rename to src/services/comments/BeerComment/getAllBeerComments.ts index c7a30bd..26c5e1d 100644 --- a/src/services/BeerComment/getAllBeerComments.ts +++ b/src/services/comments/BeerComment/getAllBeerComments.ts @@ -1,6 +1,6 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult'; +import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult'; interface GetAllBeerCommentsArgs { beerPostId: string; diff --git a/src/services/BeerComment/getBeerCommentCount.ts b/src/services/comments/BeerComment/getBeerCommentCount.ts similarity index 100% rename from src/services/BeerComment/getBeerCommentCount.ts rename to src/services/comments/BeerComment/getBeerCommentCount.ts diff --git a/src/services/BeerStyleComment/createNewBeerStyleComment.ts b/src/services/comments/BeerStyleComment/createNewBeerStyleComment.ts similarity index 84% rename from src/services/BeerStyleComment/createNewBeerStyleComment.ts rename to src/services/comments/BeerStyleComment/createNewBeerStyleComment.ts index 9d29ee2..8197438 100644 --- a/src/services/BeerStyleComment/createNewBeerStyleComment.ts +++ b/src/services/comments/BeerStyleComment/createNewBeerStyleComment.ts @@ -1,7 +1,7 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CreateCommentValidationSchema from '../schema/CommentSchema/CreateCommentValidationSchema'; -import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult'; +import CreateCommentValidationSchema from '../../schema/CommentSchema/CreateCommentValidationSchema'; +import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult'; const CreateNewBeerStyleCommentServiceSchema = CreateCommentValidationSchema.extend({ userId: z.string().cuid(), diff --git a/src/services/BeerStyleComment/getAllBeerStyleComments.ts b/src/services/comments/BeerStyleComment/getAllBeerStyleComments.ts similarity index 90% rename from src/services/BeerStyleComment/getAllBeerStyleComments.ts rename to src/services/comments/BeerStyleComment/getAllBeerStyleComments.ts index 77deced..08219bf 100644 --- a/src/services/BeerStyleComment/getAllBeerStyleComments.ts +++ b/src/services/comments/BeerStyleComment/getAllBeerStyleComments.ts @@ -1,6 +1,6 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult'; +import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult'; interface GetAllBeerStyleCommentArgs { beerStyleId: string; diff --git a/src/services/BeerStyleComment/getBeerStyleCommentCount.ts b/src/services/comments/BeerStyleComment/getBeerStyleCommentCount.ts similarity index 100% rename from src/services/BeerStyleComment/getBeerStyleCommentCount.ts rename to src/services/comments/BeerStyleComment/getBeerStyleCommentCount.ts diff --git a/src/services/BeerStyleComment/updateBeerStyleCommentById.ts b/src/services/comments/BeerStyleComment/updateBeerStyleCommentById.ts similarity index 83% rename from src/services/BeerStyleComment/updateBeerStyleCommentById.ts rename to src/services/comments/BeerStyleComment/updateBeerStyleCommentById.ts index 30fe53d..a457043 100644 --- a/src/services/BeerStyleComment/updateBeerStyleCommentById.ts +++ b/src/services/comments/BeerStyleComment/updateBeerStyleCommentById.ts @@ -1,6 +1,6 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CreateCommentValidationSchema from '../schema/CommentSchema/CreateCommentValidationSchema'; +import CreateCommentValidationSchema from '../../schema/CommentSchema/CreateCommentValidationSchema'; interface UpdateBeerStyleCommentByIdParams { body: z.infer; diff --git a/src/services/BreweryComment/createNewBreweryComment.ts b/src/services/comments/BreweryComment/createNewBreweryComment.ts similarity index 83% rename from src/services/BreweryComment/createNewBreweryComment.ts rename to src/services/comments/BreweryComment/createNewBreweryComment.ts index d161292..ea8de7b 100644 --- a/src/services/BreweryComment/createNewBreweryComment.ts +++ b/src/services/comments/BreweryComment/createNewBreweryComment.ts @@ -1,7 +1,7 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CreateCommentValidationSchema from '../schema/CommentSchema/CreateCommentValidationSchema'; -import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult'; +import CreateCommentValidationSchema from '../../schema/CommentSchema/CreateCommentValidationSchema'; +import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult'; const CreateNewBreweryCommentServiceSchema = CreateCommentValidationSchema.extend({ userId: z.string().cuid(), diff --git a/src/services/BreweryComment/getAllBreweryComments.ts b/src/services/comments/BreweryComment/getAllBreweryComments.ts similarity index 90% rename from src/services/BreweryComment/getAllBreweryComments.ts rename to src/services/comments/BreweryComment/getAllBreweryComments.ts index 766f68d..5c8a1a7 100644 --- a/src/services/BreweryComment/getAllBreweryComments.ts +++ b/src/services/comments/BreweryComment/getAllBreweryComments.ts @@ -1,6 +1,6 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult'; +import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult'; const getAllBreweryComments = async ({ id, diff --git a/src/services/BreweryComment/getBreweryCommentById.ts b/src/services/comments/BreweryComment/getBreweryCommentById.ts similarity index 100% rename from src/services/BreweryComment/getBreweryCommentById.ts rename to src/services/comments/BreweryComment/getBreweryCommentById.ts diff --git a/src/services/BeerImage/addBeerImageToDB.ts b/src/services/images/BeerImage/addBeerImageToDB.ts similarity index 90% rename from src/services/BeerImage/addBeerImageToDB.ts rename to src/services/images/BeerImage/addBeerImageToDB.ts index 0ca896b..e4e472a 100644 --- a/src/services/BeerImage/addBeerImageToDB.ts +++ b/src/services/images/BeerImage/addBeerImageToDB.ts @@ -1,7 +1,7 @@ import DBClient from '@/prisma/DBClient'; import { BeerImage } from '@prisma/client'; import { z } from 'zod'; -import ImageMetadataValidationSchema from '../schema/ImageSchema/ImageMetadataValidationSchema'; +import ImageMetadataValidationSchema from '../../schema/ImageSchema/ImageMetadataValidationSchema'; interface ProcessImageDataArgs { files: Express.Multer.File[]; diff --git a/src/services/BreweryImage/addBreweryImageToDB.ts b/src/services/images/BreweryImage/addBreweryImageToDB.ts similarity index 90% rename from src/services/BreweryImage/addBreweryImageToDB.ts rename to src/services/images/BreweryImage/addBreweryImageToDB.ts index e4b5499..99992f8 100644 --- a/src/services/BreweryImage/addBreweryImageToDB.ts +++ b/src/services/images/BreweryImage/addBreweryImageToDB.ts @@ -1,7 +1,7 @@ import DBClient from '@/prisma/DBClient'; import { BreweryImage } from '@prisma/client'; import { z } from 'zod'; -import ImageMetadataValidationSchema from '../schema/ImageSchema/ImageMetadataValidationSchema'; +import ImageMetadataValidationSchema from '../../schema/ImageSchema/ImageMetadataValidationSchema'; interface ProcessImageDataArgs { files: Express.Multer.File[]; diff --git a/src/services/BeerPostLike/createBeerPostLike.ts b/src/services/likes/BeerPostLike/createBeerPostLike.ts similarity index 85% rename from src/services/BeerPostLike/createBeerPostLike.ts rename to src/services/likes/BeerPostLike/createBeerPostLike.ts index f086321..6c2ebe8 100644 --- a/src/services/BeerPostLike/createBeerPostLike.ts +++ b/src/services/likes/BeerPostLike/createBeerPostLike.ts @@ -1,6 +1,6 @@ import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; -import GetUserSchema from '../User/schema/GetUserSchema'; +import GetUserSchema from '../../users/User/schema/GetUserSchema'; interface CreateBeerPostLikeArgs { id: string; diff --git a/src/services/BeerPostLike/findBeerPostLikeById.ts b/src/services/likes/BeerPostLike/findBeerPostLikeById.ts similarity index 100% rename from src/services/BeerPostLike/findBeerPostLikeById.ts rename to src/services/likes/BeerPostLike/findBeerPostLikeById.ts diff --git a/src/services/BeerPostLike/getBeerPostLikeCount.ts b/src/services/likes/BeerPostLike/getBeerPostLikeCount.ts similarity index 100% rename from src/services/BeerPostLike/getBeerPostLikeCount.ts rename to src/services/likes/BeerPostLike/getBeerPostLikeCount.ts diff --git a/src/services/BeerPostLike/removeBeerPostLikeById.ts b/src/services/likes/BeerPostLike/removeBeerPostLikeById.ts similarity index 100% rename from src/services/BeerPostLike/removeBeerPostLikeById.ts rename to src/services/likes/BeerPostLike/removeBeerPostLikeById.ts diff --git a/src/services/BeerStyleLike/createBeerStyleLike.ts b/src/services/likes/BeerStyleLike/createBeerStyleLike.ts similarity index 85% rename from src/services/BeerStyleLike/createBeerStyleLike.ts rename to src/services/likes/BeerStyleLike/createBeerStyleLike.ts index 9d4652b..6af1e71 100644 --- a/src/services/BeerStyleLike/createBeerStyleLike.ts +++ b/src/services/likes/BeerStyleLike/createBeerStyleLike.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; import DBClient from '@/prisma/DBClient'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; interface CreateBeerStyleLikeArgs { beerStyleId: string; diff --git a/src/services/BeerStyleLike/findBeerStyleLikeById.ts b/src/services/likes/BeerStyleLike/findBeerStyleLikeById.ts similarity index 100% rename from src/services/BeerStyleLike/findBeerStyleLikeById.ts rename to src/services/likes/BeerStyleLike/findBeerStyleLikeById.ts diff --git a/src/services/BeerStyleLike/getBeerStyleLikeCount.ts b/src/services/likes/BeerStyleLike/getBeerStyleLikeCount.ts similarity index 100% rename from src/services/BeerStyleLike/getBeerStyleLikeCount.ts rename to src/services/likes/BeerStyleLike/getBeerStyleLikeCount.ts diff --git a/src/services/BeerStyleLike/removeBeerStyleLikeById.ts b/src/services/likes/BeerStyleLike/removeBeerStyleLikeById.ts similarity index 100% rename from src/services/BeerStyleLike/removeBeerStyleLikeById.ts rename to src/services/likes/BeerStyleLike/removeBeerStyleLikeById.ts diff --git a/src/services/BeerPost/createNewBeerPost.ts b/src/services/posts/BeerPost/createNewBeerPost.ts similarity index 100% rename from src/services/BeerPost/createNewBeerPost.ts rename to src/services/posts/BeerPost/createNewBeerPost.ts diff --git a/src/services/BeerPost/deleteBeerPostById.ts b/src/services/posts/BeerPost/deleteBeerPostById.ts similarity index 100% rename from src/services/BeerPost/deleteBeerPostById.ts rename to src/services/posts/BeerPost/deleteBeerPostById.ts diff --git a/src/services/BeerPost/editBeerPostById.ts b/src/services/posts/BeerPost/editBeerPostById.ts similarity index 100% rename from src/services/BeerPost/editBeerPostById.ts rename to src/services/posts/BeerPost/editBeerPostById.ts diff --git a/src/services/BeerPost/getAllBeerPosts.ts b/src/services/posts/BeerPost/getAllBeerPosts.ts similarity index 92% rename from src/services/BeerPost/getAllBeerPosts.ts rename to src/services/posts/BeerPost/getAllBeerPosts.ts index 483f02c..dd37b8d 100644 --- a/src/services/BeerPost/getAllBeerPosts.ts +++ b/src/services/posts/BeerPost/getAllBeerPosts.ts @@ -1,5 +1,5 @@ import DBClient from '@/prisma/DBClient'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { z } from 'zod'; const prisma = DBClient.instance; diff --git a/src/services/BeerPost/getBeerPostById.ts b/src/services/posts/BeerPost/getBeerPostById.ts similarity index 90% rename from src/services/BeerPost/getBeerPostById.ts rename to src/services/posts/BeerPost/getBeerPostById.ts index 407c143..36fd1a2 100644 --- a/src/services/BeerPost/getBeerPostById.ts +++ b/src/services/posts/BeerPost/getBeerPostById.ts @@ -1,5 +1,5 @@ import DBClient from '@/prisma/DBClient'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { z } from 'zod'; const prisma = DBClient.instance; diff --git a/src/services/BeerPost/getBeerPostsByBeerStyleId.ts b/src/services/posts/BeerPost/getBeerPostsByBeerStyleId.ts similarity index 100% rename from src/services/BeerPost/getBeerPostsByBeerStyleId.ts rename to src/services/posts/BeerPost/getBeerPostsByBeerStyleId.ts diff --git a/src/services/BeerPost/getBeerPostsByBreweryId.ts b/src/services/posts/BeerPost/getBeerPostsByBreweryId.ts similarity index 100% rename from src/services/BeerPost/getBeerPostsByBreweryId.ts rename to src/services/posts/BeerPost/getBeerPostsByBreweryId.ts diff --git a/src/services/BeerPost/getBeerPostsByPostedById.ts b/src/services/posts/BeerPost/getBeerPostsByPostedById.ts similarity index 100% rename from src/services/BeerPost/getBeerPostsByPostedById.ts rename to src/services/posts/BeerPost/getBeerPostsByPostedById.ts diff --git a/src/services/BeerPost/getBeerRecommendations.ts b/src/services/posts/BeerPost/getBeerRecommendations.ts similarity index 94% rename from src/services/BeerPost/getBeerRecommendations.ts rename to src/services/posts/BeerPost/getBeerRecommendations.ts index 2fce906..6353e06 100644 --- a/src/services/BeerPost/getBeerRecommendations.ts +++ b/src/services/posts/BeerPost/getBeerRecommendations.ts @@ -1,5 +1,5 @@ import DBClient from '@/prisma/DBClient'; -import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult'; +import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult'; import { z } from 'zod'; diff --git a/src/services/BeerPost/schema/BeerPostQueryResult.ts b/src/services/posts/BeerPost/schema/BeerPostQueryResult.ts similarity index 100% rename from src/services/BeerPost/schema/BeerPostQueryResult.ts rename to src/services/posts/BeerPost/schema/BeerPostQueryResult.ts diff --git a/src/services/BeerPost/schema/CreateBeerPostValidationSchema.ts b/src/services/posts/BeerPost/schema/CreateBeerPostValidationSchema.ts similarity index 100% rename from src/services/BeerPost/schema/CreateBeerPostValidationSchema.ts rename to src/services/posts/BeerPost/schema/CreateBeerPostValidationSchema.ts diff --git a/src/services/BeerPost/schema/EditBeerPostValidationSchema.ts b/src/services/posts/BeerPost/schema/EditBeerPostValidationSchema.ts similarity index 100% rename from src/services/BeerPost/schema/EditBeerPostValidationSchema.ts rename to src/services/posts/BeerPost/schema/EditBeerPostValidationSchema.ts diff --git a/src/services/BeerStyles/deleteBeerStyleById.ts b/src/services/posts/BeerStyles/deleteBeerStyleById.ts similarity index 100% rename from src/services/BeerStyles/deleteBeerStyleById.ts rename to src/services/posts/BeerStyles/deleteBeerStyleById.ts diff --git a/src/services/BeerStyles/editBeerStyleById.ts b/src/services/posts/BeerStyles/editBeerStyleById.ts similarity index 100% rename from src/services/BeerStyles/editBeerStyleById.ts rename to src/services/posts/BeerStyles/editBeerStyleById.ts diff --git a/src/services/BeerStyles/getAllBeerStyles.ts b/src/services/posts/BeerStyles/getAllBeerStyles.ts similarity index 100% rename from src/services/BeerStyles/getAllBeerStyles.ts rename to src/services/posts/BeerStyles/getAllBeerStyles.ts diff --git a/src/services/BeerStyles/getBeerStyleById.ts b/src/services/posts/BeerStyles/getBeerStyleById.ts similarity index 100% rename from src/services/BeerStyles/getBeerStyleById.ts rename to src/services/posts/BeerStyles/getBeerStyleById.ts diff --git a/src/services/BeerStyles/schema/BeerStyleQueryResult.ts b/src/services/posts/BeerStyles/schema/BeerStyleQueryResult.ts similarity index 100% rename from src/services/BeerStyles/schema/BeerStyleQueryResult.ts rename to src/services/posts/BeerStyles/schema/BeerStyleQueryResult.ts diff --git a/src/services/BeerStyles/schema/CreateBeerStyleValidationSchema.ts b/src/services/posts/BeerStyles/schema/CreateBeerStyleValidationSchema.ts similarity index 100% rename from src/services/BeerStyles/schema/CreateBeerStyleValidationSchema.ts rename to src/services/posts/BeerStyles/schema/CreateBeerStyleValidationSchema.ts diff --git a/src/services/BreweryPost/createNewBreweryPost.ts b/src/services/posts/BreweryPost/createNewBreweryPost.ts similarity index 100% rename from src/services/BreweryPost/createNewBreweryPost.ts rename to src/services/posts/BreweryPost/createNewBreweryPost.ts diff --git a/src/services/BreweryPost/getAllBreweryPosts.ts b/src/services/posts/BreweryPost/getAllBreweryPosts.ts similarity index 92% rename from src/services/BreweryPost/getAllBreweryPosts.ts rename to src/services/posts/BreweryPost/getAllBreweryPosts.ts index c83883c..39db838 100644 --- a/src/services/BreweryPost/getAllBreweryPosts.ts +++ b/src/services/posts/BreweryPost/getAllBreweryPosts.ts @@ -1,5 +1,5 @@ import DBClient from '@/prisma/DBClient'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { z } from 'zod'; diff --git a/src/services/BreweryPost/getAllBreweryPostsByPostedById.ts b/src/services/posts/BreweryPost/getAllBreweryPostsByPostedById.ts similarity index 93% rename from src/services/BreweryPost/getAllBreweryPostsByPostedById.ts rename to src/services/posts/BreweryPost/getAllBreweryPostsByPostedById.ts index 9b70cd8..d8a3dc7 100644 --- a/src/services/BreweryPost/getAllBreweryPostsByPostedById.ts +++ b/src/services/posts/BreweryPost/getAllBreweryPostsByPostedById.ts @@ -1,5 +1,5 @@ import DBClient from '@/prisma/DBClient'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { z } from 'zod'; diff --git a/src/services/BreweryPost/getBreweryPostById.ts b/src/services/posts/BreweryPost/getBreweryPostById.ts similarity index 91% rename from src/services/BreweryPost/getBreweryPostById.ts rename to src/services/posts/BreweryPost/getBreweryPostById.ts index 51b5db9..0c8399b 100644 --- a/src/services/BreweryPost/getBreweryPostById.ts +++ b/src/services/posts/BreweryPost/getBreweryPostById.ts @@ -1,5 +1,5 @@ import DBClient from '@/prisma/DBClient'; -import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult'; +import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult'; import { z } from 'zod'; const prisma = DBClient.instance; diff --git a/src/services/BreweryPost/schema/BreweryPostMapQueryResult.ts b/src/services/posts/BreweryPost/schema/BreweryPostMapQueryResult.ts similarity index 100% rename from src/services/BreweryPost/schema/BreweryPostMapQueryResult.ts rename to src/services/posts/BreweryPost/schema/BreweryPostMapQueryResult.ts diff --git a/src/services/BreweryPost/schema/BreweryPostQueryResult.ts b/src/services/posts/BreweryPost/schema/BreweryPostQueryResult.ts similarity index 100% rename from src/services/BreweryPost/schema/BreweryPostQueryResult.ts rename to src/services/posts/BreweryPost/schema/BreweryPostQueryResult.ts diff --git a/src/services/BreweryPost/schema/CreateBreweryPostSchema.ts b/src/services/posts/BreweryPost/schema/CreateBreweryPostSchema.ts similarity index 100% rename from src/services/BreweryPost/schema/CreateBreweryPostSchema.ts rename to src/services/posts/BreweryPost/schema/CreateBreweryPostSchema.ts diff --git a/src/services/BreweryPost/schema/EditBreweryPostValidationSchema.ts b/src/services/posts/BreweryPost/schema/EditBreweryPostValidationSchema.ts similarity index 100% rename from src/services/BreweryPost/schema/EditBreweryPostValidationSchema.ts rename to src/services/posts/BreweryPost/schema/EditBreweryPostValidationSchema.ts diff --git a/src/services/User/createNewUser.ts b/src/services/users/User/createNewUser.ts similarity index 100% rename from src/services/User/createNewUser.ts rename to src/services/users/User/createNewUser.ts diff --git a/src/services/User/deleteUserById.ts b/src/services/users/User/deleteUserById.ts similarity index 100% rename from src/services/User/deleteUserById.ts rename to src/services/users/User/deleteUserById.ts diff --git a/src/services/User/findUserByEmail.ts b/src/services/users/User/findUserByEmail.ts similarity index 82% rename from src/services/User/findUserByEmail.ts rename to src/services/users/User/findUserByEmail.ts index 1fa85d4..6e505e1 100644 --- a/src/services/User/findUserByEmail.ts +++ b/src/services/users/User/findUserByEmail.ts @@ -1,4 +1,4 @@ -import DBClient from '../../prisma/DBClient'; +import DBClient from '../../../prisma/DBClient'; const findUserByEmail = async (email: string) => DBClient.instance.user.findFirst({ diff --git a/src/services/User/findUserById.ts b/src/services/users/User/findUserById.ts similarity index 100% rename from src/services/User/findUserById.ts rename to src/services/users/User/findUserById.ts diff --git a/src/services/User/findUserByIdPublic.ts b/src/services/users/User/findUserByIdPublic.ts similarity index 100% rename from src/services/User/findUserByIdPublic.ts rename to src/services/users/User/findUserByIdPublic.ts diff --git a/src/services/User/findUserByUsername.ts b/src/services/users/User/findUserByUsername.ts similarity index 82% rename from src/services/User/findUserByUsername.ts rename to src/services/users/User/findUserByUsername.ts index 1669e71..b4a57ca 100644 --- a/src/services/User/findUserByUsername.ts +++ b/src/services/users/User/findUserByUsername.ts @@ -1,4 +1,4 @@ -import DBClient from '../../prisma/DBClient'; +import DBClient from '../../../prisma/DBClient'; const findUserByUsername = async (username: string) => DBClient.instance.user.findFirst({ diff --git a/src/services/User/schema/CreateUserValidationSchemas.ts b/src/services/users/User/schema/CreateUserValidationSchemas.ts similarity index 100% rename from src/services/User/schema/CreateUserValidationSchemas.ts rename to src/services/users/User/schema/CreateUserValidationSchemas.ts diff --git a/src/services/User/schema/EditUserSchema.ts b/src/services/users/User/schema/EditUserSchema.ts similarity index 100% rename from src/services/User/schema/EditUserSchema.ts rename to src/services/users/User/schema/EditUserSchema.ts diff --git a/src/services/User/schema/GetUserSchema.ts b/src/services/users/User/schema/GetUserSchema.ts similarity index 100% rename from src/services/User/schema/GetUserSchema.ts rename to src/services/users/User/schema/GetUserSchema.ts diff --git a/src/services/User/schema/LoginValidationSchema.ts b/src/services/users/User/schema/LoginValidationSchema.ts similarity index 100% rename from src/services/User/schema/LoginValidationSchema.ts rename to src/services/users/User/schema/LoginValidationSchema.ts diff --git a/src/services/User/schema/PublicUserSchema.ts b/src/services/users/User/schema/PublicUserSchema.ts similarity index 69% rename from src/services/User/schema/PublicUserSchema.ts rename to src/services/users/User/schema/PublicUserSchema.ts index 59e85aa..08895f3 100644 --- a/src/services/User/schema/PublicUserSchema.ts +++ b/src/services/users/User/schema/PublicUserSchema.ts @@ -1,4 +1,4 @@ -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; const PublicUserSchema = GetUserSchema.pick({ id: true, diff --git a/src/services/User/schema/TokenValidationSchema.ts b/src/services/users/User/schema/TokenValidationSchema.ts similarity index 100% rename from src/services/User/schema/TokenValidationSchema.ts rename to src/services/users/User/schema/TokenValidationSchema.ts diff --git a/src/services/User/schema/UpdateProfileSchema.ts b/src/services/users/User/schema/UpdateProfileSchema.ts similarity index 100% rename from src/services/User/schema/UpdateProfileSchema.ts rename to src/services/users/User/schema/UpdateProfileSchema.ts diff --git a/src/services/User/sendConfirmationEmail.ts b/src/services/users/User/sendConfirmationEmail.ts similarity index 100% rename from src/services/User/sendConfirmationEmail.ts rename to src/services/users/User/sendConfirmationEmail.ts diff --git a/src/services/User/sendResetPasswordEmail.ts b/src/services/users/User/sendResetPasswordEmail.ts similarity index 100% rename from src/services/User/sendResetPasswordEmail.ts rename to src/services/users/User/sendResetPasswordEmail.ts diff --git a/src/services/User/updateUserProfileById.ts b/src/services/users/User/updateUserProfileById.ts similarity index 100% rename from src/services/User/updateUserProfileById.ts rename to src/services/users/User/updateUserProfileById.ts diff --git a/src/services/User/updateUserToBeConfirmedById.ts b/src/services/users/User/updateUserToBeConfirmedById.ts similarity index 91% rename from src/services/User/updateUserToBeConfirmedById.ts rename to src/services/users/User/updateUserToBeConfirmedById.ts index 4a8e7f3..650b42d 100644 --- a/src/services/User/updateUserToBeConfirmedById.ts +++ b/src/services/users/User/updateUserToBeConfirmedById.ts @@ -1,4 +1,4 @@ -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import DBClient from '@/prisma/DBClient'; import { z } from 'zod'; diff --git a/src/services/UserAccount/UpdateUserAvatarByIdParams.ts b/src/services/users/UserAccount/UpdateUserAvatarByIdParams.ts similarity index 94% rename from src/services/UserAccount/UpdateUserAvatarByIdParams.ts rename to src/services/users/UserAccount/UpdateUserAvatarByIdParams.ts index bf915bf..9002c47 100644 --- a/src/services/UserAccount/UpdateUserAvatarByIdParams.ts +++ b/src/services/users/UserAccount/UpdateUserAvatarByIdParams.ts @@ -1,5 +1,5 @@ import DBClient from '@/prisma/DBClient'; -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; import { z } from 'zod'; export interface UpdateUserAvatarByIdParams { diff --git a/src/services/UserFollows/getUsersFollowedByUser.ts b/src/services/users/UserFollows/getUsersFollowedByUser.ts similarity index 100% rename from src/services/UserFollows/getUsersFollowedByUser.ts rename to src/services/users/UserFollows/getUsersFollowedByUser.ts diff --git a/src/services/UserFollows/getUsersFollowingUser.ts b/src/services/users/UserFollows/getUsersFollowingUser.ts similarity index 100% rename from src/services/UserFollows/getUsersFollowingUser.ts rename to src/services/users/UserFollows/getUsersFollowingUser.ts diff --git a/src/services/UserFollows/schema/FollowInfoSchema.ts b/src/services/users/UserFollows/schema/FollowInfoSchema.ts similarity index 65% rename from src/services/UserFollows/schema/FollowInfoSchema.ts rename to src/services/users/UserFollows/schema/FollowInfoSchema.ts index 86ff7d4..7151448 100644 --- a/src/services/UserFollows/schema/FollowInfoSchema.ts +++ b/src/services/users/UserFollows/schema/FollowInfoSchema.ts @@ -1,4 +1,4 @@ -import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import GetUserSchema from '@/services/users/User/schema/GetUserSchema'; const FollowInfoSchema = GetUserSchema.pick({ userAvatar: true,