Skip to content

Commit 8ee7f0f

Browse files
committed
fix: linter
1 parent 954c042 commit 8ee7f0f

File tree

3 files changed

+93
-84
lines changed

3 files changed

+93
-84
lines changed
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
using System;
2+
using Newtonsoft.Json;
3+
4+
namespace Notion.Client
5+
{
6+
public class DateCustomConverter : JsonConverter<Date>
7+
{
8+
public override Date ReadJson(JsonReader reader, Type objectType, Date existingValue, bool hasExistingValue,
9+
JsonSerializer serializer)
10+
{
11+
var jsonObject = serializer.Deserialize<DateJsonObject>(reader);
12+
13+
if (jsonObject == null)
14+
{
15+
return null;
16+
}
17+
18+
var date = new Date
19+
{
20+
Start = ParseDateTime(jsonObject.Start, out bool includeTime),
21+
End = ParseDateTime(jsonObject.End, out _),
22+
TimeZone = jsonObject.TimeZone,
23+
IncludeTime = includeTime,
24+
};
25+
26+
return date;
27+
}
28+
29+
public override void WriteJson(JsonWriter writer, Date value, JsonSerializer serializer)
30+
{
31+
if (value is null)
32+
{
33+
writer.WriteNull();
34+
35+
return;
36+
}
37+
38+
writer.WriteStartObject();
39+
40+
if (value.Start.HasValue)
41+
{
42+
string startFormat = value.IncludeTime ? "yyyy-MM-ddTHH:mm:ss" : "yyyy-MM-dd";
43+
writer.WritePropertyName("start");
44+
writer.WriteValue(value.Start.Value.ToString(startFormat));
45+
}
46+
47+
if (value.End.HasValue)
48+
{
49+
string endFormat = value.IncludeTime ? "yyyy-MM-ddTHH:mm:ss" : "yyyy-MM-dd";
50+
writer.WritePropertyName("end");
51+
writer.WriteValue(value.End.Value.ToString(endFormat));
52+
}
53+
54+
if (!string.IsNullOrEmpty(value.TimeZone))
55+
{
56+
writer.WritePropertyName("time_zone");
57+
writer.WriteValue(value.TimeZone);
58+
}
59+
60+
writer.WriteEndObject();
61+
}
62+
63+
private static DateTime? ParseDateTime(string dateTimeString, out bool includeTime)
64+
{
65+
includeTime = false;
66+
67+
if (string.IsNullOrEmpty(dateTimeString))
68+
{
69+
return null;
70+
}
71+
72+
includeTime = dateTimeString.Contains("T") || dateTimeString.Contains(" ");
73+
74+
return DateTimeOffset.Parse(dateTimeString).UtcDateTime;
75+
}
76+
}
77+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using Newtonsoft.Json;
2+
3+
namespace Notion.Client
4+
{
5+
internal class DateJsonObject
6+
{
7+
[JsonProperty("start")]
8+
public string Start { get; set; }
9+
10+
[JsonProperty("end")]
11+
public string End { get; set; }
12+
13+
[JsonProperty("time_zone")]
14+
public string TimeZone { get; set; }
15+
}
16+
}

Src/Notion.Client/Models/PropertyValue/DatePropertyValue.cs

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -50,88 +50,4 @@ public class Date
5050
/// </summary>
5151
public bool IncludeTime { get; set; } = true;
5252
}
53-
54-
public class DateJsonObject
55-
{
56-
[JsonProperty("start")]
57-
public string Start { get; set; }
58-
59-
[JsonProperty("end")]
60-
public string End { get; set; }
61-
62-
[JsonProperty("time_zone")]
63-
public string TimeZone { get; set; }
64-
}
65-
66-
public class DateCustomConverter : JsonConverter<Date>
67-
{
68-
public override Date ReadJson(JsonReader reader, Type objectType, Date existingValue, bool hasExistingValue,
69-
JsonSerializer serializer)
70-
{
71-
var jsonObject = serializer.Deserialize<DateJsonObject>(reader);
72-
73-
if (jsonObject == null)
74-
{
75-
return null;
76-
}
77-
78-
var date = new Date
79-
{
80-
Start = ParseDateTime(jsonObject.Start, out bool includeTime),
81-
End = ParseDateTime(jsonObject.End, out _),
82-
TimeZone = jsonObject.TimeZone,
83-
IncludeTime = includeTime,
84-
};
85-
86-
return date;
87-
}
88-
89-
public override void WriteJson(JsonWriter writer, Date value, JsonSerializer serializer)
90-
{
91-
if (value is null)
92-
{
93-
writer.WriteNull();
94-
95-
return;
96-
}
97-
98-
writer.WriteStartObject();
99-
100-
if (value.Start.HasValue)
101-
{
102-
string startFormat = value.IncludeTime ? "yyyy-MM-ddTHH:mm:ss" : "yyyy-MM-dd";
103-
writer.WritePropertyName("start");
104-
writer.WriteValue(value.Start.Value.ToString(startFormat));
105-
}
106-
107-
if (value.End.HasValue)
108-
{
109-
string endFormat = value.IncludeTime ? "yyyy-MM-ddTHH:mm:ss" : "yyyy-MM-dd";
110-
writer.WritePropertyName("end");
111-
writer.WriteValue(value.End.Value.ToString(endFormat));
112-
}
113-
114-
if (!string.IsNullOrEmpty(value.TimeZone))
115-
{
116-
writer.WritePropertyName("time_zone");
117-
writer.WriteValue(value.TimeZone);
118-
}
119-
120-
writer.WriteEndObject();
121-
}
122-
123-
private static DateTime? ParseDateTime(string dateTimeString, out bool includeTime)
124-
{
125-
includeTime = false;
126-
127-
if (string.IsNullOrEmpty(dateTimeString))
128-
{
129-
return null;
130-
}
131-
132-
includeTime = dateTimeString.Contains("T") || dateTimeString.Contains(" ");
133-
134-
return DateTimeOffset.Parse(dateTimeString).UtcDateTime;
135-
}
136-
}
13753
}

0 commit comments

Comments
 (0)