เพิ่ม id development

This commit is contained in:
kittapath 2024-08-27 17:30:19 +07:00
parent 70e1ab9efd
commit 9d232d1f26
7 changed files with 62 additions and 241 deletions

View file

@ -25,7 +25,6 @@ import {
UpdateProfileDevelopment,
} from "../entities/ProfileDevelopment";
import permission from "../interfaces/permission";
import { DevelopmentProject } from "../entities/developmentProject";
@Route("api/v1/org/profile/development")
@Tags("ProfileDevelopment")
@Security("bearerAuth")
@ -33,7 +32,6 @@ export class ProfileDevelopmentController extends Controller {
private profileRepository = AppDataSource.getRepository(Profile);
private developmentRepository = AppDataSource.getRepository(ProfileDevelopment);
private developmentHistoryRepository = AppDataSource.getRepository(ProfileDevelopmentHistory);
private developmentProjectRepository = AppDataSource.getRepository(DevelopmentProject);
@Get("user")
public async getDevelopmentUser(@Request() request: { user: Record<string, any> }) {
@ -43,23 +41,8 @@ export class ProfileDevelopmentController extends Controller {
}
const lists = await this.developmentRepository.find({
where: { profileId: profile.id },
relations: ["developmentProjects"],
});
const _lists = lists.map((item) => ({
id: item.id,
name: item.name,
target: item.target,
summary: item.summary,
point: item.point,
developmentProjects: item.developmentProjects.map((x) => x.name),
achievement10: item.achievement10,
achievement5: item.achievement5,
achievement0: item.achievement0,
isDevelopment70: item.isDevelopment70,
isDevelopment20: item.isDevelopment20,
isDevelopment10: item.isDevelopment10,
}));
return new HttpSuccess(_lists);
return new HttpSuccess(lists);
}
@Get("{profileId}")
@ -82,23 +65,8 @@ export class ProfileDevelopmentController extends Controller {
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
const lists = await this.developmentRepository.find({
where: { profileId: profileId },
relations: ["developmentProjects"],
});
const _lists = lists.map((item) => ({
id: item.id,
name: item.name,
target: item.target,
summary: item.summary,
point: item.point,
developmentProjects: item.developmentProjects.map((x) => x.name),
achievement10: item.achievement10,
achievement5: item.achievement5,
achievement0: item.achievement0,
isDevelopment70: item.isDevelopment70,
isDevelopment20: item.isDevelopment20,
isDevelopment10: item.isDevelopment10,
}));
return new HttpSuccess(_lists);
return new HttpSuccess(lists);
}
@Get("history/{developmentId}")
@ -127,24 +95,9 @@ export class ProfileDevelopmentController extends Controller {
}
const record = await this.developmentHistoryRepository.find({
where: { profileDevelopmentId: developmentId },
relations: ["developmentHistoryProjects"],
order: { createdAt: "DESC" },
});
const _lists = record.map((item) => ({
id: item.id,
name: item.name,
target: item.target,
summary: item.summary,
point: item.point,
developmentProjects: item.developmentHistoryProjects.map((x) => x.name),
achievement10: item.achievement10,
achievement5: item.achievement5,
achievement0: item.achievement0,
isDevelopment70: item.isDevelopment70,
isDevelopment20: item.isDevelopment20,
isDevelopment10: item.isDevelopment10,
}));
return new HttpSuccess(_lists);
return new HttpSuccess(record);
}
@Post()
@ -179,28 +132,6 @@ export class ProfileDevelopmentController extends Controller {
history.profileDevelopmentId = data.id;
await this.developmentHistoryRepository.save(history);
if (body.developmentProjects != null) {
await Promise.all(
body.developmentProjects.map(async (x) => {
let data1 = new DevelopmentProject();
data1.name = x;
data1.createdUserId = req.user.sub;
data1.createdFullName = req.user.name;
data1.lastUpdateUserId = req.user.sub;
data1.lastUpdateFullName = req.user.name;
data1.profileDevelopmentId = data.id;
await this.developmentProjectRepository.save(data1);
let data2 = new DevelopmentProject();
data2.name = x;
data2.createdUserId = req.user.sub;
data2.createdFullName = req.user.name;
data2.lastUpdateUserId = req.user.sub;
data2.lastUpdateFullName = req.user.name;
data2.profileDevelopmentId = data.id;
await this.developmentProjectRepository.save(data2);
}),
);
}
return new HttpSuccess();
}
@ -212,7 +143,6 @@ export class ProfileDevelopmentController extends Controller {
) {
const record = await this.developmentRepository.findOne({
where: { id: developmentId },
relations: ["developmentProjects"],
});
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_OFFICER", record.profileId);
@ -234,30 +164,6 @@ export class ProfileDevelopmentController extends Controller {
this.developmentRepository.save(record),
this.developmentHistoryRepository.save(history),
]);
await this.developmentProjectRepository.remove(record.developmentProjects);
if (body.developmentProjects != null) {
await Promise.all(
body.developmentProjects.map(async (x) => {
let data1 = new DevelopmentProject();
data1.name = x;
data1.createdUserId = req.user.sub;
data1.createdFullName = req.user.name;
data1.lastUpdateUserId = req.user.sub;
data1.lastUpdateFullName = req.user.name;
data1.profileDevelopmentId = record.id;
await this.developmentProjectRepository.save(data1);
let data2 = new DevelopmentProject();
data2.name = x;
data2.createdUserId = req.user.sub;
data2.createdFullName = req.user.name;
data2.lastUpdateUserId = req.user.sub;
data2.lastUpdateFullName = req.user.name;
data2.profileDevelopmentId = history.id;
await this.developmentProjectRepository.save(data2);
}),
);
}
return new HttpSuccess();
}
@ -272,10 +178,6 @@ export class ProfileDevelopmentController extends Controller {
_record.profileId,
);
}
await this.developmentProjectRepository.delete({ profileDevelopmentId: developmentId });
await this.developmentProjectRepository.delete({
profileDevelopmentHistory: { profileDevelopmentId: developmentId },
});
await this.developmentHistoryRepository.delete({
profileDevelopmentId: developmentId,
});

View file

@ -25,7 +25,6 @@ import {
UpdateProfileDevelopment,
} from "../entities/ProfileDevelopment";
import permission from "../interfaces/permission";
import { DevelopmentProject } from "../entities/developmentProject";
@Route("api/v1/org/profile-employee/development")
@Tags("ProfileDevelopment")
@Security("bearerAuth")
@ -33,7 +32,6 @@ export class ProfileDevelopmentEmployeeController extends Controller {
private profileRepository = AppDataSource.getRepository(ProfileEmployee);
private developmentRepository = AppDataSource.getRepository(ProfileDevelopment);
private developmentHistoryRepository = AppDataSource.getRepository(ProfileDevelopmentHistory);
private developmentProjectRepository = AppDataSource.getRepository(DevelopmentProject);
@Get("user")
public async getDevelopmentUser(@Request() request: RequestWithUser) {
@ -43,7 +41,6 @@ export class ProfileDevelopmentEmployeeController extends Controller {
}
const lists = await this.developmentRepository.find({
where: { profileEmployeeId: profile.id },
relations: ["developmentProjects"],
});
return new HttpSuccess(lists);
}
@ -53,7 +50,6 @@ export class ProfileDevelopmentEmployeeController extends Controller {
await new permission().PermissionOrgUserList(req, "SYS_REGISTRY_EMP", profileId);
const lists = await this.developmentRepository.find({
where: { profileEmployeeId: profileId },
relations: ["developmentProjects"],
});
return new HttpSuccess(lists);
}
@ -70,7 +66,6 @@ export class ProfileDevelopmentEmployeeController extends Controller {
}
const record = await this.developmentHistoryRepository.find({
where: { profileDevelopmentId: developmentId },
relations: ["developmentHistoryProjects"],
order: { createdAt: "DESC" },
});
return new HttpSuccess(record);
@ -108,28 +103,6 @@ export class ProfileDevelopmentEmployeeController extends Controller {
history.profileDevelopmentId = data.id;
await this.developmentHistoryRepository.save(history);
if (body.developmentProjects != null) {
await Promise.all(
body.developmentProjects.map(async (x) => {
let data1 = new DevelopmentProject();
data1.name = x;
data1.createdUserId = req.user.sub;
data1.createdFullName = req.user.name;
data1.lastUpdateUserId = req.user.sub;
data1.lastUpdateFullName = req.user.name;
data1.profileDevelopmentId = data.id;
await this.developmentProjectRepository.save(data1);
let data2 = new DevelopmentProject();
data2.name = x;
data2.createdUserId = req.user.sub;
data2.createdFullName = req.user.name;
data2.lastUpdateUserId = req.user.sub;
data2.lastUpdateFullName = req.user.name;
data2.profileDevelopmentId = data.id;
await this.developmentProjectRepository.save(data2);
}),
);
}
return new HttpSuccess();
}
@ -141,7 +114,6 @@ export class ProfileDevelopmentEmployeeController extends Controller {
) {
const record = await this.developmentRepository.findOne({
where: { id: developmentId },
relations: ["developmentProjects"],
});
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
await new permission().PermissionOrgUserUpdate(
@ -167,30 +139,6 @@ export class ProfileDevelopmentEmployeeController extends Controller {
this.developmentRepository.save(record),
this.developmentHistoryRepository.save(history),
]);
await this.developmentProjectRepository.remove(record.developmentProjects);
if (body.developmentProjects != null) {
await Promise.all(
body.developmentProjects.map(async (x) => {
let data1 = new DevelopmentProject();
data1.name = x;
data1.createdUserId = req.user.sub;
data1.createdFullName = req.user.name;
data1.lastUpdateUserId = req.user.sub;
data1.lastUpdateFullName = req.user.name;
data1.profileDevelopmentId = record.id;
await this.developmentProjectRepository.save(data1);
let data2 = new DevelopmentProject();
data2.name = x;
data2.createdUserId = req.user.sub;
data2.createdFullName = req.user.name;
data2.lastUpdateUserId = req.user.sub;
data2.lastUpdateFullName = req.user.name;
data2.profileDevelopmentId = history.id;
await this.developmentProjectRepository.save(data2);
}),
);
}
return new HttpSuccess();
}
@ -205,10 +153,6 @@ export class ProfileDevelopmentEmployeeController extends Controller {
_record.profileEmployeeId,
);
}
await this.developmentProjectRepository.delete({ profileDevelopmentId: developmentId });
await this.developmentProjectRepository.delete({
profileDevelopmentHistory: { profileDevelopmentId: developmentId },
});
await this.developmentHistoryRepository.delete({
profileDevelopmentId: developmentId,

View file

@ -25,7 +25,6 @@ import {
UpdateProfileDevelopment,
} from "../entities/ProfileDevelopment";
import permission from "../interfaces/permission";
import { DevelopmentProject } from "../entities/developmentProject";
@Route("api/v1/org/profile-temp/development")
@Tags("ProfileDevelopment")
@Security("bearerAuth")
@ -33,7 +32,6 @@ export class ProfileDevelopmentEmployeeTempController extends Controller {
private profileRepository = AppDataSource.getRepository(ProfileEmployee);
private developmentRepository = AppDataSource.getRepository(ProfileDevelopment);
private developmentHistoryRepository = AppDataSource.getRepository(ProfileDevelopmentHistory);
private developmentProjectRepository = AppDataSource.getRepository(DevelopmentProject);
@Get("user")
public async getDevelopmentUser(@Request() request: { user: Record<string, any> }) {
@ -43,7 +41,6 @@ export class ProfileDevelopmentEmployeeTempController extends Controller {
}
const lists = await this.developmentRepository.find({
where: { profileEmployeeId: profile.id },
relations: ["developmentProjects"],
});
return new HttpSuccess(lists);
}
@ -53,7 +50,6 @@ export class ProfileDevelopmentEmployeeTempController extends Controller {
await new permission().PermissionList(req, "SYS_REGISTRY_TEMP");
const lists = await this.developmentRepository.find({
where: { profileEmployeeId: profileId },
relations: ["developmentProjects"],
});
return new HttpSuccess(lists);
}
@ -63,7 +59,6 @@ export class ProfileDevelopmentEmployeeTempController extends Controller {
await new permission().PermissionList(req, "SYS_REGISTRY_TEMP");
const record = await this.developmentHistoryRepository.find({
where: { profileDevelopmentId: developmentId },
relations: ["developmentHistoryProjects"],
order: { createdAt: "DESC" },
});
return new HttpSuccess(record);
@ -102,28 +97,6 @@ export class ProfileDevelopmentEmployeeTempController extends Controller {
history.profileDevelopmentId = data.id;
await this.developmentHistoryRepository.save(history);
if (body.developmentProjects != null) {
await Promise.all(
body.developmentProjects.map(async (x) => {
let data1 = new DevelopmentProject();
data1.name = x;
data1.createdUserId = req.user.sub;
data1.createdFullName = req.user.name;
data1.lastUpdateUserId = req.user.sub;
data1.lastUpdateFullName = req.user.name;
data1.profileDevelopmentId = data.id;
await this.developmentProjectRepository.save(data1);
let data2 = new DevelopmentProject();
data2.name = x;
data2.createdUserId = req.user.sub;
data2.createdFullName = req.user.name;
data2.lastUpdateUserId = req.user.sub;
data2.lastUpdateFullName = req.user.name;
data2.profileDevelopmentId = data.id;
await this.developmentProjectRepository.save(data2);
}),
);
}
return new HttpSuccess();
}
@ -136,7 +109,6 @@ export class ProfileDevelopmentEmployeeTempController extends Controller {
await new permission().PermissionUpdate(req, "SYS_REGISTRY_TEMP");
const record = await this.developmentRepository.findOne({
where: { id: developmentId },
relations: ["developmentProjects"],
});
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
@ -158,30 +130,6 @@ export class ProfileDevelopmentEmployeeTempController extends Controller {
this.developmentRepository.save(record),
this.developmentHistoryRepository.save(history),
]);
await this.developmentProjectRepository.remove(record.developmentProjects);
if (body.developmentProjects != null) {
await Promise.all(
body.developmentProjects.map(async (x) => {
let data1 = new DevelopmentProject();
data1.name = x;
data1.createdUserId = req.user.sub;
data1.createdFullName = req.user.name;
data1.lastUpdateUserId = req.user.sub;
data1.lastUpdateFullName = req.user.name;
data1.profileDevelopmentId = record.id;
await this.developmentProjectRepository.save(data1);
let data2 = new DevelopmentProject();
data2.name = x;
data2.createdUserId = req.user.sub;
data2.createdFullName = req.user.name;
data2.lastUpdateUserId = req.user.sub;
data2.lastUpdateFullName = req.user.name;
data2.profileDevelopmentId = history.id;
await this.developmentProjectRepository.save(data2);
}),
);
}
return new HttpSuccess();
}
@ -189,10 +137,6 @@ export class ProfileDevelopmentEmployeeTempController extends Controller {
@Delete("{developmentId}")
public async deleteDevelopment(@Path() developmentId: string, @Request() req: RequestWithUser) {
await new permission().PermissionDelete(req, "SYS_REGISTRY_TEMP");
await this.developmentProjectRepository.delete({ profileDevelopmentId: developmentId });
await this.developmentProjectRepository.delete({
profileDevelopmentHistory: { profileDevelopmentId: developmentId },
});
await this.developmentHistoryRepository.delete({
profileDevelopmentId: developmentId,
});