with cleaning

regulatory_comments_api.py

@@ -94,39 +94,50 @@ class RegulationsDataFetcher:
         """Collect data and reshape into nested dictionary format."""
         data = self.fetch_comments()
         if data is None:
-            return None  # Early return if fetching comments fails
+            return None  
 
         docket_info = self.get_docket_info()
         if docket_info is None:
             return None
 
-        # Initialize the nested dictionary structure
+        agency_id = self.docket_id[:3]
+        agency = "VA" if agency_id == "VA-" else agency_id
+
         nested_data = {
             "id": self.docket_id,
+            "agency": agency,
             "title": docket_info[1] if docket_info else "Unknown Title",
-            "context": docket_info[2] if docket_info else "Unknown Context",
+            "update_date": docket_info[2].split('T')[0] if docket_info and docket_info[2] else "Unknown Update Date",
+            "update_time": docket_info[2].split('T')[1].strip('Z') if docket_info and docket_info[2] and 'T' in docket_info[2] else "Unknown Update Time",
             "purpose": docket_info[3],
             "keywords": docket_info[4],
             "comments": []
         }
 
-        if data and 'data' in data:
+        if 'data' in data:
             for comment in data['data']:
                 comment_details = self.fetch_comment_details(comment['links']['self'])
-                
-                if comment_details and 'data' in comment_details and 'attributes' in comment_details['data']:
+                if 'data' in comment_details and 'attributes' in comment_details['data']:
                     comment_data = comment_details['data']['attributes']
-                    nested_comment = {
-                        "text": comment_data.get('comment', ''),
-                        "comment_id": comment['id'],
-                        "comment_url": comment['links']['self'],
-                        "comment_date": comment['attributes']['postedDate'],
-                        "comment_title": comment['attributes']['title'],
-                        "commenter_fname": comment_data.get('firstName', ''),
-                        "commenter_lname": comment_data.get('lastName', ''),
-                        "comment_length": len(comment_data.get('comment', '')) if comment_data.get('comment') is not None else 0
-                    }
-                    nested_data["comments"].append(nested_comment)
+                    comment_text = (comment_data.get('comment', '') or '').strip()
+
+                    # Data cleaning: check for non-empty text, absence of "see attachment", and text not being "N/A"
+                    if (comment_text and "see attachment" not in comment_text.lower() and comment_text.lower() != "n/a"):
+                        # Replace empty commenter_fname with "Anonymous"
+                        commenter_fname = (comment_data.get('firstName', '').split(',')[0]).strip()
+                        commenter_fname = commenter_fname.capitalize() if commenter_fname else "Anonymous"
+
+                        nested_comment = {
+                            "text": comment_text,
+                            "comment_id": comment['id'],
+                            "comment_url": comment['links']['self'],
+                            "comment_date": comment['attributes']['postedDate'].split('T')[0],
+                            "comment_time": comment['attributes']['postedDate'].split('T')[1].strip('Z'),
+                            "commenter_fname": commenter_fname,
+                            "commenter_lname": (comment_data.get('lastName', '').split(',')[0]).capitalize(),
+                            "comment_length": len(comment_text)
+                        }
+                        nested_data["comments"].append(nested_comment)
 
                 if len(nested_data["comments"]) >= 10:
                     break