renaming

nextjs/src/models/canvas/assignments/canvasAssignment.ts

@@ -1,9 +1,9 @@
-import { DiscussionTopicModel } from "../discussions/canvasDiscussionModelTopic";
-import { SubmissionModel } from "../submissions/canvasSubmissionModel";
+import { CanvasDiscussionTopicModel } from "../discussions/canvasDiscussionModelTopic";
+import { CanvasSubmissionModel } from "../submissions/canvasSubmissionModel";
 import { CanvasAssignmentDate } from "./canvasAssignmentDate";
 import { CanvasAssignmentOverride } from "./canvasAssignmentOverride";
 import { CanvasExternalToolTagAttributes } from "./canvasExternalToolTagAttributes";
-import { CanvasLockInfo } from "./CanvasLockInfo";
+import { CanvasLockInfo } from "./canvasLockInfo";
 import { CanvasRubricCriteria } from "./canvasRubricCriteria";
 import { CanvasTurnitinSettings } from "./canvasTurnitinSettings";
 
@@ -63,11 +63,11 @@ export interface CanvasAssignment {
   lock_explanation?: string;
   quiz_id?: number;
   anonymous_submissions?: boolean;
-  discussion_topic?: DiscussionTopicModel;
+  discussion_topic?: CanvasDiscussionTopicModel;
   freeze_on_copy?: boolean;
   frozen?: boolean;
   frozen_attributes?: string[];
-  submission?: SubmissionModel;
+  submission?: CanvasSubmissionModel;
   use_rubric_for_grading?: boolean;
   rubric_settings?: any;
   rubric?: CanvasRubricCriteria[];

nextjs/src/models/canvas/courses/calendarLinkModel.ts

@@ -1,3 +0,0 @@
-export interface CalendarLinkModel {
-  ics: string;
-}

nextjs/src/models/canvas/courses/canvasCalendarLinkModel.ts

@@ -0,0 +1,3 @@
+export interface CanvasCalendarLinkModel {
+  ics: string;
+}

nextjs/src/models/canvas/courses/canvasCourseModel.ts

@@ -1,9 +1,9 @@
-import { EnrollmentModel } from "../enrollments/enrollmentModel";
-import { CalendarLinkModel } from "./calendarLinkModel";
-import { CourseProgressModel } from "./courseProgressModel";
-import { TermModel } from "./termModel";
+import { CanvasEnrollmentModel } from "../enrollments/canvasEnrollmentModel";
+import { CanvasCalendarLinkModel } from "./canvasCalendarLinkModel";
+import { CanvasCourseProgressModel } from "./canvasCourseProgressModel";
+import { CanvasTermModel } from "./canvasTermModel";
 
-export interface CourseModel {
+export interface CanvasCourseModel {
   id: number;
   sis_course_id: string;
   uuid: string;
@@ -16,7 +16,7 @@ export interface CourseModel {
   enrollment_term_id: number;
   created_at: string; // ISO 8601 date string
   locale: string;
-  calendar: CalendarLinkModel;
+  calendar: CanvasCalendarLinkModel;
   default_view: string;
   syllabus_body: string;
   permissions: { [key: string]: boolean };
@@ -29,11 +29,11 @@ export interface CourseModel {
   grading_standard_id?: number;
   start_at?: string; // ISO 8601 date string
   end_at?: string; // ISO 8601 date string
-  enrollments?: EnrollmentModel[];
+  enrollments?: CanvasEnrollmentModel[];
   total_students?: number;
   needs_grading_count?: number;
-  term?: TermModel;
-  course_progress?: CourseProgressModel;
+  term?: CanvasTermModel;
+  course_progress?: CanvasCourseProgressModel;
   apply_assignment_group_weights?: boolean;
   is_public?: boolean;
   is_public_to_auth_users?: boolean;
@@ -50,5 +50,7 @@ export interface CourseModel {
   access_restricted_by_date?: boolean;
   blueprint?: boolean;
   blueprint_restrictions?: { [key: string]: boolean };
-  blueprint_restrictions_by_object_type?: { [key: string]: { [key: string]: boolean } };
+  blueprint_restrictions_by_object_type?: {
+    [key: string]: { [key: string]: boolean };
+  };
 }

nextjs/src/models/canvas/courses/canvasCourseProgressModel.ts

@@ -1,4 +1,4 @@
-export interface CourseProgressModel {
+export interface CanvasCourseProgressModel {
   requirement_count?: number;
   requirement_completed_count?: number;
   next_requirement_url?: string;

nextjs/src/models/canvas/courses/canvasCourseSettingsModel.ts

@@ -1,4 +1,4 @@
-export interface CourseSettingsModel {
+export interface CanvasCourseSettingsModel {
   allow_final_grade_override: boolean;
   allow_student_discussion_topics: boolean;
   allow_student_forum_attachments: boolean;

nextjs/src/models/canvas/courses/canvasTermModel.ts

@@ -1,4 +1,4 @@
-export interface TermModel {
+export interface CanvasTermModel {
   id: number;
   name: string;
   start_at?: string; // ISO 8601 date string

nextjs/src/models/canvas/discussions/canvasDiscussionModelTopic.ts

@@ -1,7 +1,7 @@
-import { UserDisplayModel } from "../users/userDisplayModel";
-import { FileAttachmentModel } from "./canvasFileAttachmentModel";
+import { CanvasUserDisplayModel } from "../users/userDisplayModel";
+import { CanvasFileAttachmentModel } from "./canvasFileAttachmentModel";
 
-export interface DiscussionTopicModel {
+export interface CanvasDiscussionTopicModel {
   id: number;
   title: string;
   message: string;
@@ -14,9 +14,9 @@ export interface DiscussionTopicModel {
   topic_children: number[];
   podcast_url: string;
   discussion_type: string;
-  attachments: FileAttachmentModel[];
+  attachments: CanvasFileAttachmentModel[];
   permissions: { [key: string]: boolean };
-  author: UserDisplayModel;
+  author: CanvasUserDisplayModel;
   unread_count?: number;
   subscribed?: boolean;
   posted_at?: string; // ISO 8601 date string

nextjs/src/models/canvas/discussions/canvasFileAttachmentModel.ts

@@ -1,4 +1,4 @@
-export interface FileAttachmentModel {
+export interface CanvasFileAttachmentModel {
   content_type: string;
   url: string;
   filename: string;

nextjs/src/models/canvas/enrollments/canvasEnrollmentModel.ts

@@ -1,7 +1,7 @@
-import { UserDisplayModel } from "../users/userDisplayModel";
-import { GradeModel } from "./gradeModel";
+import { CanvasUserDisplayModel } from "../users/userDisplayModel";
+import { CanvasGradeModel } from "./canvasG'radeModel";
 
-export interface EnrollmentModel {
+export interface CanvasEnrollmentModel {
   id: number;
   course_id: number;
   enrollment_state: string;
@@ -10,8 +10,8 @@ export interface EnrollmentModel {
   role: string;
   role_id: number;
   html_url: string;
-  grades: GradeModel;
-  user: UserDisplayModel;
+  grades: CanvasGradeModel;
+  user: CanvasUserDisplayModel;
   override_grade: string;
   sis_course_id?: string;
   course_integration_id?: string;

nextjs/src/models/canvas/enrollments/canvasG'radeModel.ts

@@ -1,4 +1,4 @@
-export interface GradeModel {
+export interface CanvasGradeModel {
   html_url?: string;
   current_grade?: number;
   final_grade?: number;

nextjs/src/models/canvas/modules/canvasModuleItems.ts

@@ -17,12 +17,10 @@ export interface CanvasModuleItem {
     completed?: boolean;
   };
   published?: boolean;
-  content_details?: CanvasModuleItemContentDetails;
-}
-
-export interface CanvasModuleItemContentDetails {
-  due_at?: string; // ISO 8601 date string
-  lock_at?: string; // ISO 8601 date string
-  points_possible: number;
-  locked_for_user: boolean;
+  content_details?: {
+    due_at?: string; // ISO 8601 date string
+    lock_at?: string; // ISO 8601 date string
+    points_possible: number;
+    locked_for_user: boolean;
+  };
 }

nextjs/src/models/canvas/quizzes/canvasQuizModel.ts

@@ -1,4 +1,4 @@
-import { CanvasLockInfo } from "../assignments/CanvasLockInfo";
+import { CanvasLockInfo } from "../assignments/canvasLockInfo";
 import { CanvasQuizPermissions } from "./canvasQuizPermission";
 
 export interface CanvasQuiz {

nextjs/src/models/canvas/submissions/canvasSubmissionModel.ts

@@ -1,20 +1,20 @@
 import { CanvasAssignment } from "../assignments/canvasAssignment";
-import { CourseModel } from "../courses/courseModel";
-import { UserModel } from "../users/canvasUserModel";
-import { UserDisplayModel } from "../users/userDisplayModel";
+import { CanvasCourseModel } from "../courses/canvasCourseModel";
+import { CanvasUserModel } from "../users/canvasUserModel";
+import { CanvasUserDisplayModel } from "../users/userDisplayModel";
 
-export interface SubmissionModel {
+export interface CanvasSubmissionModel {
   assignment_id: number;
   grade: string;
   html_url: string;
   preview_url: string;
   submission_type: string;
   user_id: number;
-  user: UserModel;
+  user: CanvasUserModel;
   workflow_state: string;
   late_policy_status: string;
   assignment?: CanvasAssignment;
-  course?: CourseModel;
+  course?: CanvasCourseModel;
   attempt?: number;
   body?: string;
   grade_matches_current_submission?: boolean;
@@ -23,7 +23,7 @@ export interface SubmissionModel {
     id: number;
     author_id: number;
     author_name: string;
-    author: UserDisplayModel;
+    author: CanvasUserDisplayModel;
     comment: string;
     created_at: string; // ISO 8601 date string
     edited_at?: string; // ISO 8601 date string

nextjs/src/models/canvas/users/canvasUserModel.ts

@@ -1,6 +1,6 @@
-import { EnrollmentModel } from "../enrollments/enrollmentModel";
+import { CanvasEnrollmentModel } from "../enrollments/canvasEnrollmentModel";
 
-export interface UserModel {
+export interface CanvasUserModel {
   id: number;
   name: string;
   sortable_name: string;
@@ -9,7 +9,7 @@ export interface UserModel {
   integration_id: string;
   login_id: string;
   avatar_url: string;
-  enrollments: EnrollmentModel[];
+  enrollments: CanvasEnrollmentModel[];
   email: string;
   locale: string;
   effective_locale: string;

nextjs/src/models/canvas/users/userDisplayModel.ts

@@ -1,4 +1,4 @@
-export interface UserDisplayModel {
+export interface CanvasUserDisplayModel {
   avatar_image_url: string;
   html_url: string;
   anonymous_id: string;
@@ -6,4 +6,4 @@ export interface UserDisplayModel {
   short_name?: string;
   display_name?: string;
   pronouns?: string;
-}
+}