remove try catch more
This commit is contained in:
parent
09cc93fdf8
commit
7531a9c582
9 changed files with 477 additions and 680 deletions
|
|
@ -57,7 +57,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Get("history")
|
||||
async GetHistory() {
|
||||
try {
|
||||
const orgRevision = await this.orgRevisionRepository.find({
|
||||
select: [
|
||||
"id",
|
||||
|
|
@ -80,9 +79,7 @@ export class OrganizationController extends Controller {
|
|||
}));
|
||||
|
||||
return new HttpSuccess(mapOrgRevisions);
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -93,7 +90,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Get("active")
|
||||
async GetActive() {
|
||||
try {
|
||||
const orgRevisionActive = await this.orgRevisionRepository.findOne({
|
||||
where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
||||
});
|
||||
|
|
@ -110,9 +106,7 @@ export class OrganizationController extends Controller {
|
|||
isPublic: orgRevisionDraf == null || orgRevisionDraf.orgRevisionName == null ? false : true,
|
||||
};
|
||||
return new HttpSuccess(mapData);
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -126,7 +120,6 @@ export class OrganizationController extends Controller {
|
|||
@Body() requestBody: CreateOrgRevision,
|
||||
@Request() request: { user: Record<string, any> },
|
||||
) {
|
||||
try {
|
||||
const revision = Object.assign(new OrgRevision(), requestBody) as OrgRevision;
|
||||
revision.orgRevisionIsDraft = true;
|
||||
revision.orgRevisionIsCurrent = false;
|
||||
|
|
@ -587,9 +580,7 @@ export class OrganizationController extends Controller {
|
|||
await this.orgRevisionRepository.remove(_orgRevisions);
|
||||
|
||||
return new HttpSuccess(revision);
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -600,7 +591,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Get("{id}")
|
||||
async detail(@Path() id: string) {
|
||||
try {
|
||||
const orgRevision = await this.orgRevisionRepository.findOne({ where: { id } });
|
||||
if (!orgRevision) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
|
|
@ -1268,9 +1258,7 @@ export class OrganizationController extends Controller {
|
|||
);
|
||||
|
||||
return new HttpSuccess(formattedData);
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1296,7 +1284,6 @@ export class OrganizationController extends Controller {
|
|||
if (!orgRevision) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
|
||||
}
|
||||
try {
|
||||
orgRevision.lastUpdateUserId = request.user.sub;
|
||||
orgRevision.lastUpdateFullName = request.user.name;
|
||||
orgRevision.lastUpdatedAt = new Date();
|
||||
|
|
@ -1304,9 +1291,7 @@ export class OrganizationController extends Controller {
|
|||
this.orgRevisionRepository.merge(orgRevision, requestBody);
|
||||
await this.orgRevisionRepository.save(orgRevision);
|
||||
return new HttpSuccess();
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1455,7 +1440,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Post("sort")
|
||||
async Sort(@Body() requestBody: { id: string; type: number; sortId: string[] }) {
|
||||
try {
|
||||
switch (requestBody.type) {
|
||||
case 0: {
|
||||
const revisionId = await this.orgRevisionRepository.findOne({
|
||||
|
|
@ -1566,9 +1550,7 @@ export class OrganizationController extends Controller {
|
|||
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found type: " + requestBody.type);
|
||||
}
|
||||
return new HttpSuccess();
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1672,7 +1654,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Get("struct-chart/{idNode}/{type}") //bright
|
||||
async structchart(@Path() idNode: string, type: number) {
|
||||
try {
|
||||
switch (type) {
|
||||
case 0: {
|
||||
const data = await this.orgRevisionRepository.findOne({
|
||||
|
|
@ -2758,9 +2739,7 @@ export class OrganizationController extends Controller {
|
|||
default:
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found type: ");
|
||||
}
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2771,7 +2750,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Post("find/node")
|
||||
async findNodeAll(@Body() requestBody: { node: number; nodeId: string }) {
|
||||
try {
|
||||
switch (requestBody.node) {
|
||||
case 0: {
|
||||
const data = await this.orgRootRepository.findOne({
|
||||
|
|
@ -2827,9 +2805,7 @@ export class OrganizationController extends Controller {
|
|||
default:
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found type: " + requestBody.node);
|
||||
}
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2840,7 +2816,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Get("active/root")
|
||||
async GetActiveRoot() {
|
||||
try {
|
||||
const orgRevisionActive = await this.orgRevisionRepository.findOne({
|
||||
where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
||||
});
|
||||
|
|
@ -2859,9 +2834,7 @@ export class OrganizationController extends Controller {
|
|||
],
|
||||
});
|
||||
return new HttpSuccess(data);
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2872,7 +2845,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Get("active/root/id")
|
||||
async GetActiveRootId() {
|
||||
try {
|
||||
const orgRevisionActive = await this.orgRevisionRepository.findOne({
|
||||
where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
||||
});
|
||||
|
|
@ -2884,9 +2856,7 @@ export class OrganizationController extends Controller {
|
|||
where: { orgRevisionId: orgRevisionActive.id },
|
||||
});
|
||||
return new HttpSuccess(data.map((x) => x.id));
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2897,7 +2867,6 @@ export class OrganizationController extends Controller {
|
|||
*/
|
||||
@Get("active/root/{revisionId}")
|
||||
async GetActiveRootByRevision(@Path() revisionId: string) {
|
||||
try {
|
||||
const data = await this.orgRootRepository.find({
|
||||
where: { orgRevisionId: revisionId },
|
||||
relations: [
|
||||
|
|
@ -2909,9 +2878,7 @@ export class OrganizationController extends Controller {
|
|||
],
|
||||
});
|
||||
return new HttpSuccess(data);
|
||||
} catch (error) {
|
||||
return error;
|
||||
}
|
||||
|
||||
}
|
||||
/**
|
||||
* API หา revision ล่าสุด
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue