Skip to content

Commit 4e52b12

Browse files
authored
Merge pull request #199 from SIT-DigiCre/feature/delete-budget
稟議の削除機能
2 parents f6e198f + 6e71f55 commit 4e52b12

11 files changed

+374
-83
lines changed

document/bundle-develop.gen.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,6 +1253,23 @@ paths:
12531253
$ref: '#/components/responses/Unauthorized'
12541254
'500':
12551255
$ref: '#/components/responses/InternalServer'
1256+
delete:
1257+
tags:
1258+
- budget
1259+
description: Delete budget(status pending)
1260+
security:
1261+
- BearerAuth: []
1262+
parameters:
1263+
- name: budgetId
1264+
in: path
1265+
required: true
1266+
schema:
1267+
type: string
1268+
responses:
1269+
'200':
1270+
$ref: '#/components/responses/BlankSuccess'
1271+
'500':
1272+
$ref: '#/components/responses/InternalServer'
12561273
'/budget/{budgetId}/status_approve':
12571274
put:
12581275
tags:
@@ -1286,6 +1303,23 @@ paths:
12861303
$ref: '#/components/responses/Unauthorized'
12871304
'500':
12881305
$ref: '#/components/responses/InternalServer'
1306+
delete:
1307+
tags:
1308+
- budget
1309+
description: Delete budget(status approve)
1310+
security:
1311+
- BearerAuth: []
1312+
parameters:
1313+
- name: budgetId
1314+
in: path
1315+
required: true
1316+
schema:
1317+
type: string
1318+
responses:
1319+
'200':
1320+
$ref: '#/components/responses/BlankSuccess'
1321+
'500':
1322+
$ref: '#/components/responses/InternalServer'
12891323
'/budget/{budgetId}/status_bought':
12901324
put:
12911325
tags:

document/bundle.gen.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,6 +1245,23 @@ paths:
12451245
$ref: '#/components/responses/Unauthorized'
12461246
'500':
12471247
$ref: '#/components/responses/InternalServer'
1248+
delete:
1249+
tags:
1250+
- budget
1251+
description: Delete budget(status pending)
1252+
security:
1253+
- BearerAuth: []
1254+
parameters:
1255+
- name: budgetId
1256+
in: path
1257+
required: true
1258+
schema:
1259+
type: string
1260+
responses:
1261+
'200':
1262+
$ref: '#/components/responses/BlankSuccess'
1263+
'500':
1264+
$ref: '#/components/responses/InternalServer'
12481265
'/budget/{budgetId}/status_approve':
12491266
put:
12501267
tags:
@@ -1278,6 +1295,23 @@ paths:
12781295
$ref: '#/components/responses/Unauthorized'
12791296
'500':
12801297
$ref: '#/components/responses/InternalServer'
1298+
delete:
1299+
tags:
1300+
- budget
1301+
description: Delete budget(status approve)
1302+
security:
1303+
- BearerAuth: []
1304+
parameters:
1305+
- name: budgetId
1306+
in: path
1307+
required: true
1308+
schema:
1309+
type: string
1310+
responses:
1311+
'200':
1312+
$ref: '#/components/responses/BlankSuccess'
1313+
'500':
1314+
$ref: '#/components/responses/InternalServer'
12811315
'/budget/{budgetId}/status_bought':
12821316
put:
12831317
tags:

document/paths/budget_budget_id_status_approve.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,20 @@ put:
3030
$ref: "../responses/unauthorized.yml"
3131
500:
3232
$ref: "../responses/internal_server.yml"
33+
delete:
34+
tags:
35+
- budget
36+
description: "Delete budget(status approve)"
37+
security:
38+
- BearerAuth: []
39+
parameters:
40+
- name: budgetId
41+
in: path
42+
required: true
43+
schema:
44+
type: string
45+
responses:
46+
200:
47+
$ref: "../responses/blank_success.yml"
48+
500:
49+
$ref: "../responses/internal_server.yml"

document/paths/budget_budget_id_status_pending.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,20 @@ put:
3030
$ref: "../responses/unauthorized.yml"
3131
500:
3232
$ref: "../responses/internal_server.yml"
33+
delete:
34+
tags:
35+
- budget
36+
description: "Delete budget(status pending)"
37+
security:
38+
- BearerAuth: []
39+
parameters:
40+
- name: budgetId
41+
in: path
42+
required: true
43+
schema:
44+
type: string
45+
responses:
46+
200:
47+
$ref: "../responses/blank_success.yml"
48+
500:
49+
$ref: "../responses/internal_server.yml"

pkg/api/server.gen.go

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package server
2+
3+
import (
4+
"github.com/SIT-DigiCre/digicore_v3_backend/pkg/api/response"
5+
"github.com/SIT-DigiCre/digicore_v3_backend/pkg/budget"
6+
"github.com/SIT-DigiCre/digicore_v3_backend/pkg/db"
7+
"github.com/labstack/echo/v4"
8+
)
9+
10+
func (s *server) DeleteBudgetBudgetIdStatusApprove(ctx echo.Context, budgetId string) error {
11+
dbTranisactionClient, err := db.OpenTransaction()
12+
if err != nil {
13+
return response.ErrorResponse(ctx, err)
14+
}
15+
defer dbTranisactionClient.Rollback()
16+
17+
res, err := budget.DeleteBudgetBudgetIdStatusApprove(ctx, &dbTranisactionClient, budgetId)
18+
if err != nil {
19+
return response.ErrorResponse(ctx, err)
20+
}
21+
22+
err = dbTranisactionClient.Commit()
23+
if err != nil {
24+
return response.ErrorResponse(ctx, err)
25+
}
26+
27+
return response.SuccessResponse(ctx, res)
28+
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package server
2+
3+
import (
4+
"github.com/SIT-DigiCre/digicore_v3_backend/pkg/api/response"
5+
"github.com/SIT-DigiCre/digicore_v3_backend/pkg/budget"
6+
"github.com/SIT-DigiCre/digicore_v3_backend/pkg/db"
7+
"github.com/labstack/echo/v4"
8+
)
9+
10+
func (s *server) DeleteBudgetBudgetIdStatusPending(ctx echo.Context, budgetId string) error {
11+
dbTranisactionClient, err := db.OpenTransaction()
12+
if err != nil {
13+
return response.ErrorResponse(ctx, err)
14+
}
15+
defer dbTranisactionClient.Rollback()
16+
17+
res, err := budget.DeleteBudgetBudgetIdStatusPending(ctx, &dbTranisactionClient, budgetId)
18+
if err != nil {
19+
return response.ErrorResponse(ctx, err)
20+
}
21+
22+
err = dbTranisactionClient.Commit()
23+
if err != nil {
24+
return response.ErrorResponse(ctx, err)
25+
}
26+
27+
return response.SuccessResponse(ctx, res)
28+
}

0 commit comments

Comments
 (0)