fix(server): fix feature type detection in cmsintegrationv3

eukarya-inc · Mar 25, 2024 · 3654bb7 · 3654bb7
1 parent 7e28765
commit 3654bb7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/server/cmsintegration/cmsintegrationv3/service_fme.go b/server/cmsintegration/cmsintegrationv3/service_fme.go
@@ -44,7 +44,7 @@ func sendRequestToFME(ctx context.Context, s *Services, conf *Config, w *cmswebh
 
 	featureType := strings.TrimPrefix(w.ItemData.Model.Key, modelPrefix)
 	if featureType == sampleModel && item.FeatureType != "" {
-		if ft := getBracketContent(item.FeatureType); ft != "" {
+		if ft := getLastBracketContent(item.FeatureType); ft != "" {
 			featureType = ft
 			log.Debugfc(ctx, "cmsintegrationv3: sample item: feature type is %s", ft)
 		}

diff --git a/server/cmsintegration/cmsintegrationv3/util.go b/server/cmsintegration/cmsintegrationv3/util.go
@@ -25,10 +25,19 @@ func tagFrom(t fmt.Stringer) *cms.Tag {
 	}
 }
 
-func getBracketContent(s string) string {
+func getLastBracketContent(s string) string {
 	if strings.Contains(s, "（") && strings.Contains(s, "）") {
-		return strings.Split(strings.Split(s, "（")[1], "）")[0]
+		_, s := cutStringRight(s, "（")
+		s, _, _ = strings.Cut(s, "）")
+		return s
 	}
 
 	return ""
 }
+
+func cutStringRight(s string, sep string) (string, string) {
+	if i := strings.LastIndex(s, sep); i >= 0 {
+		return s[:i], s[i+len(sep):]
+	}
+	return s, ""
+}
diff --git a/server/cmsintegration/cmsintegrationv3/util_test.go b/server/cmsintegration/cmsintegrationv3/util_test.go
@@ -7,6 +7,6 @@ import (
 )
 
 func TestGetBracketContent(t *testing.T) {
-	assert.Equal(t, "", getBracketContent("トンネルモデル"))
-	assert.Equal(t, "tun", getBracketContent("トンネルモデル（tun）"))
+	assert.Equal(t, "", getLastBracketContent("トンネルモデル"))
+	assert.Equal(t, "tran", getLastBracketContent("交通（道路）モデル（tran）"))
 }