imports fix

Author: LCcodder

source/api/v1/api/validation/schemas/NoteSchemas.ts

@@ -1,6 +1,6 @@
 import { excludeProperties, pickProperties } from "typing-assets"
 import { BaseNoteSchema, OperateNoteSchema } from "./base/Note"
-import { NOTE_RESPONSES } from "../../../openapi/responses/NoteResponses"
+import { NOTE_RESPONSES } from "../../openapi/responses/NoteResponses"
 import { FastifySchema } from "../../../shared/utils/typing/FastifySchemaOverride"
 
 export const CreateNoteSchema: FastifySchema = {

source/api/v1/api/validation/schemas/UserSchemas.ts

@@ -1,7 +1,7 @@
 import { FastifySchema } from "../../../shared/utils/typing/FastifySchemaOverride";
 import { excludeProperties, pickProperties } from "typing-assets"
 import { BaseUserSchema } from "./base/User"
-import { USER_RESPONSES } from "../../../openapi/responses/UserResponses";
+import { USER_RESPONSES } from "../../openapi/responses/UserResponses";
 
 export const CreateUserSchema: FastifySchema = {
     body: {

source/api/v1/database/InitDataSource.ts

@@ -1,6 +1,6 @@
 import { DataSource } from "typeorm";
-import { UserEntity }  from "./entities/User";
-import { NoteEntity }  from "./entities/Note";
+import { User as UserEntity }  from "./entities/User";
+import { Note as NoteEntity }  from "./entities/Note";
 import { withRetry } from "../shared/decorators/WithRetry";
 
 
@@ -17,7 +17,7 @@ export class DataSourceInitialiser {
     public async initAndGetDataSource(): Promise<DataSource> {
         const appDataSource = new DataSource({
             type: "postgres",
-            entities: [UserEntity.User, NoteEntity.Note],
+            entities: [UserEntity, NoteEntity],
             synchronize: true,
             logging: false,
             host: this.host,

source/api/v1/database/entities/Note.ts

@@ -7,7 +7,7 @@ import {
     ManyToMany,
     JoinTable
 } from "typeorm";
-import {UserEntity} from "./User";
+import {User as UserEntity} from "./User";
 
 @Entity()
 export class Note {
@@ -34,9 +34,9 @@ export class Note {
     })
     public tags: string[];
 
-    @ManyToMany(() => UserEntity.User, null, {cascade: true})
+    @ManyToMany(() => UserEntity, null, {cascade: true})
     @JoinTable()
-    public collaborators: UserEntity.User[];
+    public collaborators: UserEntity[];
 
     @CreateDateColumn({
         type: "timestamp",

source/api/v1/shared/config/ServerConfiguration.ts

@@ -6,9 +6,9 @@ export const CONFIG: Config = {
 
     databaseHost: process.env.DATABASE_HOST || "localhost",
     databasePort: parseInt(process.env.DATABASE_PORT || "5432"),
-    databaseName: process.env.DATABASE_NAME || "postgres",
+    databaseName: process.env.DATABASE_NAME || "NodeNotes",
     databaseUser: process.env.DATABASE_USER || "postgres",
-    databasePassword: process.env.DATABASE_PASSWORD || "postgres",
+    databasePassword: process.env.DATABASE_PASSWORD || "Rrobocopid12",
 
     get databaseConnectionString(): string {
         return `postgres://${this.databaseUser}:${this.databasePassword}@${this.databaseHost}:${this.databasePort}/${this.databaseName}`

source/api/v1/shared/utils/common/TransformNoteCollaborators.ts

@@ -1,4 +1,5 @@
-import { Note, Note as NoteEntity } from "../../../database/entities/Note";
+import { Note as NoteEntity } from "../../../database/entities/Note";
+import { Note } from "../../dto/NoteDto";
 
 export const transformNoteCollaborators = (note: NoteEntity): Note => {
     return {

source/main.ts

@@ -1,13 +1,10 @@
 import fastify from 'fastify'
 import { CONFIG } from './api/v1/shared/config/ServerConfiguration'
 import { UsersService } from './api/v1/services/users/UsersService'
-import { UsersHandler } from './api/v1/handlers/UsersHandlers'
 import { AuthService } from './api/v1/services/auth/AuthService'
-import { AuthHandler } from './api/v1/handlers/AuthHandlers'
 import { logRequestMetadata } from './api/v1/api/hooks/onRequestLogger'
 import { logResponseMetadata } from './api/v1/api/hooks/onResponseLogger'
 import { authorizationPreHandlerFactory } from './api/v1/api/prehandlers/AuthPreHandler'
-import { NotesHandler } from './api/v1/handlers/NotesHandlers'
 import { NotesService } from './api/v1/services/notes/NotesService'
 import "reflect-metadata"
 import { User as UserEntity } from './api/v1/database/entities/User'
@@ -17,6 +14,9 @@ import { initSwaggerViewer } from './api/v1/api/openapi/swagger/InitSwagger'
 import { connectAndGetRedisInstance } from './api/v1/cache/InitRedisInstance'
 import Healthcheck from './api/v1/shared/utils/common/Healthcheck'
 import { CommonHandler } from './api/v1/api/handlers/common/CommonHandler'
+import { AuthHandler } from './api/v1/api/handlers/auth/AuthHandlers'
+import { NotesHandler } from './api/v1/api/handlers/notes/NotesHandlers'
+import { UsersHandler } from './api/v1/api/handlers/users/UsersHandlers'
 
 const main = async () => {
     CONFIG.log()