refactor: update data struct field

pkg/domain/trial/code_data_struct.go

 package trial
 
 type CodeDataStruct struct {
+	Name        string
+	ID          string
+	MemberIds   []string
+	Properties  []CodeProperty
+	Extend      string
+	Implements  []string
+	Annotations []interface{}
+	Extension   interface{}
+}
+
+type JavaExtension struct {
+	MethodCalls []CodeCall
+	Fields      []CodeProperty
+	Tag         []interface{}
+}
+
+type PythonAnnotation struct {
 	Name       string
-	ID         string
-	MemberIds  []string
 	Properties []CodeProperty
-	//Fields      []CodeProperty
-	//MethodCalls []CodeCall
-	//Extend      string
-	//Implements  []string
-	//Annotations []interface{}
-	//Tag			[]interface{}
 }

pkg/domain/trial/code_file.go

@@ -7,6 +7,7 @@ type CodeFile struct {
 	PackageName    string
 	Imports        []string
 	Members        []*CodeMember
-	ClassNodes     []domain.JClassNode
 	DataStructures []CodeDataStruct
+	// Deprecated: support for migration only
+	ClassNodes     []domain.JClassNode
 }

trial/cocago/testdata/node_infos/basic_interface.json

@@ -2,7 +2,11 @@
   "ClassNodes": null,
   "DataStructures": [
     {
+      "Annotations": null,
+      "Extend": "",
+      "Extension": null,
       "ID": "",
+      "Implements": null,
       "MemberIds": null,
       "Name": "Shape",
       "Properties": [
@@ -35,7 +39,11 @@
       ]
     },
     {
+      "Annotations": null,
+      "Extend": "",
+      "Extension": null,
       "ID": "",
+      "Implements": null,
       "MemberIds": null,
       "Name": "Object",
       "Properties": [
@@ -59,7 +67,11 @@
       ]
     },
     {
+      "Annotations": null,
+      "Extend": "",
+      "Extension": null,
       "ID": "",
+      "Implements": null,
       "MemberIds": null,
       "Name": "Material",
       "Properties": [

trial/cocago/testdata/node_infos/data_struct_property.json

@@ -2,7 +2,11 @@
   "ClassNodes": null,
   "DataStructures": [
     {
+      "Annotations": null,
+      "Extend": "",
+      "Extension": null,
       "ID": "",
+      "Implements": null,
       "MemberIds": null,
       "Name": "CodeFile",
       "Properties": [

trial/cocago/testdata/node_infos/struct_type_zero.json

@@ -2,7 +2,11 @@
   "ClassNodes": null,
   "DataStructures": [
     {
+      "Annotations": null,
+      "Extend": "",
+      "Extension": null,
       "ID": "",
+      "Implements": null,
       "MemberIds": null,
       "Name": "O",
       "Properties": null

trial/cocago/testdata/node_infos/struct_with_func.json

@@ -2,7 +2,11 @@
   "ClassNodes": null,
   "DataStructures": [
     {
+      "Annotations": null,
+      "Extend": "",
+      "Extension": null,
       "ID": "",
+      "Implements": null,
       "MemberIds": null,
       "Name": "Person",
       "Properties": [

trial/cocago/testdata/node_infos/struct_with_func_decl.json

@@ -2,7 +2,11 @@
   "ClassNodes": null,
   "DataStructures": [
     {
+      "Annotations": null,
+      "Extend": "",
+      "Extension": null,
       "ID": "",
+      "Implements": null,
       "MemberIds": null,
       "Name": "person",
       "Properties": [

trial/pkg/application/pyapp/py_ident_app_test.go

@@ -42,3 +42,14 @@ func Test_PythonClass(t *testing.T) {
 	results := app.Analysis(string(defs), "testdata/grammar/classdef.py")
 	g.Expect(len(results.DataStructures)).To(Equal(3))
 }
+
+func Test_PythonClassWithDecorator(t *testing.T) {
+	g := NewGomegaWithT(t)
+
+	app := new(PythonApiApp)
+
+	file, _ := ioutil.ReadFile("testdata/grammar/class_or_func_def_stmt.py")
+	codeFile := app.Analysis(string(file), "testdata/grammar/class_or_func_def_stmt.py")
+
+	g.Expect(len(codeFile.DataStructures)).To(Equal(1))
+}

trial/pkg/ast/pyast/python_ident_listener.go

 package pyast
 
 import (
+	"fmt"
 	parser "github.com/phodal/coca/languages/python"
 	"github.com/phodal/coca/pkg/domain/trial"
+	"reflect"
 )
 
 type PythonIdentListener struct {
@@ -25,6 +27,13 @@ func (s *PythonIdentListener) EnterClassdef(ctx *parser.ClassdefContext) {
 		Properties: nil,
 	}
 
+	switch x := ctx.GetParent().GetChild(0).(type) {
+	case *parser.DecoratorContext:
+
+	default:
+		fmt.Println(reflect.TypeOf(x))
+	}
+
 	currentCodeFile.DataStructures = append(currentCodeFile.DataStructures, dataStruct)
 }