Upload own data backend

app/migrations/20240111123307-userfile.cjs

@@ -8,23 +8,23 @@ module.exports = {
         type: Sequelize.UUID,
         primaryKey: true,
       },
-      user_id: {
+      userId: {
         type: Sequelize.UUID,
         allowNull: true,
         references: {
           model:'User',
           key: 'user_id'
         }
       },
-      file_reference: {
+      fileReference: {
         type: Sequelize.STRING,
         allowNull: true
       },
       data: {
         type: Sequelize.BLOB,
         allowNull: true,
       },
-      file_type: {
+      fileType: {
         type: Sequelize.STRING,
         allowNull: true
       },
@@ -40,7 +40,7 @@ module.exports = {
         type: Sequelize.STRING,
         allowNull: true
       },
-      gpc_ref_no: {
+      gpcRefNo: {
         type: Sequelize.STRING,
         allowNull: true
       },
@@ -50,7 +50,7 @@ module.exports = {
         allowNull: true,
         defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
       },
-      last_updated: {
+      lastUpdated: {
         type: Sequelize.DATE,
         allowNull: true,
         defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),

app/src/app/[lng]/data/[step]/page.tsx

@@ -55,7 +55,8 @@ import { logger } from "@/services/logger";
 
 function getMailURI(locode?: string, sector?: string, year?: number): string {
   const emails =
-    process.env.NEXT_PUBLIC_SUPPORT_EMAILS || "[email protected],[email protected]";
+    process.env.NEXT_PUBLIC_SUPPORT_EMAILS ||
+    "[email protected],[email protected]";
   return `mailto://${emails}?subject=Missing third party data sources&body=City: ${locode}%0ASector: ${sector}%0AYear: ${year}`;
 }
 

app/src/app/api/v0/user/[user]/file/[file]/download-file/route.ts

@@ -9,21 +9,10 @@ export const GET = apiHandler(
     _req: Request,
     context: { session?: Session; params: Record<string, string> },
   ) => {
-    const userId = context.params.user;
     if (!context.session) {
       throw new createHttpError.Unauthorized("Unauthorized");
     }
 
-    const user = await db.models.User.findOne({
-      attributes: ["userId"],
-      where: {
-        userId: userId,
-      },
-    });
-    if (!user) {
-      throw new createHttpError.NotFound("File does not belong to this user");
-    }
-
     const userFile = await db.models.UserFile.findOne({
       where: {
         id: context.params.file,
@@ -34,13 +23,16 @@ export const GET = apiHandler(
       throw new createHttpError.NotFound("User file not found");
     }
 
+    if (!userFile.userId)
+      throw new createHttpError.NotFound("file does not belong to this user");
+
     let body: Buffer | undefined;
     let headers: Record<string, string> | null = null;
 
     body = userFile.data;
     headers = {
-      "Content-Type": "application/vnd.ms-excel",
-      "Content-Disposition": `attachment; filename="${userFile.id}.${userFile.file_type}"`,
+      "Content-Type": `application/${userFile.fileType}`,
+      "Content-Disposition": `attachment; filename="${userFile.id}.${userFile.fileType}"`,
     };
 
     return new NextResponse(body, { headers });

app/src/app/api/v0/user/[user]/file/[file]/route.ts

@@ -9,21 +9,10 @@ export const GET = apiHandler(
     _req: Request,
     context: { session?: Session; params: Record<string, string> },
   ) => {
-    const userId = context.params.user;
     if (!context.session) {
       throw new createHttpError.Unauthorized("Unauthorized");
     }
 
-    const user = await db.models.User.findOne({
-      attributes: ["userId"],
-      where: {
-        userId: userId,
-      },
-    });
-    if (!user) {
-      throw new createHttpError.NotFound("File does not belong to this user");
-    }
-
     const userFile = await db.models.UserFile.findOne({
       where: {
         id: context.params.file,
@@ -34,6 +23,9 @@ export const GET = apiHandler(
       throw new createHttpError.NotFound("User file not found");
     }
 
+    if (!userFile.userId)
+      throw new createHttpError.NotFound("file does not belong to this user");
+
     return NextResponse.json({ data: userFile });
   },
 );
@@ -43,22 +35,10 @@ export const DELETE = apiHandler(
     _req: Request,
     context: { session?: Session; params: Record<string, string> },
   ) => {
-    const userId = context.params.user;
     if (!context.session) {
       throw new createHttpError.Unauthorized("Unauthorized");
     }
 
-    const user = await db.models.User.findOne({
-      attributes: ["userId"],
-      where: {
-        userId: userId,
-      },
-    });
-
-    if (!user) {
-      throw new createHttpError.NotFound("File does not belong to this user");
-    }
-
     const userFile = await db.models.UserFile.findOne({
       where: {
         id: context.params.file,
@@ -68,7 +48,8 @@ export const DELETE = apiHandler(
     if (!userFile) {
       throw new createHttpError.NotFound("User file not found");
     }
-
+    if (!userFile.userId)
+      throw new createHttpError.NotFound("file does not belong to this user");
     await userFile.destroy();
 
     return NextResponse.json({ data: userFile, deleted: true });

app/src/app/api/v0/user/[user]/file/route.ts

@@ -21,19 +21,9 @@ export const GET = apiHandler(
       throw new createHttpError.Unauthorized("Unauthorized");
     }
 
-    const user = await db.models.User.findOne({
-      attributes: ["userId"],
-      where: {
-        userId: userId,
-      },
-    });
-    if (!user) {
-      throw new createHttpError.NotFound("User not found");
-    }
-
     const userFiles = await db.models.UserFile.findAll({
       where: {
-        userId: user.userId,
+        userId: userId,
       },
     });
 
@@ -56,20 +46,11 @@ export const POST = apiHandler(
       throw new createHttpError.Unauthorized("Unauthorized");
     }
 
-    const user = await db.models.User.findOne({
-      attributes: ["userId"],
-      where: {
-        userId: userId,
-      },
-    });
-
-    if (!user) {
-      throw new createHttpError.NotFound("User not allowed");
-    }
-
     const formData = await req.formData();
-    const file = formData.get("data") as unknown as File;
-    if (!file) throw new createHttpError.BadRequest("File not found");
+    const file = formData?.get("data") as unknown as File;
+
+    if (!file)
+      throw new createHttpError.BadRequest("File not found, Please add a file");
 
     const filename = file.name;
 
@@ -81,14 +62,14 @@ export const POST = apiHandler(
     const buffer = Buffer.from(bytes);
 
     const fileData = {
-      userId: formData.get("userId"),
-      file_reference: formData.get("file_reference"),
+      userId: userId,
+      fileReference: formData.get("fileReference"),
       url: formData.get("url"),
       data: buffer,
-      file_type: fileType,
+      fileType: fileType,
       sector: formData.get("sector"),
       status: formData.get("status"),
-      gpc_ref_no: formData.get("gpc_ref_no"),
+      gpcRefNo: formData.get("gpcRefNo"),
     };
 
     const body = createUserFileRequset.parse(fileData);

app/src/models/UserFile.ts

@@ -5,13 +5,13 @@ import { User, UserId } from "./User";
 export interface UserFileAttributes {
   id: string;
   userId?: string;
-  file_reference?: string;
+  fileReference?: string;
   data?: Buffer;
-  file_type?: string;
+  fileType?: string;
   sector?: string;
   status?: string;
   url?: string;
-  gpc_ref_no?: string;
+  gpcRefNo?: string;
   created?: Date;
   lastUpdated?: Date;
 }
@@ -20,13 +20,13 @@ export type UserFilePk = "id";
 export type UserFileId = UserFile[UserFilePk];
 export type UserFileOptionalAttributes =
   | "userId"
-  | "file_reference"
+  | "fileReference"
   | "data"
-  | "file_type"
+  | "fileType"
   | "sector"
   | "url"
   | "status"
-  | "gpc_ref_no"
+  | "gpcRefNo"
   | "created"
   | "lastUpdated";
 export type UserFileCreationAttributes = Optional<
@@ -40,13 +40,13 @@ export class UserFile
 {
   id!: string;
   userId?: string | undefined;
-  file_reference?: string | undefined;
+  fileReference?: string | undefined;
   data: Buffer | undefined;
-  file_type?: string | undefined;
+  fileType?: string | undefined;
   sector?: string | undefined;
   url?: string | undefined;
   status: string | undefined;
-  gpc_ref_no?: string | undefined;
+  gpcRefNo?: string | undefined;
   created?: Date | undefined;
   lastUpdated?: Date | undefined;
 
@@ -72,17 +72,17 @@ export class UserFile
             model: "User",
             key: "user_id",
           },
-          field: "user_id",
+          field: "userId",
         },
-        file_reference: {
+        fileReference: {
           type: DataTypes.STRING(255),
           allowNull: true,
         },
         data: {
           type: DataTypes.BLOB,
           allowNull: true,
         },
-        file_type: {
+        fileType: {
           type: DataTypes.STRING(255),
           allowNull: true,
         },
@@ -98,7 +98,7 @@ export class UserFile
           type: DataTypes.STRING(255),
           allowNull: true,
         },
-        gpc_ref_no: {
+        gpcRefNo: {
           type: DataTypes.STRING(255),
           allowNull: true,
         },
@@ -109,7 +109,7 @@ export class UserFile
         schema: "public",
         timestamps: true,
         createdAt: "created",
-        updatedAt: "last_updated",
+        updatedAt: "lastUpdated",
         indexes: [
           {
             name: "UserFile_pkey",

app/src/models/init-models.ts

@@ -652,7 +652,7 @@ export function initModels(sequelize: Sequelize) {
   });
   User.belongsTo(User, { as: "organization", foreignKey: "organizationId" });
   User.hasMany(User, { as: "users", foreignKey: "organizationId" });
-  User.hasOne(UserFile, { foreignKey: "userId", as: "user" });
+  User.hasMany(UserFile, { foreignKey: "userId", as: "user" });
   UserFile.belongsTo(User, { as: "userFiles", foreignKey: "userId" });
 
   return {

app/src/util/validation.ts

@@ -128,13 +128,13 @@ export type CreatePopulationRequest = z.infer<typeof createPopulationRequest>;
 // user file schema validation
 export const createUserFileRequset = z.object({
   userId: z.string().uuid().optional(),
-  file_reference: z.string().optional(),
+  fileReference: z.string().optional(),
   data: z.any(),
-  file_type: z.string().optional(),
+  fileType: z.string().optional(),
   sector: z.string().optional(),
   url: z.string().url().optional(),
   status: z.string().optional(),
-  gpc_ref_no: z.string().optional(),
+  gpcRefNo: z.string().optional(),
 });
 
 // Schema type definition