Skip to content

Commit

Permalink
switched long identifiers to use guids instead.
Browse files Browse the repository at this point in the history
  • Loading branch information
@abdullin
abdullin committed Jul 14, 2011
1 parent aff1d8a commit f3c485b
Show file tree
Hide file tree
Showing 14 changed files with 128 additions and 130 deletions.
17 changes: 0 additions & 17 deletions FarleyFile.Abstractions/IEvent.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,4 @@ public interface IEvent : IBaseMessage
{

}

/// <summary>
/// because we can't use [] for now
/// </summary>

public sealed class TaskCompleted : IEvent
{
public long TaskId { get; internal set; }
public long[] StoryIds { get; internal set; }

internal TaskCompleted() { }
public TaskCompleted(long taskId, long[] storyIds)
{
TaskId = taskId;
StoryIds = storyIds;
}
}
}
105 changes: 59 additions & 46 deletions FarleyFile.Abstractions/Messages.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ namespace FarleyFile

[DataContract] public sealed class PerspectiveCreated : IEvent
{
[DataMember(Order = 1)] public long DraftId { get; internal set; }
[DataMember(Order = 1)] public Guid StoryId { get; internal set; }

internal PerspectiveCreated () {}
public PerspectiveCreated (long draftId)
public PerspectiveCreated (Guid storyId)
{
DraftId = draftId;
StoryId = storyId;
}
}

Expand All @@ -33,11 +33,11 @@ public StartSimpleStory (string name)

[DataContract] public sealed class SimpleStoryStarted : IEvent
{
[DataMember(Order = 1)] public long StoryId { get; internal set; }
[DataMember(Order = 1)] public Guid StoryId { get; internal set; }
[DataMember(Order = 2)] public string Name { get; internal set; }

internal SimpleStoryStarted () {}
public SimpleStoryStarted (long storyId, string name)
public SimpleStoryStarted (Guid storyId, string name)
{
StoryId = storyId;
Name = name;
Expand All @@ -48,10 +48,10 @@ public SimpleStoryStarted (long storyId, string name)
{
[DataMember(Order = 1)] public string Title { get; internal set; }
[DataMember(Order = 2)] public string Text { get; internal set; }
[DataMember(Order = 3)] public long StoryId { get; internal set; }
[DataMember(Order = 3)] public Guid StoryId { get; internal set; }

internal AddNote () {}
public AddNote (string title, string text, long storyId)
public AddNote (string title, string text, Guid storyId)
{
Title = title;
Text = text;
Expand All @@ -61,12 +61,12 @@ public AddNote (string title, string text, long storyId)

[DataContract] public sealed class NoteAdded : IEvent
{
[DataMember(Order = 1)] public long NoteId { get; internal set; }
[DataMember(Order = 1)] public Guid NoteId { get; internal set; }
[DataMember(Order = 2)] public string Title { get; internal set; }
[DataMember(Order = 3)] public string Text { get; internal set; }

internal NoteAdded () {}
public NoteAdded (long noteId, string title, string text)
public NoteAdded (Guid noteId, string title, string text)
{
NoteId = noteId;
Title = title;
Expand All @@ -76,13 +76,13 @@ public NoteAdded (long noteId, string title, string text)

[DataContract] public sealed class NoteAssignedToStory : IEvent
{
[DataMember(Order = 1)] public long NoteId { get; internal set; }
[DataMember(Order = 2)] public long StoryId { get; internal set; }
[DataMember(Order = 1)] public Guid NoteId { get; internal set; }
[DataMember(Order = 2)] public Guid StoryId { get; internal set; }
[DataMember(Order = 3)] public string Title { get; internal set; }
[DataMember(Order = 4)] public string Text { get; internal set; }

internal NoteAssignedToStory () {}
public NoteAssignedToStory (long noteId, long storyId, string title, string text)
public NoteAssignedToStory (Guid noteId, Guid storyId, string title, string text)
{
NoteId = noteId;
StoryId = storyId;
Expand All @@ -93,11 +93,11 @@ public NoteAssignedToStory (long noteId, long storyId, string title, string text

[DataContract] public sealed class NoteRemovedFromStory : IEvent
{
[DataMember(Order = 1)] public long NoteId { get; internal set; }
[DataMember(Order = 2)] public long StoryId { get; internal set; }
[DataMember(Order = 1)] public Guid NoteId { get; internal set; }
[DataMember(Order = 2)] public Guid StoryId { get; internal set; }

internal NoteRemovedFromStory () {}
public NoteRemovedFromStory (long noteId, long storyId)
public NoteRemovedFromStory (Guid noteId, Guid storyId)
{
NoteId = noteId;
StoryId = storyId;
Expand All @@ -106,12 +106,12 @@ public NoteRemovedFromStory (long noteId, long storyId)

[DataContract] public sealed class EditNote : ICommand
{
[DataMember(Order = 1)] public long NoteId { get; internal set; }
[DataMember(Order = 1)] public Guid NoteId { get; internal set; }
[DataMember(Order = 2)] public string Text { get; internal set; }
[DataMember(Order = 3)] public string OldText { get; internal set; }

internal EditNote () {}
public EditNote (long noteId, string text, string oldText)
public EditNote (Guid noteId, string text, string oldText)
{
NoteId = noteId;
Text = text;
Expand All @@ -121,13 +121,13 @@ public EditNote (long noteId, string text, string oldText)

[DataContract] public sealed class NoteEdited : IEvent
{
[DataMember(Order = 1)] public long NoteId { get; internal set; }
[DataMember(Order = 1)] public Guid NoteId { get; internal set; }
[DataMember(Order = 2)] public string NewText { get; internal set; }
[DataMember(Order = 3)] public string OldText { get; internal set; }
[DataMember(Order = 4)] public ICollection<long> StoryIds { get; internal set; }
[DataMember(Order = 4)] public ICollection<Guid> StoryIds { get; internal set; }

internal NoteEdited () {}
public NoteEdited (long noteId, string newText, string oldText, ICollection<long> storyIds)
public NoteEdited (Guid noteId, string newText, string oldText, ICollection<Guid> storyIds)
{
NoteId = noteId;
NewText = newText;
Expand All @@ -138,22 +138,22 @@ public NoteEdited (long noteId, string newText, string oldText, ICollection<long

[DataContract] public sealed class NoteRemoved : IEvent
{
[DataMember(Order = 1)] public long NoteId { get; internal set; }
[DataMember(Order = 1)] public Guid NoteId { get; internal set; }

internal NoteRemoved () {}
public NoteRemoved (long noteId)
public NoteRemoved (Guid noteId)
{
NoteId = noteId;
}
}

[DataContract] public sealed class MergeNotes : ICommand
{
[DataMember(Order = 1)] public long NoteId { get; internal set; }
[DataMember(Order = 2)] public long Secondary { get; internal set; }
[DataMember(Order = 1)] public Guid NoteId { get; internal set; }
[DataMember(Order = 2)] public Guid Secondary { get; internal set; }

internal MergeNotes () {}
public MergeNotes (long noteId, long secondary)
public MergeNotes (Guid noteId, Guid secondary)
{
NoteId = noteId;
Secondary = secondary;
Expand All @@ -163,10 +163,10 @@ public MergeNotes (long noteId, long secondary)
[DataContract] public sealed class AddTask : ICommand
{
[DataMember(Order = 1)] public string Text { get; internal set; }
[DataMember(Order = 2)] public long StoryId { get; internal set; }
[DataMember(Order = 2)] public Guid StoryId { get; internal set; }

internal AddTask () {}
public AddTask (string text, long storyId)
public AddTask (string text, Guid storyId)
{
Text = text;
StoryId = storyId;
Expand All @@ -175,11 +175,11 @@ public AddTask (string text, long storyId)

[DataContract] public sealed class TaskAdded : IEvent
{
[DataMember(Order = 1)] public long TaskId { get; internal set; }
[DataMember(Order = 1)] public Guid TaskId { get; internal set; }
[DataMember(Order = 2)] public string Text { get; internal set; }

internal TaskAdded () {}
public TaskAdded (long taskId, string text)
public TaskAdded (Guid taskId, string text)
{
TaskId = taskId;
Text = text;
Expand All @@ -188,13 +188,13 @@ public TaskAdded (long taskId, string text)

[DataContract] public sealed class TaskAssignedToStory : IEvent
{
[DataMember(Order = 1)] public long TaskId { get; internal set; }
[DataMember(Order = 2)] public long StoryId { get; internal set; }
[DataMember(Order = 1)] public Guid TaskId { get; internal set; }
[DataMember(Order = 2)] public Guid StoryId { get; internal set; }
[DataMember(Order = 3)] public string Text { get; internal set; }
[DataMember(Order = 4)] public bool Completed { get; internal set; }

internal TaskAssignedToStory () {}
public TaskAssignedToStory (long taskId, long storyId, string text, bool completed)
public TaskAssignedToStory (Guid taskId, Guid storyId, string text, bool completed)
{
TaskId = taskId;
StoryId = storyId;
Expand All @@ -205,11 +205,11 @@ public TaskAssignedToStory (long taskId, long storyId, string text, bool complet

[DataContract] public sealed class TaskRemovedFromStory : IEvent
{
[DataMember(Order = 1)] public long TaskId { get; internal set; }
[DataMember(Order = 2)] public long StoryId { get; internal set; }
[DataMember(Order = 1)] public Guid TaskId { get; internal set; }
[DataMember(Order = 2)] public Guid StoryId { get; internal set; }

internal TaskRemovedFromStory () {}
public TaskRemovedFromStory (long taskId, long storyId)
public TaskRemovedFromStory (Guid taskId, Guid storyId)
{
TaskId = taskId;
StoryId = storyId;
Expand All @@ -218,11 +218,11 @@ public TaskRemovedFromStory (long taskId, long storyId)

[DataContract] public sealed class AddToStory : ICommand
{
[DataMember(Order = 1)] public long ItemId { get; internal set; }
[DataMember(Order = 2)] public long StoryId { get; internal set; }
[DataMember(Order = 1)] public Guid ItemId { get; internal set; }
[DataMember(Order = 2)] public Guid StoryId { get; internal set; }

internal AddToStory () {}
public AddToStory (long itemId, long storyId)
public AddToStory (Guid itemId, Guid storyId)
{
ItemId = itemId;
StoryId = storyId;
Expand All @@ -231,11 +231,11 @@ public AddToStory (long itemId, long storyId)

[DataContract] public sealed class RemoveFromStory : ICommand
{
[DataMember(Order = 1)] public long ItemId { get; internal set; }
[DataMember(Order = 2)] public long StoryId { get; internal set; }
[DataMember(Order = 1)] public Guid ItemId { get; internal set; }
[DataMember(Order = 2)] public Guid StoryId { get; internal set; }

internal RemoveFromStory () {}
public RemoveFromStory (long itemId, long storyId)
public RemoveFromStory (Guid itemId, Guid storyId)
{
ItemId = itemId;
StoryId = storyId;
Expand All @@ -244,11 +244,11 @@ public RemoveFromStory (long itemId, long storyId)

[DataContract] public sealed class AddTaskToStory : ICommand
{
[DataMember(Order = 1)] public long TaskId { get; internal set; }
[DataMember(Order = 2)] public long StoryId { get; internal set; }
[DataMember(Order = 1)] public Guid TaskId { get; internal set; }
[DataMember(Order = 2)] public Guid StoryId { get; internal set; }

internal AddTaskToStory () {}
public AddTaskToStory (long taskId, long storyId)
public AddTaskToStory (Guid taskId, Guid storyId)
{
TaskId = taskId;
StoryId = storyId;
Expand All @@ -257,13 +257,26 @@ public AddTaskToStory (long taskId, long storyId)

[DataContract] public sealed class CompleteTask : ICommand
{
[DataMember(Order = 1)] public long TaskId { get; internal set; }
[DataMember(Order = 1)] public Guid TaskId { get; internal set; }

internal CompleteTask () {}
public CompleteTask (long taskId)
public CompleteTask (Guid taskId)
{
TaskId = taskId;
}
}

[DataContract] public sealed class TaskCompleted : IEvent
{
[DataMember(Order = 1)] public Guid TaskId { get; internal set; }
[DataMember(Order = 2)] public ICollection<Guid> StoryIds { get; internal set; }

internal TaskCompleted () {}
public TaskCompleted (Guid taskId, ICollection<Guid> storyIds)
{
TaskId = taskId;
StoryIds = storyIds;
}
}
#endregion
}
20 changes: 11 additions & 9 deletions FarleyFile.Abstractions/Messages.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ using ? = ICommand;
using ! = IEvent;


let noteId = long NoteId;
let storyId = long StoryId;
let taskId = long TaskId;
let noteId = Guid NoteId;
let storyId = Guid StoryId;
let taskId = Guid TaskId;
let date = DateTime Date;

PerspectiveCreated! (long draftId)
PerspectiveCreated! (storyId)

// generic story
StartSimpleStory? (string name)
Expand All @@ -30,27 +30,29 @@ NoteAssignedToStory! (noteId, storyId, string title, string text)
NoteRemovedFromStory! (noteId, storyId)

EditNote? (noteId, string text, string oldText)
NoteEdited! (noteId, string newText, string oldText, ICollection<long> storyIds)
NoteEdited! (noteId, string newText, string oldText, ICollection<Guid> storyIds)
NoteRemoved! (noteId)

MergeNotes? (noteId, long secondary)
MergeNotes? (noteId, Guid secondary)


AddTask? (string text, storyId)
TaskAdded! (taskId, string text)
TaskAssignedToStory! (taskId, storyId, string text, bool completed)
TaskRemovedFromStory! (taskId, storyId)

AddToStory? (long itemId, storyId)
RemoveFromStory? (long itemId, storyId)
AddToStory? (Guid itemId, storyId)
RemoveFromStory? (Guid itemId, storyId)


// helpers
AddTaskToStory? (taskId, storyId)


CompleteTask? (taskId)
//TaskCompleted! (taskId, longs storyIds)
TaskCompleted! (taskId, ICollection<Guid> storyIds)





Expand Down
Loading

0 comments on commit f3c485b

Please sign in to comment.