From d64a9c75e881bcb245e0699cedbe62178004c674 Mon Sep 17 00:00:00 2001
From: Yvan <yvan@funnyfarm.bogalow>
Date: Wed, 29 Jan 2025 03:46:23 +0000
Subject: [PATCH] fix initialisation of Bot members, 'published' was not copied
 up

---
 .../src/main/java/dev/activitypub/activitypubbot/Bot.java | 5 +++--
 .../dev/activitypub/activitypubbot/BotController.java     | 8 +++-----
 .../java/dev/activitypub/activitypubbot/BotJpaRepo.java   | 3 +--
 .../java/dev/activitypub/activitypubbot/BotModel.java     | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/Bot.java b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/Bot.java
index 69a6f6a..365a3a3 100644
--- a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/Bot.java
+++ b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/Bot.java
@@ -41,14 +41,15 @@ public class Bot {
 
     Bot() {
     }
-    Bot( String username, String name, String summary, String type, boolean manuallyApproveFollowers, boolean indexable, String pubicKeyPem ) {
+    Bot( String username, String name, String summary, Instant published, String publicKeyPem, String type, boolean manuallyApproveFollowers, boolean indexable ) {
         this.username = username;
         this.name = name;
         this.summary = summary;
+        this.published = published;
+        this.publicKeyPem = publicKeyPem;
         this.type = type;
         this.manuallyApproveFollowers = manuallyApproveFollowers;
         this.indexable = indexable;
-        this.publicKeyPem = publicKeyPem;
     }
 }
 
diff --git a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotController.java b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotController.java
index ec0d629..13eff83 100644
--- a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotController.java
+++ b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotController.java
@@ -41,11 +41,9 @@ public class BotController {
     }
 
     @PostMapping("/makebot")
-    public String makebotpost(@ModelAttribute("bot") Bot bot) {
-        //log.info(bot);
-
-        botServ.save(bot);
-
+    public String makebotpost(Bot bot, Model model) {
+        bot = botServ.save(bot);
+        model.addAttribute("bot", bot);
         return "makebot_submitted";
     }
 }
diff --git a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotJpaRepo.java b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotJpaRepo.java
index 6bceb43..e020d9c 100644
--- a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotJpaRepo.java
+++ b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotJpaRepo.java
@@ -24,8 +24,7 @@ public class BotJpaRepo implements BotRepo {
         BotModel botModel = BotModel.from(bot);
         BotModel saved = botJdbcRepo.save(botModel);
         return saved.asBot();
-        // this pattern comes from the 'ensembler' MemberRepositoryJdbcAdapter impl
-        // TODO: in our case I'm not sure we need to be returning a Bot, could be void?
+        // returning the bot here means that automated fields like creation dates are bubbled up
     }
 
     public Optional<Bot> findByUsername(String username) {
diff --git a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotModel.java b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotModel.java
index 49c7b99..71ee0ac 100644
--- a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotModel.java
+++ b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotModel.java
@@ -92,7 +92,7 @@ public class BotModel {
     }
 
     Bot asBot() {
-        return new Bot( username, name, summary, type, manuallyApproveFollowers, indexable, publicKeyPem );
+        return new Bot( username, name, summary, published, publicKeyPem, type, manuallyApproveFollowers, indexable );
     }
 
     @Override