From efe8a9e1d2e9d3d7629d73f1b96268e0e6bf0906 Mon Sep 17 00:00:00 2001
From: Abhishek Pandey <abhishek@alcion.ai>
Date: Fri, 1 Dec 2023 22:33:49 -0800
Subject: [PATCH] Rename files, add nil item check

---
 .../m365/custom/{drive.go => drive_item.go}         |  5 ++++-
 .../custom/{drive_test.go => drive_item_test.go}    | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 rename src/pkg/services/m365/custom/{drive.go => drive_item.go} (99%)
 rename src/pkg/services/m365/custom/{drive_test.go => drive_item_test.go} (97%)

diff --git a/src/pkg/services/m365/custom/drive.go b/src/pkg/services/m365/custom/drive_item.go
similarity index 99%
rename from src/pkg/services/m365/custom/drive.go
rename to src/pkg/services/m365/custom/drive_item.go
index 6858bae13..ed9e18eed 100644
--- a/src/pkg/services/m365/custom/drive.go
+++ b/src/pkg/services/m365/custom/drive_item.go
@@ -20,7 +20,6 @@ type LiteDriveItemable interface {
 	GetId() *string
 	GetName() *string
 	GetSize() *int64
-	// TODO(pandeyabs): replace with any
 	GetFolder() interface{}
 	GetPackageEscaped() interface{}
 	GetShared() interface{}
@@ -204,6 +203,10 @@ var downloadURLKeys = []string{
 }
 
 func ToLiteDriveItemable(item models.DriveItemable) LiteDriveItemable {
+	if item == nil {
+		return nil
+	}
+
 	cdi := &driveItem{
 		id:                   strings.Clone(ptr.Val(item.GetId())),
 		name:                 strings.Clone(ptr.Val(item.GetName())),
diff --git a/src/pkg/services/m365/custom/drive_test.go b/src/pkg/services/m365/custom/drive_item_test.go
similarity index 97%
rename from src/pkg/services/m365/custom/drive_test.go
rename to src/pkg/services/m365/custom/drive_item_test.go
index 72de3ade2..51d4c7448 100644
--- a/src/pkg/services/m365/custom/drive_test.go
+++ b/src/pkg/services/m365/custom/drive_item_test.go
@@ -39,6 +39,19 @@ func (suite *driveUnitSuite) TestToLiteDriveItemable() {
 			expected models.DriveItemable,
 			got LiteDriveItemable)
 	}{
+		{
+			name: "nil item",
+			itemFunc: func() models.DriveItemable {
+				return nil
+			},
+			validateFunc: func(
+				t *testing.T,
+				expected models.DriveItemable,
+				got LiteDriveItemable,
+			) {
+				require.Nil(t, got)
+			},
+		},
 		{
 			name: "uninitialized values",
 			itemFunc: func() models.DriveItemable {