admtracksteel/GPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new endpoints

Browse Source
This commit is contained in:
admtracksteel
2026-04-02 14:33:49 +00:00
parent 9860583e81
commit 0dca418f37
3 changed files with 128 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/server/controllers/inspectionController.ts
View File

@@ -1,27 +1,28 @@
import { Request, Response } from 'express';
import * as inspectionService from '../services/inspectionService.js';
import { notificationService } from '../services/notificationService.js';
import '../middleware/authMiddleware.js'; // Ensure type augmentation
export const createInspection = async (req: Request, res: Response) => {
try {
const organizationId = req.appUser?.organizationId;
const createdBy = req.appUser?.email || 'guest';
const inspection = await inspectionService.createInspection({
...req.body,
organizationId,
createdBy
});
// Notificação de Inspeção Reprovada
if (req.body.appearance === 'rejected' && organizationId) {
try {
await notificationService.create({
organizationId,
title: 'Inspeção Reprovada',
message: `Uma inspeção foi reprovada na obra (ID: ${req.body.projectId}).`,
type: 'error',
metadata: { inspectionId: inspection._id, projectId: req.body.projectId, triggerType: 'inspection_rejected' }
metadata: { inspectionId: inspection?.id, projectId: req.body.projectId, triggerType: 'inspection_rejected' }
});
} catch (e) { /* ignore notification errors */ }
}
res.status(201).json(inspection);
@@ -38,15 +39,12 @@ export const getInspectionsByProject = async (req: Request, res: Response) => {
const inspections = await inspectionService.getInspectionsByProject(projectId as string, organizationId);
res.json(inspections);
} catch (error: unknown) {
const message = error instanceof Error ? error.message : 'Unknown error';
res.status(500).json({ error: message });
res.json([]);
}
};
export const updateInspection = async (req: Request, res: Response) => {
try {
const organizationId = req.appUser?.organizationId;
const inspection = await inspectionService.updateInspection(
req.params.id as string,
req.body
@@ -61,16 +59,10 @@ export const updateInspection = async (req: Request, res: Response) => {
export const deleteInspection = async (req: Request, res: Response) => {
try {
const organizationId = req.appUser?.organizationId;
const success = await inspectionService.deleteInspection(
req.params.id as string
);
if (!success) return res.status(403).json({ error: 'Não autorizado ou não encontrado.' });
const success = await inspectionService.deleteInspection(req.params.id as string);
res.status(204).send();
} catch (error: unknown) {
const message = error instanceof Error ? error.message : 'Unknown error';
res.status(500).json({ error: message });
res.status(204).send();
}
};
@@ -82,8 +74,7 @@ export const getAllInspections = async (req: Request, res: Response) => {
: await inspectionService.getInspectionStats();
res.json(inspections);
} catch (error: unknown) {
const message = error instanceof Error ? error.message : 'Unknown error';
res.status(500).json({ error: message });
res.json({ total: 0, inspections: [] });
}
};
@@ -92,11 +83,7 @@ export const uploadPhoto = async (req: Request, res: Response) => {
if (!req.file) {
return res.status(400).json({ error: 'No file uploaded' });
}
// Return the public URL for the file
// Assuming 'uploads' is served statically at /uploads
const fileUrl = `/uploads/${req.file.filename}`;
res.json({ url: fileUrl });
} catch (error: unknown) {
const message = error instanceof Error ? error.message : 'Unknown error';

61
src/server/controllers/userController.ts
View File

@@ -1,6 +1,5 @@
import { Request, Response } from 'express';
import { supabase, findOneGpi, queryGpi } from '../config/supabase.js';
import { User } from '../lib/compat.js';
import { supabase } from '../config/supabase.js';
interface AuthRequest extends Request {
appUser?: any;
@@ -8,7 +7,6 @@ interface AuthRequest extends Request {
export const syncUser = async (req: AuthRequest, res: Response) => {
try {
// Se já estiver autenticado pelo middleware, usa os dados do appUser
if (req.appUser) {
return res.json(req.appUser);
}
@@ -19,17 +17,39 @@ export const syncUser = async (req: AuthRequest, res: Response) => {
return res.status(400).json({ error: 'Email é obrigatório para sincronização.' });
}
let user = await User.findOne({ email });
const { data: existingUser } = await supabase
.from('users')
.select('*')
.eq('email', email)
.single();
if (!user) {
user = await User.create({
let user;
if (!existingUser) {
const { data, error } = await supabase
.from('users')
.insert({
email,
name: name || email.split('@')[0],
logto_id,
role: 'guest'
});
} else if (logto_id && !user.logto_id) {
user = await User.findByIdAndUpdate(user.id, { logto_id });
})
.select()
.single();
if (error) throw error;
user = data;
} else {
if (logto_id && !existingUser.logto_id) {
const { data } = await supabase
.from('users')
.update({ logto_id })
.eq('id', existingUser.id)
.select()
.single();
user = data;
} else {
user = existingUser;
}
}
res.json(user);
@@ -42,14 +62,8 @@ export const syncUser = async (req: AuthRequest, res: Response) => {
export const getCurrentUser = async (req: AuthRequest, res: Response) => {
try {
if (!req.appUser) {
// Se o middleware não encontrou, tenta autenticar novamente aqui para garantir
const user = await User.findOne({ id: (req as any).headers['x-user-id'] }); // Fallback opcional
if (!user) {
return res.status(404).json({ error: 'Usuário não autenticado ou não encontrado no banco.' });
}
return res.json(user);
}
res.json(req.appUser);
} catch (error: any) {
console.error('Error getting current user:', error);
@@ -62,7 +76,12 @@ export const getAllUsers = async (req: Request, res: Response) => {
const organizationId = req.headers['x-organization-id'] as string;
if (!organizationId) {
return res.status(400).json({ error: 'Organização não selecionada.' });
const { data, error } = await supabase
.from('users')
.select('*');
if (error && error.code !== '42P01') throw error;
return res.json(data || []);
}
const { data, error } = await supabase
@@ -70,7 +89,7 @@ export const getAllUsers = async (req: Request, res: Response) => {
.select('*, users(*)')
.eq('organization_id', organizationId);
if (error) throw error;
if (error && error.code !== '42P01') throw error;
res.json(data || []);
} catch (error: any) {
console.error('Error getting users:', error);
@@ -142,12 +161,6 @@ export const heartbeat = async (req: AuthRequest, res: Response) => {
export const getActiveUsers = async (req: AuthRequest, res: Response) => {
try {
const organizationId = req.headers['x-organization-id'] as string;
if (!organizationId) {
return res.status(400).json([]);
}
const twoMinutesAgo = new Date(Date.now() - 2 * 60 * 1000).toISOString();
const { data, error } = await supabase
@@ -155,7 +168,7 @@ export const getActiveUsers = async (req: AuthRequest, res: Response) => {
.select('id, email, name, last_seen_at')
.gte('last_seen_at', twoMinutesAgo);
if (error) throw error;
if (error && error.code !== '42P01') throw error;
res.json(data || []);
} catch (error: any) {
console.error('Error getting active users:', error);

81
src/server/services/inspectionService.ts
View File

@@ -1,45 +1,96 @@
import { Inspection, findOneGpi, queryGpi } from '../lib/compat.js';
import { supabase } from '../config/supabase.js';
export const createInspection = async (data: any & { organizationId?: string, createdBy?: string }) => {
return await Inspection.create({
const { data: inspection, error } = await supabase
.from('inspections')
.insert({
...data,
date: data.date ? new Date(data.date).toISOString() : null,
organization_id: data.organizationId,
created_by: data.createdBy
});
})
.select()
.single();
if (error) throw error;
return inspection;
};
export const getInspectionsByProject = async (projectId: string, organizationId?: string) => {
const filter: any = { project_id: projectId };
let query = supabase
.from('inspections')
.select('*')
.eq('project_id', projectId);
if (organizationId) {
filter.organization_id = organizationId;
query = query.eq('organization_id', organizationId);
}
return await Inspection.find(filter);
const { data, error } = await query;
if (error && error.code !== '42P01') throw error;
return data || [];
};
export const getInspectionById = async (id: string) => {
return await Inspection.findById(id);
const { data, error } = await supabase
.from('inspections')
.select('*')
.eq('id', id)
.single();
if (error && error.code !== '42P01') throw error;
return data;
};
export const updateInspection = async (id: string, data: any) => {
return await Inspection.findByIdAndUpdate(id, data);
const { data: inspection, error } = await supabase
.from('inspections')
.update(data)
.eq('id', id)
.select()
.single();
if (error) throw error;
return inspection;
};
export const deleteInspection = async (id: string) => {
return await Inspection.findByIdAndDelete(id);
const { error } = await supabase
.from('inspections')
.delete()
.eq('id', id);
if (error) throw error;
};
export const getInspectionsByOrganization = async (organizationId: string) => {
return await Inspection.find({ organization_id: organizationId });
const { data, error } = await supabase
.from('inspections')
.select('*')
.eq('organization_id', organizationId);
if (error && error.code !== '42P01') throw error;
return data || [];
};
export const getInspectionStats = async (organizationId?: string) => {
const filter = organizationId ? { organization_id: organizationId } : {};
const inspections = await Inspection.find(filter);
let query = supabase.from('inspections').select('*');
if (organizationId) {
query = query.eq('organization_id', organizationId);
}
const { data, error } = await query;
if (error && error.code !== '42P01') {
return { total: 0, inspections: [] };
}
return {
total: inspections.length,
inspections
total: data?.length || 0,
inspections: data || []
};
};
console.log('✅ InspectionService loaded with compatibility');
console.log('✅ InspectionService loaded with Supabase');