--- trunk/Nos.pm	2005/05/15 21:35:15	21
+++ trunk/Nos.pm	2005/05/16 16:25:14	27
@@ -16,7 +16,7 @@
 our @EXPORT = qw( 
 );
 
-our $VERSION = '0.1';
+our $VERSION = '0.2';
 
 use Class::DBI::Loader;
 use Email::Valid;
@@ -57,6 +57,8 @@
         my $self = {@_};
 	bless($self, $class);
 
+	croak "need at least dsn" unless ($self->{'dsn'});
+
 	$self->{'loader'} = Class::DBI::Loader->new(
 		debug		=> $self->{'debug'},
 		dsn		=> $self->{'dsn'},
@@ -66,53 +68,195 @@
 #		additional_classes      => qw/Class::DBI::AbstractSearch/,
 #		additional_base_classes => qw/My::Stuff/,
 		relationships	=> 1,
-	);
+	) || croak "can't init Class::DBI::Loader";
 
 	$self ? return $self : return undef;
 }
 
-=head2 update_list_email
+=head2 add_member_to_list
+
+Add new member to list
+
+ $nos->add_member_to_list(
+ 	list => "My list",
+	email => "john.doe@example.com",
+	name => "John A. Doe",
+ );
 
-Update list e-mail address
+C<name> parametar is optional.
 
- $noc->update_list_email($list, 'foobar@example.com');
+Return member ID if user is added.
 
 =cut
 
-sub update_list_email {
+sub add_member_to_list {
 	my $self = shift;
 
+	my $arg = {@_};
 
+	my $email = $arg->{'email'} || confess "can't add user without e-mail";
+	my $name = $arg->{'name'} || '';
+	confess "need list name" unless ($arg->{'list'});
+
+	if (! Email::Valid->address($email)) {
+		warn "SKIPPING $name <$email>";
+		return 0;
+	}
+
+	print STDERR "# $name <$email>\n";
+
+	my $lists = $self->{'loader'}->find_class('lists');
+	my $users = $self->{'loader'}->find_class('users');
+	my $user_list = $self->{'loader'}->find_class('user_list');
+
+	my $list = $lists->find_or_create({
+		name => $arg->{'list'},
+	}) || croak "can't add list ",$arg->{'list'},"\n";
+	
+	my $this_user = $users->find_or_create({
+		email => $email,
+		full_name => $name,
+	}) || croak "can't find or create member\n";
+
+	my $user_on_list = $user_list->find_or_create({
+		user_id => $this_user->id,
+		list_id => $list->id,
+	}) || croak "can't add user to list";
+
+	$list->dbi_commit;
+	$this_user->dbi_commit;
+	$user_on_list->dbi_commit;
+
+	return $this_user->id;
 }
 
-=head2 send
+=head2 add_message_to_queue
+
+Adds message to one list's queue for later sending.
 
-Send a message using configured mailer.
+ $nos->add_message_to_queue(
+ 	list => 'My list',
+ 	message => 'From: My list <mylist@example.com>
+ To: John A. Doe <john.doe@example.com>
+ 
+ This is example message
+ ',
+ );	
 
- $nos->send("message with headers");
+On success returns ID of newly created (or existing) message.
 
 =cut
 
-sub send_email {
+sub add_message_to_queue {
 	my $self = shift;
 
-	my $message = shift || return;
+	my $args = {@_};
+
+	my $list_name = $args->{'list'} || confess "need list name";
+	my $message_text = $args->{'message'} || croak "need message";
+
+	my $lists = $self->{'loader'}->find_class('lists');
+
+	my $this_list = $lists->search(
+		name => $list_name,
+	)->first || croak "can't find list $list_name";
+
+	my $messages = $self->{'loader'}->find_class('messages');
+
+	my $this_message = $messages->find_or_create({
+		message => $message_text
+	}) || croak "can't insert message";
+
+	$this_message->dbi_commit() || croak "can't add message";
+
+	my $queue = $self->{'loader'}->find_class('queue');
+
+	$queue->find_or_create({
+		message_id => $this_message->id,
+		list_id => $this_list->id,
+	}) || croak "can't add message ",$this_message->id," to list ",$this_list->id, ": ",$this_list->name;
+
+	$queue->dbi_commit || croak "can't add message to list ",$this_list->name;
 
-	send IO => $message;
+	return $this_message->id;
 }
 
-=head2 EXPORT
 
-None by default.
+=head2 send_queued_messages
+
+Send queued messages or just ones for selected list
+
+ $nos->send_queued_messages("My list");
+
+=cut
+
+sub send_queued_messages {
+	my $self = shift;
+
+	my $list_name = shift;
+
+	my $lists = $self->{'loader'}->find_class('lists');
+	my $queue = $self->{'loader'}->find_class('queue');
+	my $user_list = $self->{'loader'}->find_class('user_list');
+	my $sent = $self->{'loader'}->find_class('sent');
+
+	my $my_q;
+	if ($list_name ne '') {
+		my $l_id = $lists->search_like( name => $list_name )->first ||
+			croak "can't find list $list_name";
+		$my_q = $queue->search_like( list_id => $l_id ) ||
+			croak "can't find list $list_name";
+	} else {
+		$my_q = $queue->retrieve_all;
+	}
+
+	while (my $m = $my_q->next) {
+		next if ($m->all_sent);
+
+		print "sending message ",$m->message_id," enqueued on ",$m->date," to list ",$m->list_id->name,"\n";
+		my $msg = $m->message_id->message;
+
+		foreach my $u ($user_list->search(list_id => $m->list_id)) {
+
+			if ($sent->search( message_id => $m->message_id, user_id => $u->user_id )) {
+				print "SKIP ",$u->user_id->email," message allready sent\n";
+			} else {
+				print "\t",$u->user_id->email,"\n";
+
+				my $hdr = "From: " . $u->list_id->name . " <" . $u->list_id->email . ">\n" .
+					"To: " . $u->user_id->full_name . " <". $u->user_id->email. ">\n";
+
+				# FIXME do real sending :-)
+				send IO => "$hdr\n$msg";
+
+				$sent->create({
+					message_id => $m->message_id,
+					user_id => $u->user_id,
+				});
+				$sent->dbi_commit;
+			}
+		}
+		$m->all_sent(1);
+		$m->update;
+		$m->dbi_commit;
+	}
+
+}
+
+=head1 EXPORT
+
+Nothing.
 
 =head1 SEE ALSO
 
 mailman, ezmlm, sympa, L<Mail::Salsa>
 
+
 =head1 AUTHOR
 
 Dobrica Pavlinusic, E<lt>dpavlin@rot13.orgE<gt>
 
+
 =head1 COPYRIGHT AND LICENSE
 
 Copyright (C) 2005 by Dobrica Pavlinusic