@@ -54,7 +54,7 @@ func (ps PageService) GetPageTitleKey(url string, tok string, space string, titl
5454 req .Header .Add ("Authorization" , "Basic " + tok )
5555 resp , err := client .Do (req )
5656 if err != nil {
57- log .Println ( err )
57+ log .Printf ( "Error performing request: %v" , err )
5858 }
5959
6060 var content models.Content
@@ -72,10 +72,12 @@ func (ps PageService) GetPage(url string, tok string, id string) models.Content
7272 log .Println ("GET REQ URL is " + reqUrl )
7373
7474 req , err := http .NewRequest ("GET" , reqUrl , nil )
75+
7576 req .Header .Add ("Authorization" , "Basic " + tok )
77+
7678 resp , err := client .Do (req )
7779 if err != nil {
78- log .Println ( err )
80+ log .Printf ( "Error performing request: %v" , err )
7981 }
8082
8183 var content models.Content
@@ -87,7 +89,9 @@ func (ps PageService) GetPage(url string, tok string, id string) models.Content
8789
8890func (s PageService ) GetChildren (url string , tok string , id string ) models.ContentArray {
8991 expand := "expand=space,body.storage,history,version"
92+
9093 reqUrl := fmt .Sprintf ("%s/rest/api/content/%s/child/page?%s" , url , id , expand )
94+
9195 req , err := http .NewRequest ("GET" , reqUrl , nil )
9296 //defer func(Body io.ReadCloser) {
9397 // err := Body.Close()
@@ -98,9 +102,8 @@ func (s PageService) GetChildren(url string, tok string, id string) models.Conte
98102 //req.SetBasicAuth("admin", "admin")
99103 //resp, err := http.Get(reqUrl)
100104 req .Header .Add ("Authorization" , "Basic " + tok )
101- client := myClient ()
102- resp , err := client .Do (req )
103- fmt .Printf ("Response code for GETPAGE is %d" , resp .StatusCode )
105+ resp , err := myClient ().Do (req )
106+ fmt .Printf ("Response code for GET_PAGE is %d" , resp .StatusCode )
104107 defer resp .Body .Close ()
105108 if err != nil {
106109 log .Panicln (err )
@@ -122,9 +125,16 @@ func (s PageService) GetDescendants(url string, tok string, id string, lim int)
122125 client := myClient ()
123126 resp , err := client .Do (req )
124127 if err != nil {
125- log .Panicln ( err )
128+ log .Panicf ( "Error performing request GET_DESCENDANTS: %v" , err )
126129 }
127- defer resp .Body .Close () // close request's body
130+
131+ // close request's body
132+ defer func (Body io.ReadCloser ) {
133+ err := Body .Close ()
134+ if err != nil {
135+ log .Panicf ("Error closing the response body: %v" , err )
136+ }
137+ }(resp .Body )
128138
129139 var cnArray models.ContentArray
130140 bts , err := io .ReadAll (resp .Body )
@@ -154,11 +164,13 @@ func (ps PageService) CreateContent(url string, tok string, ctype string, key st
154164 mrsCtn , err2 := json .Marshal (contentBody )
155165 //fmt.Println(string(mrsCtn))
156166 if err2 != nil {
157- log .Panicln ( err2 )
167+ log .Panicf ( "Error marshalling the JSON from ContentBody: %v" , err2 )
158168 }
159169 req , err := http .NewRequest ("POST" , reqUrl , bytes .NewReader (mrsCtn ))
170+
160171 req .Header .Add ("Authorization" , "Basic " + tok )
161172 req .Header .Add ("Content-Type" , "application/json" )
173+
162174 resp , err := client .Do (req )
163175 if err != nil {
164176 log .Panicln (err )
@@ -198,22 +210,28 @@ func (s PageService) CreateContentAsync(wg *sync.WaitGroup, url string, tok stri
198210 Ancestors : ancts ,
199211 }
200212 mrsCtn , err2 := json .Marshal (cntb )
201- fmt .Println (string (mrsCtn ))
202213 if err2 != nil {
203214 log .Panicln (err2 )
204215 }
216+ //fmt.Println(string(mrsCtn))
217+
205218 req , err := http .NewRequest ("POST" , reqUrl , bytes .NewReader (mrsCtn ))
219+
206220 req .Header .Add ("Authorization" , "Basic " + tok )
207221 req .Header .Add ("Content-Type" , "application/json" )
222+
208223 resp , err := client .Do (req )
209224 if err != nil {
210225 log .Panicln (err )
211226 }
212227 defer resp .Body .Close ()
228+
213229 var content models.Content
230+
214231 bts , err := io .ReadAll (resp .Body )
232+
215233 err = json .Unmarshal (bts , & content )
216- fmt . Println ( string ( bts ))
234+
217235 return content
218236}
219237
@@ -629,30 +647,75 @@ func (s PageService) CopyAttach(url string, tok string, tpid string, atId string
629647
630648}
631649
632- func (s PageService ) GetComment (url string , tok string , cid string ) models.Content {
650+ func (ps PageService ) GetComment (url string , tok string , cid string ) models.Content {
651+ log .Printf ("Getting comment %s" , cid )
633652
634- log .Printf ("Getting %s page coment" , cid )
635653 client := & http.Client {
636654 CheckRedirect : redirectPolicyFunc ,
637655 }
638656
639657 expand := "expand=body.storage,history,version"
658+
640659 reqUrl := fmt .Sprintf ("%s/rest/api/content/%s?%s" , url , cid , expand )
660+
641661 req , err := http .NewRequest ("GET" , reqUrl , nil )
662+ if err != nil {
663+ log .Panicf ("Error creating GET request for comment: %v" , err )
664+ }
665+
642666 req .Header .Add ("Authorization" , "Basic " + tok )
667+
643668 resp , err := client .Do (req )
644669 if err != nil {
645- log .Panicln ( err )
670+ log .Panicf ( "Error perforing request: %v" , err )
646671 }
647672 defer resp .Body .Close ()
673+
648674 var content models.Content
649- bts , err := ioutil .ReadAll (resp .Body )
675+
676+ bts , err := io .ReadAll (resp .Body )
677+
650678 err = json .Unmarshal (bts , & content )
651- fmt .Println (string (bts ))
652679
653680 return content
654681}
655682
683+ func (ps PageService ) AddFooterCommentToPage (url string , token string , pageId string , body string ) error {
684+ log .Printf ("Adding comment '%s' to page '%s'" , body , pageId )
685+
686+ client := & http.Client {
687+ CheckRedirect : redirectPolicyFunc ,
688+ }
689+
690+ reqUrl := fmt .Sprintf ("%s/rest/api/content" , url )
691+ reqBody := fmt .Sprintf (`{
692+ "type": "comment",
693+ "status": "current",
694+ "container": {
695+ "id": %s,
696+ "type": "page"
697+ },
698+ "body": {
699+ "storage": {
700+ "value": "%s",
701+ "representation": "storage"
702+ }
703+ }
704+ }` , pageId , body )
705+
706+ req , err := http .NewRequest ("POST" , reqUrl , bytes .NewReader ([]byte (reqBody )))
707+
708+ req .Header .Add ("Authorization" , "Basic " + token )
709+ req .Header .Add ("Content-Type" , "application/json" )
710+
711+ _ , err = client .Do (req )
712+ if err != nil {
713+ log .Panicf ("Error performing ADD_COMMENT request: %v" , err )
714+ }
715+
716+ return nil
717+ }
718+
656719func (p PageService ) AddComment (url string , tok string , cid string , pid string ) models.Content {
657720 log .Printf ("Copying %s comment to %s page" , cid , pid )
658721 client := & http.Client {
0 commit comments