diff --git a/backend/src/models/Badge.ts b/backend/src/db/models/Badge.ts similarity index 100% rename from backend/src/models/Badge.ts rename to backend/src/db/models/Badge.ts diff --git a/backend/src/models/Category.ts b/backend/src/db/models/Category.ts similarity index 100% rename from backend/src/models/Category.ts rename to backend/src/db/models/Category.ts diff --git a/backend/src/models/Comment.ts b/backend/src/db/models/Comment.ts similarity index 100% rename from backend/src/models/Comment.ts rename to backend/src/db/models/Comment.ts diff --git a/backend/src/models/Donations.ts b/backend/src/db/models/Donations.ts similarity index 100% rename from backend/src/models/Donations.ts rename to backend/src/db/models/Donations.ts diff --git a/backend/src/models/EmailAddress.ts b/backend/src/db/models/EmailAddress.ts similarity index 100% rename from backend/src/models/EmailAddress.ts rename to backend/src/db/models/EmailAddress.ts diff --git a/backend/src/models/Group.ts b/backend/src/db/models/Group.ts similarity index 100% rename from backend/src/models/Group.ts rename to backend/src/db/models/Group.ts diff --git a/backend/src/models/Image.ts b/backend/src/db/models/Image.ts similarity index 100% rename from backend/src/models/Image.ts rename to backend/src/db/models/Image.ts diff --git a/backend/src/models/InviteCode.ts b/backend/src/db/models/InviteCode.ts similarity index 100% rename from backend/src/models/InviteCode.ts rename to backend/src/db/models/InviteCode.ts diff --git a/backend/src/models/Location.ts b/backend/src/db/models/Location.ts similarity index 100% rename from backend/src/models/Location.ts rename to backend/src/db/models/Location.ts diff --git a/backend/src/models/Migration.ts b/backend/src/db/models/Migration.ts similarity index 100% rename from backend/src/models/Migration.ts rename to backend/src/db/models/Migration.ts diff --git a/backend/src/models/Post.ts b/backend/src/db/models/Post.ts similarity index 100% rename from backend/src/models/Post.ts rename to backend/src/db/models/Post.ts diff --git a/backend/src/models/Report.ts b/backend/src/db/models/Report.ts similarity index 100% rename from backend/src/models/Report.ts rename to backend/src/db/models/Report.ts diff --git a/backend/src/models/SocialMedia.ts b/backend/src/db/models/SocialMedia.ts similarity index 100% rename from backend/src/models/SocialMedia.ts rename to backend/src/db/models/SocialMedia.ts diff --git a/backend/src/models/Tag.ts b/backend/src/db/models/Tag.ts similarity index 100% rename from backend/src/models/Tag.ts rename to backend/src/db/models/Tag.ts diff --git a/backend/src/models/UnverifiedEmailAddress.ts b/backend/src/db/models/UnverifiedEmailAddress.ts similarity index 100% rename from backend/src/models/UnverifiedEmailAddress.ts rename to backend/src/db/models/UnverifiedEmailAddress.ts diff --git a/backend/src/models/User.spec.ts b/backend/src/db/models/User.spec.ts similarity index 100% rename from backend/src/models/User.spec.ts rename to backend/src/db/models/User.spec.ts diff --git a/backend/src/models/User.ts b/backend/src/db/models/User.ts similarity index 100% rename from backend/src/models/User.ts rename to backend/src/db/models/User.ts diff --git a/backend/src/models/index.ts b/backend/src/db/models/index.ts similarity index 100% rename from backend/src/models/index.ts rename to backend/src/db/models/index.ts diff --git a/backend/src/db/neo4j.ts b/backend/src/db/neo4j.ts index dcd19a0ea..5d084099a 100644 --- a/backend/src/db/neo4j.ts +++ b/backend/src/db/neo4j.ts @@ -6,7 +6,7 @@ import neo4j, { Driver } from 'neo4j-driver' import Neode from 'neode' import CONFIG from '@config/index' -import models from '@models/index' +import models from '@db/models/index' let driver: Driver const defaultOptions = { diff --git a/backend/src/graphql/resolvers/posts.spec.ts b/backend/src/graphql/resolvers/posts.spec.ts index 0a05200fd..7574bef17 100644 --- a/backend/src/graphql/resolvers/posts.spec.ts +++ b/backend/src/graphql/resolvers/posts.spec.ts @@ -8,9 +8,9 @@ import gql from 'graphql-tag' import CONFIG from '@config/index' import Factory, { cleanDatabase } from '@db/factories' +import Image from '@db/models/Image' import { getNeode, getDriver } from '@db/neo4j' import { createPostMutation } from '@graphql/queries/createPostMutation' -import Image from '@models/Image' import createServer from '@src/server' CONFIG.CATEGORIES_ACTIVE = true diff --git a/backend/src/graphql/resolvers/registration.spec.ts b/backend/src/graphql/resolvers/registration.spec.ts index f19c6bf01..ccf5a9e10 100644 --- a/backend/src/graphql/resolvers/registration.spec.ts +++ b/backend/src/graphql/resolvers/registration.spec.ts @@ -7,9 +7,9 @@ import gql from 'graphql-tag' import CONFIG from '@config/index' import Factory, { cleanDatabase } from '@db/factories' +import EmailAddress from '@db/models/EmailAddress' +import User from '@db/models/User' import { getDriver, getNeode } from '@db/neo4j' -import EmailAddress from '@models/EmailAddress' -import User from '@models/User' import createServer from '@src/server' const neode = getNeode() diff --git a/backend/src/graphql/resolvers/users.spec.ts b/backend/src/graphql/resolvers/users.spec.ts index ad37e2024..4fc1c3efd 100644 --- a/backend/src/graphql/resolvers/users.spec.ts +++ b/backend/src/graphql/resolvers/users.spec.ts @@ -8,8 +8,8 @@ import gql from 'graphql-tag' import { categories } from '@constants/categories' import Factory, { cleanDatabase } from '@db/factories' +import User from '@db/models/User' import { getNeode, getDriver } from '@db/neo4j' -import User from '@models/User' import createServer from '@src/server' const categoryIds = ['cat9'] diff --git a/backend/src/jwt/decode.spec.ts b/backend/src/jwt/decode.spec.ts index 0cd52a5d5..cbb220b5b 100644 --- a/backend/src/jwt/decode.spec.ts +++ b/backend/src/jwt/decode.spec.ts @@ -2,8 +2,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import Factory, { cleanDatabase } from '@db/factories' +import User from '@db/models/User' import { getDriver, getNeode } from '@db/neo4j' -import User from '@models/User' import decode from './decode' import encode from './encode' diff --git a/backend/src/middleware/permissionsMiddleware.ts b/backend/src/middleware/permissionsMiddleware.ts index 7c562635e..5725b2d98 100644 --- a/backend/src/middleware/permissionsMiddleware.ts +++ b/backend/src/middleware/permissionsMiddleware.ts @@ -7,9 +7,9 @@ import { rule, shield, deny, allow, or, and } from 'graphql-shield' import CONFIG from '@config/index' +import SocialMedia from '@db/models/SocialMedia' import { getNeode } from '@db/neo4j' import { validateInviteCode } from '@graphql/resolvers/transactions/inviteCodes' -import SocialMedia from '@models/SocialMedia' const debug = !!CONFIG.DEBUG const allowExternalErrors = true diff --git a/backend/tsconfig.json b/backend/tsconfig.json index 160664b66..e34f920be 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -37,7 +37,6 @@ "@helpers/*": ["./src/helpers/*"], "@jwt/*": ["./src/jwt/*"], "@middleware/*": ["./src/middleware/*"], - "@models/*": ["./src/models/*"], "@src/*": ["./src/*"], "@root/*": ["./*"] },