Merge pull request #537 from isucon/461_fix-post-condition-endpoint

POST condition endpointの変更
isucon · Jul 26, 2021 · c49c7e3 · c49c7e3
2 parents bf36994 + 39a1759
commit c49c7e3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/bench/scenario/action.go b/bench/scenario/action.go
@@ -433,7 +433,7 @@ func getIsuIconErrorAction(ctx context.Context, a *agent.Agent, id string) (stri
 }
 
 func postIsuConditionAction(ctx context.Context, a *agent.Agent, id string, req service.PostIsuConditionRequest) (*http.Response, error) {
-	reqUrl := fmt.Sprintf("/api/isu/%s/condition", id)
+	reqUrl := fmt.Sprintf("/api/condition/%s", id)
 	body, err := json.Marshal(req)
 	if err != nil {
 		logger.AdminLogger.Panic(err)
@@ -446,7 +446,7 @@ func postIsuConditionAction(ctx context.Context, a *agent.Agent, id string, req
 }
 
 func postIsuConditionErrorAction(ctx context.Context, a *agent.Agent, id string, req service.PostIsuConditionRequest) (string, *http.Response, error) {
-	reqUrl := fmt.Sprintf("/api/isu/%s/condition", id)
+	reqUrl := fmt.Sprintf("/api/condition/%s", id)
 	body, err := json.Marshal(req)
 	if err != nil {
 		logger.AdminLogger.Panic(err)

diff --git a/bench/scenario/posting.go b/bench/scenario/posting.go
@@ -31,7 +31,7 @@ type posterState struct {
 	isuStateDelete       bool //椅子を削除する(正の点数が出るpostを行わない)
 }
 
-//POST /api/isu/{jia_isu_id}/conditionをたたく Goroutine
+//POST /api/condition/{jia_isu_id}をたたく Goroutine
 func (s *Scenario) keepPosting(ctx context.Context, step *isucandar.BenchmarkStep, targetBaseURL string, jiaIsuUUID string, scenarioChan *model.StreamsForPoster) {
 	defer func() { scenarioChan.ActiveChan <- false }() //deactivate 容量1で、ここでしか使わないのでブロックしない
 
@@ -53,7 +53,7 @@ func (s *Scenario) keepPosting(ctx context.Context, step *isucandar.BenchmarkSte
 		isuStateDelete:       false,
 	}
 	randEngine := rand.New(rand.NewSource(0))
-	targetURL := fmt.Sprintf("%s/api/isu/%s/condition", targetBaseURL, jiaIsuUUID)
+	targetURL := fmt.Sprintf("%s/api/condition/%s", targetBaseURL, jiaIsuUUID)
 	httpClient := http.Client{}
 	httpClient.Timeout = agent.DefaultRequestTimeout + 5*time.Second //MEMO: post conditionがtimeoutすると付随してたくさんエラーが出るので、timeoutしにくいようにする
 

diff --git a/development/doc/api/isu-condition.yml b/development/doc/api/isu-condition.yml
@@ -468,10 +468,10 @@ paths:
           $ref:  "#/components/responses/NotFoundError"
 
 
-  /api/isu/{jia_isu_uuid}/condition:
+  /api/condition/{jia_isu_uuid}:
     post:
       tags: [backend]
-      summary: '/api/isu/{jia_isu_uuid}/condition'
+      summary: '/api/condition/{jia_isu_uuid}'
       description: 'ISUからのセンサデータを受け取る'
       parameters:
         - name: jia_isu_uuid

diff --git a/extra/jiaapi-mock/model/isu_poster.go b/extra/jiaapi-mock/model/isu_poster.go
@@ -28,7 +28,7 @@ func NewIsuConditionPoster(targetIP string, targetPort int, isuUUID string) IsuC
 
 func (m *IsuConditionPoster) KeepPosting() {
 	targetURL := fmt.Sprintf(
-		"http://%s:%d/api/isu/%s/condition",
+		"http://%s:%d/api/condition/%s",
 		m.TargetIP, m.TargetPort, m.IsuUUID,
 	)
 	randEngine := rand.New(rand.NewSource(0))

diff --git a/webapp/go/main.go b/webapp/go/main.go
@@ -228,7 +228,7 @@ func main() {
 	e.GET("/api/condition", getAllIsuConditions)
 	e.GET("/api/condition/:jia_isu_uuid", getIsuConditions)
 	// API for Isu
-	e.POST("/api/isu/:jia_isu_uuid/condition", postIsuCondition)
+	e.POST("/api/condition/:jia_isu_uuid", postIsuCondition)
 	// Frontend
 	e.GET("/", getIndex)
 	e.GET("/condition", getIndex)
@@ -1161,7 +1161,7 @@ func getIsuConditionsFromDB(jiaIsuUUID string, cursorEndTime time.Time, conditio
 	return conditionsResponse, nil
 }
 
-// POST /api/isu/{jia_isu_uuid}/condition
+// POST /api/condition/{jia_isu_uuid}
 // ISUからのセンサデータを受け取る
 func postIsuCondition(c echo.Context) error {
 	// input (path_param)